Merge branch 'master' of http://git.qiniu1314.com/Kirin/shenying

app/services/order/StoreOrderServices.php

@@ -1516,15 +1516,29 @@ HTML;
             'date' => '今日'
         ];
         $integralService = app()->make(UserAwardIntegralServices::class);
-        $info = array_values(compact('sales', 'visits', 'order', 'user'));
+
+        $lack = [
+            'today' => $integralService->getLake('today'),
+            'yesterday' => $integralService->getLake('yesterday'),
+            'today_ratio' => $user_today_ratio,
+//            'week' => $this_week_user,
+//            'last_week' => $last_week_user,
+//            'week_ratio' => $user_week_ratio,
+            'total' => $integralService->getLake() . '元',
+            'date' => '今日'
+        ];
+
+        $info = array_values(compact('sales', 'visits', 'order', 'user', 'lack'));
         $info[0]['title'] = '销售额';
         $info[1]['title'] = '用户访问量';
         $info[2]['title'] = '订单量';
         $info[3]['title'] = '新增用户';
+        $info[3]['title'] = '资金池';
         $info[0]['total_name'] = '本月销售额';
         $info[1]['total_name'] = '本月访问量';
         $info[2]['total_name'] = '本月订单量';
         $info[3]['total_name'] = '本月新增用户';
+        $info[3]['total_name'] = '资金池累计';
         return $info;
     }
 

app/services/user/UserAwardIntegralServices.php

@@ -14,6 +14,7 @@ namespace app\services\user;
 
 use app\dao\system\AwardLakeDao;
 use app\dao\user\UserIntegralDao;
+use app\model\system\AwardLake;
 use app\model\user\UserIntegral;
 use app\services\BaseServices;
 use crmeb\services\FormBuilder;
@@ -172,9 +173,13 @@ class UserAwardIntegralServices extends BaseServices
      * 获取单条数据
      * @return float
      */
-    public function getLake()
+    public function getLake($time = '')
     {
-        return $this->lake_dao->sum([], 'num');
+        if ($time == '') {
+            return $this->lake_dao->sum([], 'num');
+        } else {
+            return AwardLake::whereTime('add_time', $time)->sum('num');
+        }
     }
 
     /**