会员升级

app/services/order/StoreOrderServices.php

@@ -1558,8 +1558,8 @@ HTML;
         ];
 
 
-        $today = UserBill::where('category', 'energy')->where('pm', 1)->whereTime('add_time', 'today')->sum('number');
-        $yesterday = UserBill::where('category', 'energy')->where('pm', 1)->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)->whereTime('add_time', 'today')->sum('number');
-        $yesterday = UserMoney::where('pm', 1)->whereTime('add_time', 'yesterday')->sum('number');
+        $today = UserMoney::where('pm', 1)->where('type','static_now_money')->whereTime('add_time', 'today')->sum('number');
+        $yesterday = UserMoney::where('pm', 1)->where('type','static_now_money')->whereTime('add_time', 'yesterday')->sum('number');
         $today_ratio = $this->countRate($today, $yesterday);
         $now_money = [
             'today' => $today,