会员升级

app/services/order/StoreOrderServices.php

@@ -1531,7 +1531,7 @@ HTML;
             'today' => $today,
             'yesterday' => $yesterday,
             'today_ratio' => $today_ratio,
-            'total' => bcsub((string)$integralService->getIntegralSum([], 'num'), (string)$integralService->getIntegralSum([], 'sent_num'), 2),
+            'total' => bcsub((string)$integralService->getIntegralSum([], 'num'), (string)$integralService->getIntegralSum([], 'sent_num'), 2) . '|' . $integralService->getIntegralSum([], 'extract_num'),
             'date' => '今日'
         ];
 
@@ -1558,8 +1558,8 @@ HTML;
         ];
 
 
-        $today = UserBill::where('category', 'energy')->where('pm', 1)->where('type','static_energy')->whereTime('add_time', 'today')->sum('number');
-        $yesterday = UserBill::where('category', 'energy')->where('pm', 1)->where('type','static_energy')->whereTime('add_time', 'yesterday')->sum('number');
+        $today = UserBill::where('category', 'energy')->where('pm', 1)->where('type', 'static_energy')->whereTime('add_time', 'today')->sum('number');
+        $yesterday = UserBill::where('category', 'energy')->where('pm', 1)->where('type', 'static_energy')->whereTime('add_time', 'yesterday')->sum('number');
         $today_ratio = $this->countRate($today, $yesterday);
         $l_price = [
             'today' => $today,
@@ -1569,8 +1569,8 @@ HTML;
             'date' => '今日'
         ];
 
-        $today = UserMoney::where('pm', 1)->where('type','static_money')->whereTime('add_time', 'today')->sum('number');
-        $yesterday = UserMoney::where('pm', 1)->where('type','static_money')->whereTime('add_time', 'yesterday')->sum('number');
+        $today = UserMoney::where('pm', 1)->where('type', 'static_money')->whereTime('add_time', 'today')->sum('number');
+        $yesterday = UserMoney::where('pm', 1)->where('type', 'static_money')->whereTime('add_time', 'yesterday')->sum('number');
         $today_ratio = $this->countRate($today, $yesterday);
         $now_money = [
             'today' => $today,
@@ -1618,7 +1618,7 @@ HTML;
         $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'] = '剩余能量值';