From fa90dc0bc8d19da1598a31f160755bff17d8b365 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Tue, 18 Aug 2020 15:17:51 +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 | 4 +-
.../Service/TestingResourceService.class.php | 2 +-
Application/Base/Tool/GameCatClient.class.php | 11 +++--
.../TestingResourceController.class.php | 41 ++++++++++++++-----
.../View/default/TestingResource/apply.html | 12 +++---
.../View/default/TestingResource/batches.html | 14 +++----
.../View/default/TestingResource/orders.html | 2 -
7 files changed, 55 insertions(+), 31 deletions(-)
diff --git a/Application/Admin/Controller/GameApiController.class.php b/Application/Admin/Controller/GameApiController.class.php
index e5db067f7..174a4a507 100644
--- a/Application/Admin/Controller/GameApiController.class.php
+++ b/Application/Admin/Controller/GameApiController.class.php
@@ -21,8 +21,8 @@ class GameApiController extends Think {
public function provice() {
$role = [
- 'role_id' => '1027690927',
- 'user_id' => '90319',
+ 'role_id' => '6810778',
+ 'user_account' => 'liaojl1130',
'sdk_version' => 1,
];
$order = [
diff --git a/Application/Base/Service/TestingResourceService.class.php b/Application/Base/Service/TestingResourceService.class.php
index 5837647cf..d8cd58347 100644
--- a/Application/Base/Service/TestingResourceService.class.php
+++ b/Application/Base/Service/TestingResourceService.class.php
@@ -104,7 +104,7 @@ class TestingResourceService
'amount' => $order['ref_amount'],
'supportItem' => $order['ref_id'],
'supportType' => '0',
- 'channelUid' => $role['user_id'],
+ 'channelUid' => $role['user_account'],
'applyRemark' => $order['remark'],
'applyId' => $order['order_no'],
'device_type' => $role['sdk_version'] == 1 ? 'andriod' : 'ios',
diff --git a/Application/Base/Tool/GameCatClient.class.php b/Application/Base/Tool/GameCatClient.class.php
index c92c499ea..594c1964c 100644
--- a/Application/Base/Tool/GameCatClient.class.php
+++ b/Application/Base/Tool/GameCatClient.class.php
@@ -77,9 +77,9 @@ class GameCatClient
'form_params' => $params,
]);
$result = (string)$response->getBody();
- var_dump($uri);
+ /* var_dump($uri);
var_dump($params);
- var_dump($result);
+ var_dump($result); */
return json_decode($result, true);
}
@@ -98,6 +98,11 @@ class GameCatClient
unset($params[self::SIGN_NAME]);
ksort($params);
$params['key'] = C('GAME_CAT_KEY');
- return md5(http_build_query($params));
+ $signRows = [];
+ foreach ($params as $key => $value) {
+ $signRows[] = $key . '=' . $value;
+ }
+ // var_dump(implode('&', $signRows));
+ return md5(implode('&', $signRows));
}
}
\ No newline at end of file
diff --git a/Application/Home/Controller/TestingResourceController.class.php b/Application/Home/Controller/TestingResourceController.class.php
index 8b3a16931..63d1ee001 100644
--- a/Application/Home/Controller/TestingResourceController.class.php
+++ b/Application/Home/Controller/TestingResourceController.class.php
@@ -34,14 +34,19 @@ class TestingResourceController extends BaseController
$subConditions['create_time'] = ['elt', strtotime($createTimeEnd . ' 23:59:59')];
}
+ /**
+ * @todo 仅有游戏猫
+ */
+ $strCondition = 'game_id in (229, 230)';
+
$subSql = M('testing_user', 'tab_')->field(['user_id'])->where($subConditions)->select(false);
- $strCondition = 'user_id in (' . $subSql . ')';
+ $strCondition .= ' and user_id in (' . $subSql . ')';
$promoteService = new PromoteService();
$strCondition .= ' and promote_id in (' . $promoteService->subInSql($loginPromote) . ')';
if ($account) {
- $user = M('user', 'tab_')->field(['id'])->where('account like ' . $account . '%')->find();
+ $user = M('user', 'tab_')->field(['id'])->where('account like "' . $account . '%"')->find();
if ($user) {
$conditions['user_id'] = $user['id'];
} else {
@@ -196,8 +201,10 @@ class TestingResourceController extends BaseController
public function batches()
{
- $provideTimeStart = I('provide_time_start', '');
- $provideTimeEnd = I('provide_time_end', '');
+ $gameId = I('game_id', 0);
+ $serverId = I('server_id', '');
+ $createTimeStart = I('create_time_start', '');
+ $createTimeEnd = I('create_time_end', '');
$verifyStatus = I('verify_status', -1);
$provideStatus = I('provide_status', -1);
$account = I('account');
@@ -212,11 +219,11 @@ class TestingResourceController extends BaseController
$conditions = [
'_string' => 'exists (' . $subSql . ')'
];
- if ($provideTimeStart) {
- $conditions['provide_time'] = ['egt', strtotime($provideTimeStart . ' 00:00:00')];
+ if ($createTimeStart) {
+ $conditions['create_time'] = ['egt', strtotime($createTimeStart . ' 00:00:00')];
}
- if ($provideTimeEnd) {
- $conditions['provide_time'] = ['elt', strtotime($provideTimeEnd . ' 23:59:59')];
+ if ($createTimeEnd) {
+ $conditions['create_time'] = ['elt', strtotime($createTimeEnd . ' 23:59:59')];
}
if ($verifyStatus != -1) {
$conditions['verify_status'] = $verifyStatus;
@@ -224,8 +231,14 @@ class TestingResourceController extends BaseController
if ($provideStatus != -1) {
$conditions['provide_status'] = $provideStatus;
}
+ if ($gameId) {
+ $conditions['game_id'] = $gameId;
+ }
+ if ($serverId) {
+ $conditions['server_id'] = $serverId;
+ }
if ($account) {
- $user = M('user', 'tab_')->field(['id'])->where('account like ' . $account . '%')->find();
+ $user = M('user', 'tab_')->field(['id'])->where('account like "' . $account . '%"')->find();
if ($user) {
$conditions['user_id'] = $user['id'];
} else {
@@ -360,7 +373,7 @@ class TestingResourceController extends BaseController
->sum('provide_amount');
$providingQuota = M('testing_resource_batch', 'tab_')
->where(['verify_status' => [in, [0, 1]], 'provide_status' => 0, 'game_id' => $gameId, 'role_id' => $testingRoleId])
- ->sum('provide_amount');
+ ->sum('apply_amount');
return round(floatval($totalQuota) - floatval($providedQuota) - floatval($providingQuota), 2);
}
@@ -481,11 +494,17 @@ class TestingResourceController extends BaseController
} else {
return $this->ajaxReturn(['status' => 0, 'message' => '含有资源内容不存在']);
}
+ /**
+ * @todo 游戏猫只能每个资源数量只能为1
+ */
+ if ($record['num'] != 1) {
+ return $this->ajaxReturn(['status' => 0, 'message' => '该游戏每次申请单项资源数量只能为1']);
+ }
}
$remainQuota = $this->getRemainQuota($bindingRole['game_id'], $bindingRole['role_id'], $role['role_id']);
if ($amount > $remainQuota) {
- // return $this->ajaxReturn(['status' => 0, 'message' => '额度不足']);
+ return $this->ajaxReturn(['status' => 0, 'message' => '额度不足']);
}
$batchNo = date('YmdHis') . substr(md5($loginPromote['id'] . strval(microtime(true)) . rand(0, 9999)), 8, 16);
diff --git a/Application/Home/View/default/TestingResource/apply.html b/Application/Home/View/default/TestingResource/apply.html
index e00fc6564..6e771e30a 100644
--- a/Application/Home/View/default/TestingResource/apply.html
+++ b/Application/Home/View/default/TestingResource/apply.html
@@ -143,13 +143,14 @@