合服处理

Application/Sdk/Controller/ExchangeController.class.php

@@ -60,6 +60,13 @@ class ExchangeController extends BaseController{
 				'server_name' => $request['server_name']
         	])->find();
         	$request['server_id'] = $server['server_id'];
+        	if (!isset($request['server_id']) || !$request['server_id']) {
+        		$unionServer = M('server_union', 'tab_')->where([
+        			'game_id' => $request['game_id'],
+        			'server_name' => $request['server_name']
+        		])->find();
+        		$request['server_id'] = $unionServer['server_id'];
+        	} 
         	
         	$userPlayInfo = M('user_play_info', 'tab_')->where([
         		'user_id' => $request['user_id'],

Application/Sdk/Controller/UserController.class.php

@@ -1308,6 +1308,25 @@ class UserController extends BaseController
             M('server', 'tab_')->data($serverData)->add();
         }
         
+        // 处理合服情况
+        $server = M('server', 'tab_')->where(['server_name' => $request['server_name'], 'game_id' => $request['game_id']])->find();
+        if (empty($server)) {
+        	$server = M('server_union', 'tab_')->where(['server_name' => $request['server_name'], 'game_id' => $request['game_id']])->find();
+        	if (empty($server)) {
+	        	$unionData = [
+		        	'game_id' => $request['game_id'],
+		        	'game_name' => $gameName,
+		        	'server_name' => $request['server_name'],
+		        	'server_num' => $request['server_id'],
+		        	'server_id' => $request['server_id'],
+		        	'server_version' => $request["sdk_version"],
+		        	'create_time' => time(),
+		        	'start_time' => time(),
+	        	];
+	        	M('server_union', 'tab_')->data($unionData)->add();
+        	}
+        }
+
         $this -> set_message(200, "success", "成功");
 
     }