update：统一玩家id等字段

app/controller/Player.php

@@ -24,7 +24,7 @@ class Player extends BaseController
         $filters = [
             'uname' => Request::get('uname', '', 'trim'),
             'nickname' => Request::get('nickname', '', 'trim'),
-            'user_id' => Request::get('user_id', 0, 'intval'),
+            'player_id' => Request::get('user_id', 0, 'intval'),
             'status' => Request::get('status', ''),
             'adjust_status' => Request::get('adjust_status', ''),
             'login_ip' => Request::get('login_ip', '', 'trim'),
@@ -59,7 +59,7 @@ class Player extends BaseController
     {
         $userInfo = $this->request->userInfo;
         
-        $playerId = Request::get('player_id', 0, 'intval');
+        $playerId = Request::get('user_id', 0, 'intval');
         if (!$playerId) {
             return json_error([], '玩家ID不能为空');
         }
@@ -90,7 +90,7 @@ class Player extends BaseController
 
         print_r($userInfo);
         
-        $playerIds = Request::post('player_ids', []);
+        $playerIds = Request::post('user_ids', []);
         $status = Request::post('status', 0, 'intval');
         
         if (empty($playerIds) || !is_array($playerIds)) {
@@ -120,7 +120,7 @@ class Player extends BaseController
     {
         $userInfo = $this->request->userInfo;
         
-        $playerIds = Request::post('player_ids', []);
+        $playerIds = Request::post('user_ids', []);
         $adjustStatus = Request::post('adjust_status', 0, 'intval');
         
         if (empty($playerIds) || !is_array($playerIds)) {
@@ -172,7 +172,7 @@ class Player extends BaseController
         // 获取所有过滤条件
         $filters = [
             'nickname' => Request::get('nickname', '', 'trim'),
-            'player_id' => Request::get('player_id', 0, 'intval'),
+            'player_id' => Request::get('user_id', 0, 'intval'),
             'status' => Request::get('status', ''),
             'adjust_status' => Request::get('adjust_status', ''),
             'login_ip' => Request::get('login_ip', '', 'trim'),
@@ -193,7 +193,7 @@ class Player extends BaseController
             foreach ($result['list'] as $player) {
                 $csvData .= sprintf(
                     "%d,%s,%s,%s,%.4f,%.4f,%.4f,%.4f,%d,%d,%s,%s,%s,%s\n",
-                    $player['player_id'],
+                    $player['user_id'],
                     $player['nickname'],
                     $player['reg_ip'],
                     $player['login_ip'],

app/model/MerchantsUserModel.php

@@ -109,8 +109,8 @@ class MerchantsUserModel extends Model
             $query->where('nickname', 'like', '%' . $filters['nickname'] . '%');
         }
 
-        if (!empty($filters['user_id'])) {
-            $query->where('user_id', $filters['user_id']);
+        if (!empty($filters['player_id'])) {
+            $query->where('user_id', $filters['player_id']);
         }
 
         if (isset($filters['status']) && $filters['status'] !== '') {
@@ -178,7 +178,7 @@ class MerchantsUserModel extends Model
      */
     public static function getPlayerDetail($playerId, $merchantId)
     {
-        $player = self::where('uname', $playerId)
+        $player = self::where('user_id', $playerId)
             ->where('app_id', $merchantId)
             ->find();
             
@@ -189,7 +189,6 @@ class MerchantsUserModel extends Model
             unset($player['short_token']);
             
             // 转换字段名
-            $player['player_id'] = $player['uname'];
             $player['merchant_id'] = $player['app_id'];
             $player['today_login_count'] = $player['today_count'];
             $player['history_login_count'] = $player['history_day_count'];
@@ -209,7 +208,7 @@ class MerchantsUserModel extends Model
     public static function updatePlayerStatus($playerIds, $merchantId, $status)
     {
         return self::where('app_id', $merchantId)
-            ->whereIn('uname', $playerIds)
+            ->whereIn('user_id', $playerIds)
             ->update(['status' => $status]);
     }
 
@@ -219,7 +218,7 @@ class MerchantsUserModel extends Model
     public static function updatePlayerAdjustStatus($playerIds, $merchantId, $adjustStatus)
     {
         return self::where('app_id', $merchantId)
-            ->whereIn('uname', $playerIds)
+            ->whereIn('user_id', $playerIds)
             ->update(['adjust_status' => $adjustStatus]);
     }