product

app/service/user.js

@@ -109,7 +109,7 @@ class UserService extends Service {
 
     const last_day = moment(new Date()).subtract(1, 'day').format('YYYY-MM-DD');
     const last_month = moment(new Date()).subtract(1, 'day').format('YYYYMM');
-    const lastday_data = await ctx.dataModel.YzbillCost.findOne({
+    const lastday_data = await ctx.dataModel.YzbillCost.findAll({
       attributes: [
         [ctx.dataModel.fn('SUM', 'pull_volumn'), 'amount'],
         [ctx.dataModel.fn('SUM', 'cost'), 'cost'],

app/service/userDetail.js

@@ -59,8 +59,11 @@ class UserDetailService extends Service {
 
     let where = { user_id };
     if (product) {
-      ret.product = product;
-      where.service = product;
+      product = JSON.parse(product);
+      if (product.length > 0) {
+        ret.product = product;
+        where.service = product;
+      }
     }
 
     const appKeys = await ctx.yizhiModel.UserService.findAll({
@@ -139,7 +142,11 @@ class UserDetailService extends Service {
 
     let where = { user_id };
     if (product) {
-      where.service = product;
+      product = JSON.parse(product);
+      if (product.length > 0) {
+        ret.product = product;
+        where.service = product;
+      }
     }
 
     const appKeys = await ctx.yizhiModel.UserService.findAll({
@@ -154,6 +161,9 @@ class UserDetailService extends Service {
           appList.push(value.appkey);
         }
       });
+      if (end_date.length === 7) {
+        end_date = moment(end_date + '-01').add(1, 'month').format('YYYY-MM');
+      }
       where = {
         user_id: ctx.userId,
         appKey: appList,