1

app/api/controller/user/UserBillController.php

@@ -119,7 +119,8 @@ class UserBillController
             ['page', 0],
             ['limit', 0],
         ], $request, true);
-        return app('json')->successful(UserBill::getUserBillList($request->uid(), $page, $limit, $type));
+        list($list, $income, $expend) = UserBill::getUserBillList($request->uid(), $page, $limit, $type);
+        return app('json')->successful(compact('list', 'income', 'expend'));
     }
 
     /**
@@ -345,7 +346,10 @@ class UserBillController
         list($page, $limit, $pm) = UtilService::getMore([
             ['page', 0], ['limit', 0], ['pm', 1]
         ], $request, true);
-        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'integral', $pm));
+        $list = UserBill::userBillList($request->uid(), $page, $limit, 'integral', $pm);
+        $income = UserBill::where('category', 'integral')->where('pm', 1)->where('status', 1)->sum('number');
+        $expend = UserBill::where('category', 'integral')->where('pm', 0)->where('status', 1)->sum('number');
+        return app('json')->success('ok', compact('list', 'income', 'expend'));
 
     }
 
@@ -354,7 +358,9 @@ class UserBillController
         list($page, $limit, $pm) = UtilService::getMore([
             ['page', 0], ['limit', 0], ['pm', 1]
         ], $request, true);
-        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'cash', $pm));
-
+        $list = UserBill::userBillList($request->uid(), $page, $limit, 'cash', $pm);
+        $income = UserBill::where('category', 'cash')->where('pm', 1)->where('status', 1)->sum('number');
+        $expend = UserBill::where('category', 'cash')->where('pm', 0)->where('status', 1)->sum('number');
+        return app('json')->success('ok', compact('list', 'income', 'expend'));
     }
 }

app/models/user/UserBill.php

@@ -178,7 +178,14 @@ class UserBill extends BaseModel
             $value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm')->order('add_time DESC')->select();
             array_push($data, $value);
         }
-        return $data;
+        if (in_array($type, [1, 2])) {
+            $income = UserBill::where('category', 'now_money')->where('type', '<>', 'brokerage')->where('pm', 1)->where('status', 1)->sum('number');
+            $expend = UserBill::where('category', 'now_money')->where('type', '<>', 'brokerage')->where('pm', 0)->where('status', 1)->sum('number');
+        } else {
+            $income = UserBill::where('category', 'now_money')->where('type', 'brokerage')->where('pm', 1)->where('status', 1)->sum('number');
+            $expend = UserBill::where('category', 'now_money')->where('type', 'brokerage')->where('pm', 0)->where('status', 1)->sum('number');
+        }
+        return [$data, $income, $expend];
     }
 
     /**

crmeb/subscribes/TaskSubscribe.php

@@ -43,8 +43,8 @@ class TaskSubscribe
      */
     public function onTask_10()
     {
-        DayAward::dayAward();
-        DayAward::dayAwardOut();
+//        DayAward::dayAward();
+//        DayAward::dayAwardOut();
     }
 
     /**