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

Merge branch 'hotfix/market_percentage' of wmtx/platform into master

Browse Source 
平台币增加商户
master
廖金灵 5 years ago committed by Gogs
parent 20a2184521 3c8f637240
commit 8c942dbcbc
7 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File

11
Application/Admin/Controller/DepositController.class.php
Unescape Escape View File

@ -71,7 +71,10 @@ class DepositController extends ThinkController {
}
unset($_REQUEST['pay_way']);
}
if ($_REQUEST['merchant_id']) {
$map['merchant_id'] = $_REQUEST['merchant_id'];
unset($_REQUEST['merchant_id']);
}
if(isset($_REQUEST['pay_status'])){
$map['pay_status']=$_REQUEST['pay_status'];
@ -213,6 +216,10 @@ class DepositController extends ThinkController {
$sort = $data_order==3?'desc':'asc';
$map['order'] = $data_order_type.' '.$sort;
}
if ($_REQUEST['merchant_id']) {
$map['merchant_id'] = $_REQUEST['merchant_id'];
unset($_REQUEST['merchant_id']);
}
$map1=$map;
$map1['pay_status']=1;
@ -235,7 +242,7 @@ class DepositController extends ThinkController {
$data = D('coin_pay_order')
/* 查询指定字段，不指定则查询所有字段 */
->field('*,order_status as pay_status,order_number as pay_order_number')
->field('*,order_status as pay_status,order_number as pay_order_number,merchant_id')
// 查询条件
->where($map)
/* 默认通过id逆序排列 */

12
Application/Admin/Controller/ExportController.class.php
Unescape Escape View File

@ -1200,7 +1200,7 @@ class ExportController extends Controller
$xlsCell = array(
"支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "所属推广公司", "所属市场专员", "充值ip","区服ID", "游戏区服",
"支付订单号","CP订单号", "充值时间","支付时间", "玩家账号", "游戏名称", L('Subordinate_channel'), "所属推广公司", "所属市场专员","所属商户", "充值ip","区服ID", "游戏区服",
"角色ID","角色名称", "订单金额", "实付金额", "充值方式", L('Order_status'), "游戏通知状态", "消费"."{$total}"
);
@ -1232,7 +1232,7 @@ class ExportController extends Controller
// ->join($tab_promote_join)
// ->order('pay_time DESC')
// ->select();
->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account, 0 as company_name,market_admin_id,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status, promote_id')
->field('pay_order_number,extend,pay_time,payed_time,user_account,game_name,promote_account, 0 as company_name,market_admin_id,merchant_id,spend_ip,server_id,server_name,game_player_id,game_player_name,cost,pay_amount,pay_way,pay_status,pay_game_status, promote_id')
// ->join('tab_promote on tab_promote.id = tab_spend.promote_id', 'left')
// ->join('tab_promote_company on tab_promote_company.id and tab_promote.company_id', 'left')
->where($map)
@ -1254,6 +1254,7 @@ class ExportController extends Controller
}else {
$value['payed_time'] = "------";
}
$value['merchant_id'] = getMerchantName($value['merchant_id']);
checkEncryptionAuth($value['user_account'],'spend_lists');
// $value['user_account'] = encryption($value['user_account']);
($value['promote_account']=='官方渠道'||$value['promote_account']=='自然注册')?($value['promote_account']=C('OFFICIEL_CHANNEL')):'';
@ -1369,6 +1370,7 @@ class ExportController extends Controller
array('pay_amount', "充值平台币"),
array('pay_way', "充值方式", 'get_pay_way', '*'),
array('pay_ip', "充值ip"),
array('merchant_id', "所属商户"),
array('create_time', "充值时间"),
array('payed_time','支付时间'),
array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
@ -1384,6 +1386,8 @@ class ExportController extends Controller
($xlsData[$key]['promote_account']=='官方渠道'||$xlsData[$key]['promote_account']=='自然注册')?($xlsData[$key]['promote_account']=C('OFFICIEL_CHANNEL')):'';
$xlsData[$key]['merchant_id'] = getMerchantName($value['merchant_id']);
$xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
if ($value['pay_status'] == 1){
$xlsData[$key]['payed_time'] = date('Y-m-d H:i:s', $value['payed_time']);
@ -2411,6 +2415,7 @@ class ExportController extends Controller
array('promote_account', L('Subordinate_channel')),
array('pay_amount', "充值平台币"),
array('pay_way', "充值方式"),
array('merchant_id', "所属商户"),
array('create_time', "充值时间"),
array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
array('', "共计充值{$total}"),
@ -2427,6 +2432,7 @@ class ExportController extends Controller
// var_dump($xlsData);die();
foreach ($xlsData as $key => $value) {
$xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
$xlsData[$key]['merchant_id'] = getMerchantName($value['merchant_id']);
if(!$xlsData[$key]['pay_way']) {
$xlsData[$key]['pay_way'] = '无';
} else {
@ -2449,6 +2455,7 @@ class ExportController extends Controller
array('order_amount', '订单金额'),
array('pay_amount', '实付金额'),
array('pay_way', '充值方式'),
array('merchant_id', '所属商户'),
array('add_time', '录入时间'),
);
@ -2517,6 +2524,7 @@ class ExportController extends Controller
$order_list['pay_amount'] = $v['pay_amount'];
$order_list['pay_way'] = get_pay_way($v['pay_way']);
$order_list['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
$order_list['merchant_id'] = getMerchantName($v['merchant_id']);
checkEncryptionAuth($order_list['user_account'],'TestOrder_lists');

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

@ -47,6 +47,10 @@ class TestOrderController extends ThinkController
$timeend = strtotime($_REQUEST['timeend'])+86399;
$map['pay_time'] = array("ELT",$timeend);
}
if ($_REQUEST['merchant_id']) {
$map['merchant_id'] = $_REQUEST['merchant_id'];
unset($_REQUEST['merchant_id']);
}
$order_list = M('test_order t', 'tab_')
->field("t.*,g.sdk_version")
->join("tab_game g on t.game_id = g.id","left")

13
Application/Admin/View/Deposit/lists.html
Unescape Escape View File

@ -81,7 +81,14 @@
<option value="0">下单未付款</option>
</select>
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
<!-- <div class="input-list search_item input-list-gamenoticestatus">-->
<!-- <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">-->
<!-- <option value="">请选择推广员等级</option>-->
@ -125,6 +132,7 @@
</th>
<th>充值方式</th>
<th>充值ip</th>
<th>所属商户</th>
<th>
<a class="paixu" data-order='create_time'>
充值时间
@ -186,6 +194,7 @@
<td><span>{$data.pay_amount}</span></td>
<td><if condition="$data['pay_way'] neq ''">{:get_pay_way($data['pay_way'])}<else/>无</if></td>
<td>{$data.pay_ip}</td>
<td>{:getMerchantName($data['merchant_id'])}</td>
<td>{:set_show_time($data['create_time'],'','pay')}</td>
<td>
<if condition="$data['pay_status'] eq 1">
@ -215,7 +224,7 @@
</empty>
<tr class="data_summary">
<td>汇总</td>
<td colspan="9">
<td colspan="10">
当页充值：{:array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount'))}；
今日充值：{$ttotal} ；
昨日充值：{$ytotal} ；

10
Application/Admin/View/Deposit/lists_secord.html
Unescape Escape View File

@ -90,6 +90,14 @@
<option value="">请选择推广员</option>
</select>
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
<input type="hidden" name="" value="" class="sortBy">
<div class="input-list">
@ -116,6 +124,7 @@
</a>
</th>
<th>充值方式</th>
<th>所属商户</th>
<th>
<a class="paixu" data-order='create_time'>
支付时间
@ -154,6 +163,7 @@
</td>
<td><span>{$data.pay_amount}</span></td>
<td><if condition="$data['pay_way'] neq ''">{:get_pay_way($data['pay_way'])}<else/>无</if></td>
<td>{:getMerchantName($data['merchant_id'])}</td>
<td>{:set_show_time($data['create_time'],'','pay')}</td>
<td>
<if condition="$data['pay_status'] eq 1">

4
Application/Admin/View/Spend/lists.html
Unescape Escape View File

@ -150,7 +150,7 @@
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}">{$vo.name}</option>
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
@ -308,7 +308,7 @@
<if condition="$rule_count_check">
<tr class="data_summary">
<td>汇总</td>
<td colspan="18">
<td colspan="19">
当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
<!-- 今日充值：{$ttotal}-->
<!-- 昨日充值：{$ytotal}-->

12
Application/Admin/View/TestOrder/lists.html
Unescape Escape View File

@ -87,6 +87,14 @@
<option value="17" <if condition="$_GET['pay_way'] eq '17'">selected</if>>易宝支付</option>
</select>
</div>
<div class="input-list search_item input-list-gamenoticestatus">
<select id="merchant_id" name="merchant_id" class="select_gallery">
<option value="0">请选择商户</option>
<volist name=":getMerchantList()" id="vo">
<option value="{$vo.id}" <if condition="$_GET['merchant_id'] eq $vo['id']">selected</if>>{$vo.name}</option>
</volist>
</select>
</div>
<div class="input-list">
<a class="sch-btn" href="javascript:;" id="search" url="{:U('TestOrder/lists','model='.$model['name'].'&row='.I('row'),false)}" style="">搜索</a>
@ -130,6 +138,8 @@
<th >充值方式</th>
<th>所属商户</th>
<th >录入时间</th>
<th >操作</th>
@ -161,6 +171,7 @@
<td >{$data.order_amount}</td>
<td >{$data.pay_amount}</td>
<td >{$data.pay_way|get_pay_way}</td>
<td>{:getMerchantName($data['merchant_id'])}</td>
<td >{$data.add_time|date='Y-m-d H:i:s',###}</td>
<td ><a class="confirm del" data-id="{$data.id}">删除</a></td>
</tr>
@ -179,6 +190,7 @@
<td >------</td>
<td >------</td>
<td >------</td>
<td >------</td>
</tr>
</notemtpy>
</tbody>

Write Preview
Loading…
Cancel
Save