Kirin 4 jaren geleden
bovenliggende
commit
c2eab508ac
2 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. 1 1
      app/api/controller/user/UserBillController.php
  2. 2 0
      app/models/user/User.php

+ 1 - 1
app/api/controller/user/UserBillController.php

@@ -90,7 +90,7 @@ class UserBillController
         $data['group_num'] = count($sub_recommend);
         $data['group_achievenent'] = UserMiningMachine::where('uid', 'in', $sub_recommend)->where('status', 'in', [0, 1])->where('mining_start_time', '<=', time())
             ->where('mining_end_time', '>', time())->where('paid', 1)->sum('num');
-        $data['today_achievement'] = UserMiningMachine::where('uid', 'in', $sub_recommend)->where('status', 'in', [0, 1])->where('mining_start_time', '<=', time())
+        $data['today_achievement'] = UserMiningMachine::where('uid', 'in', $sub_recommend)->where('status', 'in', [0, 1])
             ->where('mining_end_time', '>', time())->whereTime('pay_time', 'today')->where('paid', 1)->sum('num');
         return app('json')->successful($data);
     }

+ 2 - 0
app/models/user/User.php

@@ -560,6 +560,8 @@ class User extends BaseModel
                 ->where('mining_end_time', '>', time())->where('paid', 1)->sum('num');
             $item['wait_mining'] = UserMiningMachine::where('uid', $item['uid'])->where('status', 'in', [0, 1])->where('mining_start_time', '>', time())
                 ->where('mining_end_time', '>', time())->where('paid', 1)->sum('num');
+            $item['today_mining'] = UserMiningMachine::where('uid', $item['uid'])->where('status', 'in', [0, 1])->where('mining_end_time', '>', time())
+                ->where('paid', 1)->whereTime('pay_time', 'today')->sum('num');
         });
         if ($list) return $list->toArray();
         else return [];