From 896cdd92b9be97e0fcae92ac3917babb1db59ead Mon Sep 17 00:00:00 2001 From: zyx Date: Sat, 1 Aug 2020 12:44:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/DepositController.class.php | 11 +++++++++-- .../Admin/Controller/TestOrderController.class.php | 4 ++++ Application/Admin/View/Deposit/lists.html | 11 ++++++++++- Application/Admin/View/Deposit/lists_secord.html | 10 ++++++++++ Application/Admin/View/Spend/lists.html | 2 +- Application/Admin/View/TestOrder/lists.html | 11 +++++++++++ 6 files changed, 45 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/DepositController.class.php b/Application/Admin/Controller/DepositController.class.php index e838bb7c9..8034efa3d 100644 --- a/Application/Admin/Controller/DepositController.class.php +++ b/Application/Admin/Controller/DepositController.class.php @@ -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逆序排列 */ diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php index 0141a6507..638f3c3e1 100644 --- a/Application/Admin/Controller/TestOrderController.class.php +++ b/Application/Admin/Controller/TestOrderController.class.php @@ -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") diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html index 11ac0aef1..0875d4093 100644 --- a/Application/Admin/View/Deposit/lists.html +++ b/Application/Admin/View/Deposit/lists.html @@ -81,7 +81,14 @@ - +
+ +
@@ -125,6 +132,7 @@ 充值方式 充值ip + 所属商户 充值时间 @@ -186,6 +194,7 @@ {$data.pay_amount} {:get_pay_way($data['pay_way'])}无 {$data.pay_ip} + {:getMerchantName($data['merchant_id'])} {:set_show_time($data['create_time'],'','pay')} diff --git a/Application/Admin/View/Deposit/lists_secord.html b/Application/Admin/View/Deposit/lists_secord.html index c79fed93c..9c3c1378a 100644 --- a/Application/Admin/View/Deposit/lists_secord.html +++ b/Application/Admin/View/Deposit/lists_secord.html @@ -90,6 +90,14 @@ +
+ +
@@ -116,6 +124,7 @@ 充值方式 + 所属商户 支付时间 @@ -154,6 +163,7 @@ {$data.pay_amount} {:get_pay_way($data['pay_way'])}无 + {:getMerchantName($data['merchant_id'])} {:set_show_time($data['create_time'],'','pay')} diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 7a15d6d3a..3bfb254fd 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -150,7 +150,7 @@
diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html index 9cb4a9dc7..150dbc704 100644 --- a/Application/Admin/View/TestOrder/lists.html +++ b/Application/Admin/View/TestOrder/lists.html @@ -87,6 +87,14 @@ +
+ +
搜索 @@ -130,6 +138,8 @@ 充值方式 + 所属商户 + 录入时间 操作 @@ -161,6 +171,7 @@ {$data.order_amount} {$data.pay_amount} {$data.pay_way|get_pay_way} + {:getMerchantName($data['merchant_id'])} {$data.add_time|date='Y-m-d H:i:s',###} 删除 From bbb7f3301c075569c4765c01ceea88916a89eb76 Mon Sep 17 00:00:00 2001 From: zyx Date: Sat, 1 Aug 2020 13:45:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ExportController.class.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 408269e65..0bd47117e 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -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'); From 3c8f6372400065ff1e01c28ba42124a4312cbe94 Mon Sep 17 00:00:00 2001 From: zyx Date: Sat, 1 Aug 2020 13:49:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A2=9E=E5=8A=A0=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Deposit/lists.html | 2 +- Application/Admin/View/Spend/lists.html | 2 +- Application/Admin/View/TestOrder/lists.html | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html index 0875d4093..8b9a258d9 100644 --- a/Application/Admin/View/Deposit/lists.html +++ b/Application/Admin/View/Deposit/lists.html @@ -224,7 +224,7 @@ 汇总 - + 当页充值：{:array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount'))}； 今日充值：{$ttotal} ； 昨日充值：{$ytotal} ； diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 3bfb254fd..fdcc521d4 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -308,7 +308,7 @@ 汇总 - + 当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))} diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html index 150dbc704..f75eb69ef 100644 --- a/Application/Admin/View/TestOrder/lists.html +++ b/Application/Admin/View/TestOrder/lists.html @@ -190,6 +190,7 @@ ------ ------ ------ + ------