会员升级

app/services/order/StoreOrderServices.php

@@ -1530,7 +1530,7 @@ HTML;
             'today' => $today,
             'yesterday' => $yesterday,
             'today_ratio' => $today_ratio,
-            'total' => $integralService->getIntegralSum(['add_time_date' => 'month']),
+            'total' => $integralService->getIntegralSum([], 'num-sent_num'),
             'date' => '今日'
         ];
 
@@ -1568,7 +1568,29 @@ HTML;
             'date' => '今日'
         ];
 
-        $info = array_values(compact('sales', 'visits', 'order', 'user', 'lack', 'a_integral', 's_integral', 'l_price'));
+        $today = UserBill::where('category', 'award_integral')->where('pm', 1)->whereTime('add_time', 'today')->sum('number');
+        $yesterday = UserBill::where('category', 'award_integral')->where('pm', 1)->whereTime('add_time', 'yesterday')->sum('number');
+        $today_ratio = $this->countRate($today, $yesterday);
+        $send_price = [
+            'today' => $today,
+            'yesterday' => $yesterday,
+            'today_ratio' => $today_ratio,
+            'total' => UserBill::where('category', 'award_integral')->where('pm', 1)->whereTime('add_time', 'month')->sum('number'),
+            'date' => '今日'
+        ];
+
+        $today = UserBill::where('category', 'award_integral')->where('pm', 0)->whereTime('add_time', 'today')->sum('number');
+        $yesterday = UserBill::where('category', 'award_integral')->where('pm', 0)->whereTime('add_time', 'yesterday')->sum('number');
+        $today_ratio = $this->countRate($today, $yesterday);
+        $extract_price = [
+            'today' => $today,
+            'yesterday' => $yesterday,
+            'today_ratio' => $today_ratio,
+            'total' => UserBill::where('category', 'award_integral')->where('pm', 0)->whereTime('add_time', 'month')->sum('number'),
+            'date' => '今日'
+        ];
+
+        $info = array_values(compact('sales', 'visits', 'order', 'user', 'lack', 'a_integral', 's_integral', 'l_price', 'send_price', 'extract_price'));
         $info[0]['title'] = '销售额';
         $info[1]['title'] = '用户访问量';
         $info[2]['title'] = '订单量';
@@ -1577,14 +1599,18 @@ HTML;
         $info[5]['title'] = '消费分';
         $info[6]['title'] = '佣金';
         $info[7]['title'] = '能量';
+        $info[8]['title'] = '释放参考分';
+        $info[9]['title'] = '提取参考分';
         $info[0]['total_name'] = '本月销售额';
         $info[1]['total_name'] = '本月访问量';
         $info[2]['total_name'] = '本月订单量';
         $info[3]['total_name'] = '本月新增用户';
-        $info[4]['total_name'] = '本月参考分';
+        $info[4]['total_name'] = '待释放';
         $info[5]['total_name'] = '剩余消费分';
         $info[6]['total_name'] = '剩余佣金';
         $info[7]['total_name'] = '剩余能量值';
+        $info[8]['total_name'] = '本月释放';
+        $info[9]['total_name'] = '本月提取';
         return $info;
     }