Commit 2e2d057c authored by 姜登's avatar 姜登

product

parent dd71c750
Pipeline #22322 passed with stage
in 2 seconds
...@@ -116,9 +116,9 @@ class UserService extends Service { ...@@ -116,9 +116,9 @@ class UserService extends Service {
], ],
where: { user_id, day: last_day }, where: { user_id, day: last_day },
}) })
ctx.logger.info('lastday_data', lastday_data) ctx.logger.info('lastday_data', lastday_data.amount, lastday_data.cost)
lastday_info.use_amount = lastday_data && lastday_data.amount ? Number(parseFloat(lastday_data.amount).toFixed(2)) : 0; lastday_info.use_amount = lastday_data && lastday_data.amount > 0 ? Number(parseFloat(lastday_data.amount).toFixed(2)) : 0;
lastday_info.use_money = lastday_data && lastday_data.cost ? Number(parseFloat(lastday_data.cost).toFixed(2)) : 0; lastday_info.use_money = lastday_data && lastday_data.cost > 0 ? Number(parseFloat(lastday_data.cost).toFixed(2)) : 0;
const left_money = await ctx.dataModel.YzbillBalance.findOne({ const left_money = await ctx.dataModel.YzbillBalance.findOne({
attributes: ['balance_fn'], attributes: ['balance_fn'],
......
...@@ -60,6 +60,7 @@ class UserDetailService extends Service { ...@@ -60,6 +60,7 @@ class UserDetailService extends Service {
ctx.logger.info(product) ctx.logger.info(product)
let where = { user_id }; let where = { user_id };
if (product) { if (product) {
product = JSON.parse(product);
if (product.length > 0) { if (product.length > 0) {
ret.product = product; ret.product = product;
where.service = product; where.service = product;
...@@ -142,6 +143,7 @@ class UserDetailService extends Service { ...@@ -142,6 +143,7 @@ class UserDetailService extends Service {
let where = { user_id }; let where = { user_id };
if (product) { if (product) {
product = JSON.parse(product);
if (product.length > 0) { if (product.length > 0) {
ret.product = product; ret.product = product;
where.service = product; where.service = product;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment