理财

app/api/controller/mining/MiningController.php

@@ -177,11 +177,12 @@ class MiningController
         ]);
         $where['uid'] = $request->uid();
 
+        $umid = UserMiningMachine::where('uid', $where['uid'])->column('id');
         return app('json')->success('ok', [
-            'all_get' => UserMining::where('get_money_type', $where['type'])->where('uid', $where['uid'])->sum('get_money'),
-            'all_unlock' => UserMining::where('get_money_type', $where['type'])->where('uid', $where['uid'])->sum('unlock'),
-            'all_unstand' => UserMining::where('get_money_type', $where['type'])->where('uid', $where['uid'])->sum('unstand'),
-            'all_lock' => UserMining::where('get_money_type', $where['type'])->where('uid', $where['uid'])->sum('lock_money'),
+            'all_get' => UserMining::where('get_money_type', $where['type'])->where('umid', $umid)->sum('get_money'),
+            'all_unlock' => UserMining::where('get_money_type', $where['type'])->where('umid', $umid)->sum('unlock'),
+            'all_unstand' => UserMining::where('get_money_type', $where['type'])->where('umid', $umid)->sum('unstand'),
+            'all_lock' => UserMining::where('get_money_type', $where['type'])->where('umid', $umid)->sum('lock_money'),
             'stand' => UserMiningMachine::where('get_money_type', $where['type'])->where('uid', $where['uid'])->sum('stand_money'),
             'list' => UserMining::getList($where)
         ]);

app/models/mining/UserMining.php

@@ -25,7 +25,10 @@ class UserMining extends BaseModel
     public static function getList($where)
     {
         $model = new self();
-        if (isset($where['uid']) && $where['uid']) $model = $model->where('uid', $where['uid']);
+        if (isset($where['uid']) && $where['uid']) {
+            $umid = UserMiningMachine::where('uid', $where['uid'])->column('id');
+            $model = $model->where('umid', 'in', $umid);
+        }
         if (isset($where['type']) && $where['type']) $model = $model->where('get_money_type', $where['type']);
         $model = $model->order('id desc');
         $data = ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()->each(function ($item) {