Kirin 3 years ago
parent
commit
00f4812e01

+ 7 - 2
app/admin/controller/user/User.php

@@ -72,7 +72,7 @@ class User extends AuthController
         list($group_id) = Util::postMore([
             ['group_id', 0],
         ], $this->request, true);
-        $uids = explode(',',$uid);
+        $uids = explode(',', $uid);
         $res = UserModel::whereIn('uid', $uids)->update(['group_id' => $group_id]);
         if ($res) {
             return Json::successful('设置成功');
@@ -432,7 +432,12 @@ class User extends AuthController
         }
         $edit['status'] = $data['status'];
         $edit['real_name'] = $data['real_name'];
-        $edit['phone'] = $data['phone'];
+        if (UserModel::where('uid', '<>', $uid)->where('account', $data['phone'])->find())
+            return Json::fail('手机号码已被使用');
+        else {
+            $edit['phone'] = $data['phone'];
+            $edit['account'] = $data['phone'];
+        }
         $edit['card_id'] = $data['card_id'];
         $edit['birthday'] = strtotime($data['birthday']);
         $edit['mark'] = $data['mark'];

+ 6 - 5
app/api/controller/mining/MiningController.php

@@ -74,12 +74,13 @@ class MiningController
 
     public function mining_index(Request $request)
     {
-        $all = UserMiningMachine::where('get_money_type', 'in', 'XCH')->where('uid', $request->uid())->sum('num');
-        $doing = UserMiningMachine::where('get_money_type', 'in', 'XCH')->where('uid', $request->uid())->where('status', 'in', [1, 2])->sum('num');
-        $stand = UserMiningMachine::where('get_money_type', 'in', 'XCH')->where('uid', $request->uid())->where('status', 0)->sum('num');
+        $type = $request->get('type','XCH');
+        $all = UserMiningMachine::where('get_money_type', 'in', $type)->where('uid', $request->uid())->sum('num');
+        $doing = UserMiningMachine::where('get_money_type', 'in', $type)->where('uid', $request->uid())->where('status', 'in', [1, 2])->sum('num');
+        $stand = UserMiningMachine::where('get_money_type', 'in', $type)->where('uid', $request->uid())->where('status', 0)->sum('num');
         $umids = UserMiningMachine::where('uid', $request->uid())->column('id');
-        $all_mining = UserMining::where('get_money_type', 'in', 'XCH')->where('umid', 'in', $umids)->sum('get_money');
-        $all_lock = UserMining::where('get_money_type', 'in', 'XCH')->where('umid', 'in', $umids)->sum('lock_money');
+        $all_mining = UserMining::where('get_money_type', 'in', $type)->where('umid', 'in', $umids)->sum('get_money');
+        $all_lock = UserMining::where('get_money_type', 'in', $type)->where('umid', 'in', $umids)->sum('lock_money');
         return app('json')->success('ok', compact('all', 'doing', 'stand', 'all_mining', 'all_lock'));
     }