From e1352fea1e7e71ccef2ab4bc62ea6ed713719138 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 11 Nov 2020 18:48:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/GameApiController.class.php | 42 +++++++++++++++++-- .../Service/TestingResourceService.class.php | 2 +- .../Tool/GameResource/JtxcClient.class.php | 27 ++++++------ .../Tool/GameResource/LsxxClient.class.php | 5 +-- 4 files changed, 55 insertions(+), 21 deletions(-) diff --git a/Application/Admin/Controller/GameApiController.class.php b/Application/Admin/Controller/GameApiController.class.php index 4968842e9..5980156ac 100644 --- a/Application/Admin/Controller/GameApiController.class.php +++ b/Application/Admin/Controller/GameApiController.class.php @@ -52,8 +52,22 @@ class GameApiController extends Think { public function send() { - $game = M('game', 'tab_')->field(['id', 'sdk_version'])->where(['id' => 232])->find(); - $role = [ + // 229 + // 231 + $game = M('game', 'tab_')->field(['id', 'sdk_version'])->where(['id' => 231])->find(); + // $gameResource1 = new GameResource($game); + /* $resources = $gameResource1->getResources(1); + return; */ + /* $successCount = 0; + for ($i = 0; $i < 10; $i ++) { + $resources = $gameResource1->getResources(1); + if (count($resources) > 0) { + $successCount ++; + } + } + var_dump($successCount); + return; */ + /* $role = [ 'role_id' => '6819493', 'user_account' => 'qh11102', 'sdk_version' => 1, @@ -63,9 +77,31 @@ class GameApiController extends Think { 'ref_id' => '8', 'remark' => '测试', 'order_no' => date('YmdHis') . rand(1000, 9999) . '_1', + ]; */ + $role = [ + 'role_id' => '9571794000008', + 'server_id' => '8', + 'sdk_version' => 1, + ]; + $order = [ + 'ref_id' => '9000', + 'remark' => '测试', + 'order_no' => date('YmdHis') . rand(1000, 9999) . '_1', + ]; + /* $role = [ + 'role_id' => '466500506', + 'server_id' => '49000152', + 'sdk_version' => 2, ]; + $order = [ + // 'ref_id' => '9000', + 'ref_amount' => 6, + 'order_no' => date('YmdHis') . rand(1000, 9999) . '_1', + ]; */ + $gameResource = new GameResource($game); - $result = $gameResource->getResources(); + // $result = $gameResource->getResources(); + $result = $gameResource->apply($order, $role); var_dump($result); } } diff --git a/Application/Base/Service/TestingResourceService.class.php b/Application/Base/Service/TestingResourceService.class.php index a4aa29bf7..2cde8bc1a 100644 --- a/Application/Base/Service/TestingResourceService.class.php +++ b/Application/Base/Service/TestingResourceService.class.php @@ -92,7 +92,7 @@ class TestingResourceService throw new \Exception('该游戏不支持发放测试资源'); } $role = M('user_play_info', 'tab_') - ->field(['id', 'role_id', 'user_id', 'promote_id', 'user_account', 'sdk_version']) + ->field(['id', 'role_id', 'user_id', 'promote_id', 'user_account', 'sdk_version', 'server_id']) ->where(['game_id' => $batch['game_id'], 'role_id' => $batch['role_id']]) ->find(); $orders = M('testing_resource_order', 'tab_') diff --git a/Application/Base/Tool/GameResource/JtxcClient.class.php b/Application/Base/Tool/GameResource/JtxcClient.class.php index 1368fcbe4..c02cdc089 100644 --- a/Application/Base/Tool/GameResource/JtxcClient.class.php +++ b/Application/Base/Tool/GameResource/JtxcClient.class.php @@ -17,8 +17,9 @@ class JtxcClient protected $client; + // http://chat.leniu.com/api/game/sendGold/zhuimeng/jxlm/57972 private $apis = [ - 'provide' => ['uri' => '/api/game/sendGold/zhuimeng/jxlm/53334', 'method' => 'post'], + 'provide' => ['uri' => '/api/game/sendGold/zhuimeng/jxlm/57972', 'method' => 'post'], ]; public function __construct() @@ -40,7 +41,7 @@ class JtxcClient return $this->request($api, $params); } catch (\Exception $e) { $env = C('APP_ENV', null, 'prod'); - return ['code' => 1000, 'state' => 1000, 'message' => '接口请求错误。' . ($env == 'prod' ? '' : $e->getMessage()) , 'data' => []]; + return $e->getMessage(); } } @@ -59,8 +60,7 @@ class JtxcClient 'verify' => false, 'form_params' => $params, ]); - $result = (string)$response->getBody(); - return json_decode($result, true); + return (string)$response->getBody(); } protected function get($uri, array $params = []) @@ -69,10 +69,9 @@ class JtxcClient 'verify' => false, 'query' => $params, ]); - $result = (string)$response->getBody(); - return json_decode($result, true); + return (string)$response->getBody(); } - + protected function sign($params) { unset($params[self::SIGN_NAME]); @@ -88,22 +87,22 @@ class JtxcClient { $result = $this->api('provide', [ 'role_id' => $role['role_id'], - 'money' => intval($order['ref_amount']), + 'money' => intval($order['ref_amount']) * 10, 'type' => 2, // 'goods_id' => 0, - 'server_no' => $role['user_account'], + 'server_no' => $role['server_id'], ]); - if ($result['state'] == 1 && $result['data']) { + if ($result == 'SUCCESS') { return [ 'status' => true, - 'message' => $result['msg'], - 'result' => $result + 'message' => $result, + 'result' => ['result' => $result] ]; } else { return [ 'status' => false, - 'message' => $result['msg'], - 'result' => $result ?? [] + 'message' => $result, + 'result' => ['result' => $result] ]; } } diff --git a/Application/Base/Tool/GameResource/LsxxClient.class.php b/Application/Base/Tool/GameResource/LsxxClient.class.php index 73950cde1..ee4742559 100644 --- a/Application/Base/Tool/GameResource/LsxxClient.class.php +++ b/Application/Base/Tool/GameResource/LsxxClient.class.php @@ -39,7 +39,7 @@ class LsxxClient return $this->request($api, $params); } catch (\Exception $e) { $env = C('APP_ENV', null, 'prod'); - return ['code' => 1000, 'state' => 1000, 'message' => '接口请求错误。' . ($env == 'prod' ? '' : $e->getMessage()) , 'data' => []]; + return ['status' => 0, 'msg' => '接口请求错误。' . ($env == 'prod' ? '' : $e->getMessage()) , 'data' => []]; } } @@ -87,9 +87,8 @@ class LsxxClient { $result = $this->api('provide', [ 'role_id' => $role['role_id'], - 'money' => intval($order['ref_amount']), 'goods_id' => $order['ref_id'], - 'server_no' => $role['user_account'], + 'server_no' => $role['server_id'], 'send_time' => time() ]); if ($result['status'] == 1) {