elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
master
ELF 5 years ago
parent c9cd377d4f
commit fa90dc0bc8
7 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File

4
Application/Admin/Controller/GameApiController.class.php
Unescape Escape View File

@ -21,8 +21,8 @@ class GameApiController extends Think {
public function provice() { public function provice() {
$role = [ $role = [
'role_id' => '1027690927', 'role_id' => '6810778',
'user_id' => '90319', 'user_account' => 'liaojl1130',
'sdk_version' => 1, 'sdk_version' => 1,
]; ];
$order = [ $order = [

2
Application/Base/Service/TestingResourceService.class.php
Unescape Escape View File

@ -104,7 +104,7 @@ class TestingResourceService
'amount' => $order['ref_amount'], 'amount' => $order['ref_amount'],
'supportItem' => $order['ref_id'], 'supportItem' => $order['ref_id'],
'supportType' => '0', 'supportType' => '0',
'channelUid' => $role['user_id'], 'channelUid' => $role['user_account'],
'applyRemark' => $order['remark'], 'applyRemark' => $order['remark'],
'applyId' => $order['order_no'], 'applyId' => $order['order_no'],
'device_type' => $role['sdk_version'] == 1 ? 'andriod' : 'ios', 'device_type' => $role['sdk_version'] == 1 ? 'andriod' : 'ios',

11
Application/Base/Tool/GameCatClient.class.php
Unescape Escape View File

@ -77,9 +77,9 @@ class GameCatClient
'form_params' => $params, 'form_params' => $params,
]); ]);
$result = (string)$response->getBody(); $result = (string)$response->getBody();
var_dump($uri); /* var_dump($uri);
var_dump($params); var_dump($params);
var_dump($result); var_dump($result); */
return json_decode($result, true); return json_decode($result, true);
} }
@ -98,6 +98,11 @@ class GameCatClient
unset($params[self::SIGN_NAME]); unset($params[self::SIGN_NAME]);
ksort($params); ksort($params);
$params['key'] = C('GAME_CAT_KEY'); $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));
} }
} }

41
Application/Home/Controller/TestingResourceController.class.php
Unescape Escape View File

@ -34,14 +34,19 @@ class TestingResourceController extends BaseController
$subConditions['create_time'] = ['elt', strtotime($createTimeEnd . ' 23:59:59')]; $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); $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(); $promoteService = new PromoteService();
$strCondition .= ' and promote_id in (' . $promoteService->subInSql($loginPromote) . ')'; $strCondition .= ' and promote_id in (' . $promoteService->subInSql($loginPromote) . ')';
if ($account) { 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) { if ($user) {
$conditions['user_id'] = $user['id']; $conditions['user_id'] = $user['id'];
} else { } else {
@ -196,8 +201,10 @@ class TestingResourceController extends BaseController
public function batches() public function batches()
{ {
$provideTimeStart = I('provide_time_start', ''); $gameId = I('game_id', 0);
$provideTimeEnd = I('provide_time_end', ''); $serverId = I('server_id', '');
$createTimeStart = I('create_time_start', '');
$createTimeEnd = I('create_time_end', '');
$verifyStatus = I('verify_status', -1); $verifyStatus = I('verify_status', -1);
$provideStatus = I('provide_status', -1); $provideStatus = I('provide_status', -1);
$account = I('account'); $account = I('account');
@ -212,11 +219,11 @@ class TestingResourceController extends BaseController
$conditions = [ $conditions = [
'_string' => 'exists (' . $subSql . ')' '_string' => 'exists (' . $subSql . ')'
]; ];
if ($provideTimeStart) { if ($createTimeStart) {
$conditions['provide_time'] = ['egt', strtotime($provideTimeStart . ' 00:00:00')]; $conditions['create_time'] = ['egt', strtotime($createTimeStart . ' 00:00:00')];
} }
if ($provideTimeEnd) { if ($createTimeEnd) {
$conditions['provide_time'] = ['elt', strtotime($provideTimeEnd . ' 23:59:59')]; $conditions['create_time'] = ['elt', strtotime($createTimeEnd . ' 23:59:59')];
} }
if ($verifyStatus != -1) { if ($verifyStatus != -1) {
$conditions['verify_status'] = $verifyStatus; $conditions['verify_status'] = $verifyStatus;
@ -224,8 +231,14 @@ class TestingResourceController extends BaseController
if ($provideStatus != -1) { if ($provideStatus != -1) {
$conditions['provide_status'] = $provideStatus; $conditions['provide_status'] = $provideStatus;
} }
if ($gameId) {
$conditions['game_id'] = $gameId;
}
if ($serverId) {
$conditions['server_id'] = $serverId;
}
if ($account) { 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) { if ($user) {
$conditions['user_id'] = $user['id']; $conditions['user_id'] = $user['id'];
} else { } else {
@ -360,7 +373,7 @@ class TestingResourceController extends BaseController
->sum('provide_amount'); ->sum('provide_amount');
$providingQuota = M('testing_resource_batch', 'tab_') $providingQuota = M('testing_resource_batch', 'tab_')
->where(['verify_status' => [in, [0, 1]], 'provide_status' => 0, 'game_id' => $gameId, 'role_id' => $testingRoleId]) ->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); return round(floatval($totalQuota) - floatval($providedQuota) - floatval($providingQuota), 2);
} }
@ -481,11 +494,17 @@ class TestingResourceController extends BaseController
} else { } else {
return $this->ajaxReturn(['status' => 0, 'message' => '含有资源内容不存在']); 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']); $remainQuota = $this->getRemainQuota($bindingRole['game_id'], $bindingRole['role_id'], $role['role_id']);
if ($amount > $remainQuota) { 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); $batchNo = date('YmdHis') . substr(md5($loginPromote['id'] . strval(microtime(true)) . rand(0, 9999)), 8, 16);

12
Application/Home/View/default/TestingResource/apply.html
Unescape Escape View File

@ -143,13 +143,14 @@
</select> </select>
</div> </div>
<div class="form-group fl"> <div class="form-group fl">
<p id="resource-amount" class="static-input">资源价值: --</p> <input id="remark-input" type="text" name="remark" class="txt normal_txt" id="uid" placeholder="请输入备注" value="">
</div> </div>
<div class="form-group fl"> <div class="form-group fl">
<input id="num-input" type="text" name="num" class="txt normal_txt" id="uid" placeholder="请输入资源数量" value=""> <p id="resource-amount" class="static-input">资源价值: --</p>
</div> </div>
<div class="form-group fl"> <div class="form-group fl">
<input id="remark-input" type="text" name="remark" class="txt normal_txt" id="uid" placeholder="请输入备注" value=""> <p class="static-input">资源数量: 1</p>
<!-- <input id="num-input" type="text" name="num" class="txt normal_txt" id="uid" placeholder="请输入资源数量" value=""> -->
</div> </div>
<div class="form-group fl"> <div class="form-group fl">
<button id="add-row" class="add-row" type="button">增加</button> <button id="add-row" class="add-row" type="button">增加</button>
@ -321,7 +322,8 @@
var resourceName = $('#resource-select option:selected').html() var resourceName = $('#resource-select option:selected').html()
var amount = $('#resource-select option:selected').attr('data-amount') var amount = $('#resource-select option:selected').attr('data-amount')
amount = amount == undefined ? '--' : amount amount = amount == undefined ? '--' : amount
var num = $('#num-input').val() // var num = $('#num-input').val()
var num = 1
var remark = $('#remark-input').val() var remark = $('#remark-input').val()
if (resourceTypeId == '') { if (resourceTypeId == '') {
@ -338,7 +340,7 @@
'<td>' + resourceTypeName + '</td>' + '<td>' + resourceTypeName + '</td>' +
'<td>' + resourceName + '</td>' + '<td>' + resourceName + '</td>' +
'<td class="amount">' + amount + '</td>' + '<td class="amount">' + amount + '</td>' +
'<td class="num"><input name="num" type="text" value="' + num + '"></td>' + '<td class="num"><input name="num" type="text" value="' + num + '" readonly></td>' +
'<td class="remark"><input name="remark" type="text" value="' + remark + '"></td>' + '<td class="remark"><input name="remark" type="text" value="' + remark + '"></td>' +
'<td><button class="delete-row" type="button" class="danger-btn">删除</button></td>' + '<td><button class="delete-row" type="button" class="danger-btn">删除</button></td>' +
'</tr>'; '</tr>';

14
Application/Home/View/default/TestingResource/batches.html
Unescape Escape View File

@ -38,14 +38,14 @@
<div id="form1"> <div id="form1">
<div class="form-group normal_space fr"> <div class="form-group normal_space fr">
<input type="submit" class="submit" id='submit' value="查询" url="{:U('lists',['type'=>I('type')])}" style="cursor:pointer;"> <input type="submit" class="submit" id='submit' value="查询" url="{:U('batches')}" style="cursor:pointer;">
</div> </div>
<div class="form-group normal_space fr"> <div class="form-group normal_space fr">
<select name="provide_status" class="reselect select_gallery"> <select name="provide_status" class="reselect select_gallery">
<option status-id="0" value="">请选择发放状态</option> <option status-id="" value="">请选择发放状态</option>
<?php foreach($provideStatusList as $key => $name):?> <?php foreach($provideStatusList as $key => $name):?>
<option status-id="<?=key?>" value="<?=$key?>" <?php if($key === I('provide_status')):?>selected="selected"<?php endif;?>> <option status-id="<?=key?>" value="<?=$key?>" <?php if(strval($key) === I('provide_status')):?>selected="selected"<?php endif;?>>
<?=$name?> <?=$name?>
</option> </option>
<?php endforeach;?> <?php endforeach;?>
</select> </select>
@ -53,18 +53,18 @@
<div class="form-group normal_space fr" style="margin-left: 9px;"> <div class="form-group normal_space fr" style="margin-left: 9px;">
<label class="form-title select-title" style="margin-right: 9px;">至</label> <label class="form-title select-title" style="margin-right: 9px;">至</label>
<div class="select-time"> <div class="select-time">
<input type="text" id="edate" class="txt" name="provide_time_end" placeholder="结束时间" value="{:I('provide_time_end')}" autocomplete="off"> <input type="text" id="edate" class="txt" name="create_time_end" placeholder="结束时间" value="{:I('create_time_end')}" autocomplete="off">
</div> </div>
</div> </div>
<div class="form-group normal_space fr"> <div class="form-group normal_space fr">
<label class="form-title select-title">申请时间：</label> <label class="form-title select-title">申请时间：</label>
<div class="select-time"> <div class="select-time">
<input type="text" id="sdate" class="txt" name="provide_time_start" placeholder="开始时间" value="{:I('provide_time_start')}" autocomplete="off"> <input type="text" id="sdate" class="txt" name="create_time_start" placeholder="开始时间" value="{:I('create_time_start')}" autocomplete="off">
</div> </div>
</div> </div>
<div class="form-group normal_space fr"> <div class="form-group normal_space fr">
<input type="text" name="user_account" class="txt normal_txt" id="uid" style="width:110px;" placeholder="请输入玩家账号" value="{:I('account')}" onKeyDown="webchat_chkkeysend(event);"> <input type="text" name="account" class="txt normal_txt" id="uid" style="width:110px;" placeholder="请输入玩家账号" value="{:I('account')}" onKeyDown="webchat_chkkeysend(event);">
</div> </div>
<div class="form-group normal_space fr"> <div class="form-group normal_space fr">

2
Application/Home/View/default/TestingResource/orders.html
Unescape Escape View File

@ -100,7 +100,6 @@
<th>申请数量</th> <th>申请数量</th>
<th>申请金额</th> <th>申请金额</th>
<th>申请备注</th> <th>申请备注</th>
<th>审核状态</th>
<th>发放状态</th> <th>发放状态</th>
</tr> </tr>
<empty name="records"> <empty name="records">
@ -124,7 +123,6 @@
<td>{$record.num}</td> <td>{$record.num}</td>
<td>{$record.amount}</td> <td>{$record.amount}</td>
<td>{$record.remark}</td> <td>{$record.remark}</td>
<td>{$record.verify_status_text}</td>
<td>{$record.provide_status_text}</td> <td>{$record.provide_status_text}</td>
</tr> </tr>
</volist> </volist>

Write Preview
Loading…
Cancel
Save