fix:更改model类名

app/controller/Game.php

@@ -4,7 +4,7 @@ declare (strict_types = 1);
 namespace app\controller;
 
 use app\BaseController;
-use app\model\MerchantGameModel;
+use app\model\GameModel;
 use think\facade\Request;
 
 class Game extends BaseController
@@ -48,13 +48,13 @@ class Game extends BaseController
         
         try {
             // 获取游戏列表
-            $result = MerchantGameModel::getGameList($page, $limit, $filters);
+            $result = GameModel::getGameList($page, $limit, $filters);
             
             // 处理列表数据
             foreach ($result['list'] as &$game) {
-                $game['platform_text'] = MerchantGameModel::getPlatformText($game['game_platform']);
-                $game['status_text'] = MerchantGameModel::getStatusText($game['status']);
-                $game['rtp_type_text'] = MerchantGameModel::getRtpTypeText($game['rtp_type']);
+                $game['platform_text'] = GameModel::getPlatformText($game['game_platform']);
+                $game['status_text'] = GameModel::getStatusText($game['status']);
+                $game['rtp_type_text'] = GameModel::getRtpTypeText($game['rtp_type']);
                 $game['free_game_status_text'] = $game['free_game_status'] ? '支持' : '不支持';
                 $game['terminal_spin_text'] = $game['terminal_spin'] ? '开启' : '关闭';
                 $game['create_time_text'] = date('Y-m-d H:i:s', $game['create_time']);
@@ -99,15 +99,15 @@ class Game extends BaseController
         }
         
         try {
-            $game = MerchantGameModel::getGameDetail($id);
+            $game = GameModel::getGameDetail($id);
             if (!$game) {
                 return json_error([], '游戏不存在');
             }
             
             // 添加文本字段
-            $game['platform_text'] = MerchantGameModel::getPlatformText($game['game_platform']);
-            $game['status_text'] = MerchantGameModel::getStatusText($game['status']);
-            $game['rtp_type_text'] = MerchantGameModel::getRtpTypeText($game['rtp_type']);
+            $game['platform_text'] = GameModel::getPlatformText($game['game_platform']);
+            $game['status_text'] = GameModel::getStatusText($game['status']);
+            $game['rtp_type_text'] = GameModel::getRtpTypeText($game['rtp_type']);
             $game['free_game_status_text'] = $game['free_game_status'] ? '支持' : '不支持';
             $game['terminal_spin_text'] = $game['terminal_spin'] ? '开启' : '关闭';
             $game['create_time_text'] = date('Y-m-d H:i:s', $game['create_time']);
@@ -154,12 +154,12 @@ class Game extends BaseController
         }
         
         // 检查游戏ID是否已存在
-        if (MerchantGameModel::checkGameIdExists($data['game_id'])) {
+        if (GameModel::checkGameIdExists($data['game_id'])) {
             return json_error([], '游戏ID已存在');
         }
         
         try {
-            $game = MerchantGameModel::createGame($data);
+            $game = GameModel::createGame($data);
             return json_success(['id' => $game->id], '创建游戏成功');
         } catch (\Exception $e) {
             return json_error([], '创建游戏失败：' . $e->getMessage());
@@ -198,20 +198,20 @@ class Game extends BaseController
         }
         
         // 检查游戏是否存在
-        $game = MerchantGameModel::getGameDetail($id);
+        $game = GameModel::getGameDetail($id);
         if (!$game) {
             return json_error([], '游戏不存在');
         }
         
         // 如果修改了游戏ID，检查是否与其他游戏冲突
         if (isset($data['game_id']) && $data['game_id'] != $game['game_id']) {
-            if (MerchantGameModel::checkGameIdExists($data['game_id'], $id)) {
+            if (GameModel::checkGameIdExists($data['game_id'], $id)) {
                 return json_error([], '游戏ID已存在');
             }
         }
         
         try {
-            MerchantGameModel::updateGame($id, $data);
+            GameModel::updateGame($id, $data);
             return json_success([], '更新游戏成功');
         } catch (\Exception $e) {
             return json_error([], '更新游戏失败：' . $e->getMessage());
@@ -240,15 +240,15 @@ class Game extends BaseController
         }
         
         if (!in_array($status, [
-            MerchantGameModel::STATUS_NORMAL,
-            MerchantGameModel::STATUS_MAINTAIN,
-            MerchantGameModel::STATUS_DISABLED
+            GameModel::STATUS_NORMAL,
+            GameModel::STATUS_MAINTAIN,
+            GameModel::STATUS_DISABLED
         ])) {
             return json_error([], '状态值无效');
         }
         
         try {
-            $result = MerchantGameModel::updateGameStatus($id, $status);
+            $result = GameModel::updateGameStatus($id, $status);
             if ($result) {
                 return json_success([], '状态更新成功');
             } else {
@@ -281,15 +281,15 @@ class Game extends BaseController
         }
         
         if (!in_array($status, [
-            MerchantGameModel::STATUS_NORMAL,
-            MerchantGameModel::STATUS_MAINTAIN,
-            MerchantGameModel::STATUS_DISABLED
+            GameModel::STATUS_NORMAL,
+            GameModel::STATUS_MAINTAIN,
+            GameModel::STATUS_DISABLED
         ])) {
             return json_error([], '状态值无效');
         }
         
         try {
-            $result = MerchantGameModel::batchUpdateStatus($ids, $status);
+            $result = GameModel::batchUpdateStatus($ids, $status);
             if ($result > 0) {
                 return json_success(['updated' => $result], '批量更新成功');
             } else {
@@ -315,7 +315,7 @@ class Game extends BaseController
         }
         
         try {
-            $statistics = MerchantGameModel::getGameStatistics();
+            $statistics = GameModel::getGameStatistics();
             return json_success($statistics, '获取成功');
         } catch (\Exception $e) {
             return json_error([], '获取游戏统计失败：' . $e->getMessage());
@@ -333,7 +333,7 @@ class Game extends BaseController
         }
         
         try {
-            $platforms = MerchantGameModel::getAllPlatforms();
+            $platforms = GameModel::getAllPlatforms();
             return json_success($platforms, '获取成功');
         } catch (\Exception $e) {
             return json_error([], '获取游戏平台失败：' . $e->getMessage());
@@ -361,13 +361,13 @@ class Game extends BaseController
         
         try {
             // 检查游戏是否存在
-            $game = MerchantGameModel::getGameDetail($id);
+            $game = GameModel::getGameDetail($id);
             if (!$game) {
                 return json_error([], '游戏不存在');
             }
             
             // 删除游戏
-            MerchantGameModel::where('id', $id)->delete();
+            GameModel::where('id', $id)->delete();
             
             return json_success([], '删除成功');
         } catch (\Exception $e) {
@@ -408,7 +408,7 @@ class Game extends BaseController
         
         try {
             // 获取所有数据
-            $result = MerchantGameModel::getGameList(1, 100000, $filters);
+            $result = GameModel::getGameList(1, 100000, $filters);
             
             // 生成CSV数据
             $csvData = "ID,游戏ID,游戏平台,中文名称,英文名称,RTP,RTP类型,免费游戏,下注线数,最高倍数,默认押注,最低押注,止损止赢,状态,创建时间\n";
@@ -418,18 +418,18 @@ class Game extends BaseController
                     "%d,%d,%s,%s,%s,%.2f,%s,%s,%d,%d,%.2f,%.2f,%s,%s,%s\n",
                     $game['id'],
                     $game['game_id'],
-                    MerchantGameModel::getPlatformText($game['game_platform']),
+                    GameModel::getPlatformText($game['game_platform']),
                     $game['title'],
                     $game['title_en'],
                     $game['rtp'],
-                    MerchantGameModel::getRtpTypeText($game['rtp_type']),
+                    GameModel::getRtpTypeText($game['rtp_type']),
                     $game['free_game_status'] ? '支持' : '不支持',
                     $game['bet_line_count'],
                     $game['max_multiple_count'],
                     $game['default_deposit'],
                     $game['min_deposit'],
                     $game['terminal_spin'] ? '开启' : '关闭',
-                    MerchantGameModel::getStatusText($game['status']),
+                    GameModel::getStatusText($game['status']),
                     date('Y-m-d H:i:s', $game['create_time'])
                 );
             }

app/controller/Player.php

@@ -4,7 +4,7 @@ declare (strict_types = 1);
 namespace app\controller;
 
 use app\BaseController;
-use app\model\MerchantPlayerModel;
+use app\model\PlayerModel;
 use think\facade\Request;
 
 class Player extends BaseController
@@ -51,12 +51,12 @@ class Player extends BaseController
         
         try {
             // 获取玩家列表
-            $result = MerchantPlayerModel::getPlayerListByMerchant($loginInfo['merchant_id'], $page, $limit, $filters);
+            $result = PlayerModel::getPlayerListByMerchant($loginInfo['merchant_id'], $page, $limit, $filters);
             
             // 处理列表数据
             foreach ($result['list'] as &$player) {
-                $player['status_text'] = MerchantPlayerModel::getStatusText($player['status']);
-                $player['adjust_status_text'] = MerchantPlayerModel::getAdjustStatusText($player['adjust_status']);
+                $player['status_text'] = PlayerModel::getStatusText($player['status']);
+                $player['adjust_status_text'] = PlayerModel::getAdjustStatusText($player['adjust_status']);
                 $player['login_time_text'] = $player['login_time'] ? date('Y-m-d H:i:s', $player['login_time']) : '未登录';
                 $player['create_time_text'] = date('Y-m-d H:i:s', $player['create_time']);
                 $player['update_time_text'] = date('Y-m-d H:i:s', $player['update_time']);
@@ -88,14 +88,14 @@ class Player extends BaseController
         }
         
         try {
-            $player = MerchantPlayerModel::getPlayerDetail($playerId, $loginInfo['merchant_id']);
+            $player = PlayerModel::getPlayerDetail($playerId, $loginInfo['merchant_id']);
             if (!$player) {
                 return json_error([], '玩家不存在');
             }
             
             // 添加状态文本
-            $player['status_text'] = MerchantPlayerModel::getStatusText($player['status']);
-            $player['adjust_status_text'] = MerchantPlayerModel::getAdjustStatusText($player['adjust_status']);
+            $player['status_text'] = PlayerModel::getStatusText($player['status']);
+            $player['adjust_status_text'] = PlayerModel::getAdjustStatusText($player['adjust_status']);
             $player['login_time_text'] = $player['login_time'] ? date('Y-m-d H:i:s', $player['login_time']) : '未登录';
             $player['create_time_text'] = date('Y-m-d H:i:s', $player['create_time']);
             $player['update_time_text'] = date('Y-m-d H:i:s', $player['update_time']);
@@ -127,12 +127,12 @@ class Player extends BaseController
             return json_error([], '玩家ID不能为空');
         }
         
-        if (!in_array($status, [MerchantPlayerModel::STATUS_NORMAL, MerchantPlayerModel::STATUS_FROZEN])) {
+        if (!in_array($status, [PlayerModel::STATUS_NORMAL, PlayerModel::STATUS_FROZEN])) {
             return json_error([], '状态值无效');
         }
         
         try {
-            $result = MerchantPlayerModel::updatePlayerStatus($playerId, $loginInfo['merchant_id'], $status);
+            $result = PlayerModel::updatePlayerStatus($playerId, $loginInfo['merchant_id'], $status);
             if ($result) {
                 return json_success([], '状态更新成功');
             } else {
@@ -165,15 +165,15 @@ class Player extends BaseController
         }
         
         if (!in_array($adjustStatus, [
-            MerchantPlayerModel::ADJUST_STATUS_NORMAL,
-            MerchantPlayerModel::ADJUST_STATUS_WIN,
-            MerchantPlayerModel::ADJUST_STATUS_LOSE
+            PlayerModel::ADJUST_STATUS_NORMAL,
+            PlayerModel::ADJUST_STATUS_WIN,
+            PlayerModel::ADJUST_STATUS_LOSE
         ])) {
             return json_error([], '调控状态值无效');
         }
         
         try {
-            $result = MerchantPlayerModel::updatePlayerAdjustStatus($playerId, $loginInfo['merchant_id'], $adjustStatus);
+            $result = PlayerModel::updatePlayerAdjustStatus($playerId, $loginInfo['merchant_id'], $adjustStatus);
             if ($result) {
                 return json_success([], '调控状态更新成功');
             } else {
@@ -199,7 +199,7 @@ class Player extends BaseController
         }
         
         try {
-            $statistics = MerchantPlayerModel::getPlayerStatistics($loginInfo['merchant_id']);
+            $statistics = PlayerModel::getPlayerStatistics($loginInfo['merchant_id']);
             return json_success($statistics, '获取成功');
         } catch (\Exception $e) {
             return json_error([], '获取玩家统计失败：' . $e->getMessage());
@@ -227,12 +227,12 @@ class Player extends BaseController
             return json_error([], '请选择要更新的玩家');
         }
         
-        if (!in_array($status, [MerchantPlayerModel::STATUS_NORMAL, MerchantPlayerModel::STATUS_FROZEN])) {
+        if (!in_array($status, [PlayerModel::STATUS_NORMAL, PlayerModel::STATUS_FROZEN])) {
             return json_error([], '状态值无效');
         }
         
         try {
-            $result = MerchantPlayerModel::batchUpdateStatus($playerIds, $loginInfo['merchant_id'], $status);
+            $result = PlayerModel::batchUpdateStatus($playerIds, $loginInfo['merchant_id'], $status);
             if ($result > 0) {
                 return json_success(['updated' => $result], '批量更新成功');
             } else {
@@ -265,15 +265,15 @@ class Player extends BaseController
         }
         
         if (!in_array($adjustStatus, [
-            MerchantPlayerModel::ADJUST_STATUS_NORMAL,
-            MerchantPlayerModel::ADJUST_STATUS_WIN,
-            MerchantPlayerModel::ADJUST_STATUS_LOSE
+            PlayerModel::ADJUST_STATUS_NORMAL,
+            PlayerModel::ADJUST_STATUS_WIN,
+            PlayerModel::ADJUST_STATUS_LOSE
         ])) {
             return json_error([], '调控状态值无效');
         }
         
         try {
-            $result = MerchantPlayerModel::batchUpdateAdjustStatus($playerIds, $loginInfo['merchant_id'], $adjustStatus);
+            $result = PlayerModel::batchUpdateAdjustStatus($playerIds, $loginInfo['merchant_id'], $adjustStatus);
             if ($result > 0) {
                 return json_success(['updated' => $result], '批量更新成功');
             } else {
@@ -320,7 +320,7 @@ class Player extends BaseController
         
         try {
             // 获取所有数据
-            $result = MerchantPlayerModel::getPlayerListByMerchant($loginInfo['merchant_id'], 1, 100000, $filters);
+            $result = PlayerModel::getPlayerListByMerchant($loginInfo['merchant_id'], 1, 100000, $filters);
             
             // 生成CSV数据
             $csvData = "玩家ID,昵称,注册IP,登录IP,余额,今日输赢,历史输赢,今日下注,今日登录次数,历史登录次数,状态,调控状态,最后登录时间,注册时间\n";
@@ -338,8 +338,8 @@ class Player extends BaseController
                     $player['today_bet_amount'],
                     $player['today_login_count'],
                     $player['history_login_count'],
-                    MerchantPlayerModel::getStatusText($player['status']),
-                    MerchantPlayerModel::getAdjustStatusText($player['adjust_status']),
+                    PlayerModel::getStatusText($player['status']),
+                    PlayerModel::getAdjustStatusText($player['adjust_status']),
                     $player['login_time'] ? date('Y-m-d H:i:s', $player['login_time']) : '未登录',
                     date('Y-m-d H:i:s', $player['create_time'])
                 );