Merge branch 'hotfix/test_order' of 47.111.118.107:wmtx/platform into hotfix/test_order

 Conflicts:
	Application/Admin/Controller/TestOrderController.class.php
master
zhengyongxing 5 years ago
commit 2d0d59c0a5

@ -36,10 +36,30 @@ class TestOrderController extends ThinkController
if (!empty($_REQUEST['pay_way'])) {
$map['pay_way'] = $_REQUEST['pay_way'];
}
if(!empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])){
$timestart = strtotime($_REQUEST['timestart']);
$timeend = strtotime($_REQUEST['timeend'])+86399;
$map['pay_time'] = array("between",array($timestart,$timeend));
}else if(!empty($_REQUEST['timestart']) && empty($_REQUEST['timeend'])) {
$timestart = strtotime($_REQUEST['timestart']);
$map['pay_time'] = array("EGT",$timestart);
}else if (!empty($_REQUEST['timeend']) && empty($_REQUEST['timestart'])) {
$timeend = strtotime($_REQUEST['timeend'])+86399;
$map['pay_time'] = array("ELT",$timeend);
}
$order_list = M('test_order', 'tab_')->where($map)->page($page,$row)->select();
$sum_order_amount = M('test_order', 'tab_')->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find();
$sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find();
$count = $sum_order_amount['count'];
$page = set_pagination($count, $row);
if ($page) {
$this->assign('_page', $page);//分页
}
$order_list = M('test_order', 'tab_')->where($map)->order('add_time desc')->select();
$this->assign('datas', $order_list);
$this->assign('sum_order_amount', $sum_order_amount);
$this->assign('sum_pay_amount', $sum_pay_amount);
$this->display();
}

@ -63,10 +63,10 @@
<input type="text" name="user_account" placeholder="请输入测试账号" class="" value="{:I('user_account')}" style="width: 180px"/>&nbsp;
</div>
<div class="input-list">
<input type="text" readonly id="time-start" name="timestart" class="" value="{:I('timestart')}" placeholder="开始时间" autocomplete="off"/>
<input type="text" id="time-start" name="timestart" class="" value="{:I('timestart')}" placeholder="开始时间" autocomplete="off"/>
-
<div class="input-append date" id="datetimepicker" style="display:inline-block">
<input type="text" readonly id="time-end" name="timeend" class="" value="{:I('timeend')}" placeholder="结束时间" autocomplete="off"/>
<input type="text" id="time-end" name="timeend" class="" value="{:I('timeend')}" placeholder="结束时间" autocomplete="off"/>
<span class="add-on"><i class="icon-th"></i></span>
</div>
</div>
@ -163,35 +163,23 @@
</volist>
<tr>
<td >总计</td>
<if condition="$_GET['model'] neq 'game_supersign'"><td >------</td></if>
<td >------</td>
<td >------</td>
<if condition="$_GET['model'] neq 'deposit'"><td >------</td></if>
<if condition="$_GET['model'] neq 'deposit' and $_GET['model'] neq 'game_supersign'"><td >------</td></if>
<if condition="$_GET['model'] neq 'deposit' and $_GET['model'] neq 'game_supersign'"><td >------</td></if>
<td >{$sumAllData.cost}</td>
<td >{$sumAllData.pay_amount}</td>
<td >------</td>
<td >------</td>
</tr>
<tr>
<td><span>充值方式合计</span></td>
<td colspan="25">
<volist name="payTypeData" id="payTypeData" key="index">
<if condition="$key neq '其他支付金额'">
{$key}{$payTypeData} &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
</if>
</volist>
</td>
<td >------</td>
<td >------</td>
<td >{$sum_order_amount['sum_order_amount']}</td>
<td >{$sum_pay_amount['sum_order_amount']}</td>
<td >------</td>
<td >------</td>
</tr>
</notemtpy>
</tbody>
</table>
</div>
</div>
<div class="page">
{$_page|default=''}
</div>
</block>

@ -1101,3 +1101,22 @@ ADD COLUMN `can_view_recharge` tinyint(1) NOT NULL default 0 COMMENT '是否显
ALTER TABLE `tab_promote_belong`
ADD COLUMN `can_view_recharge` tinyint(1) NOT NULL default 0 COMMENT '是否显示充值数据 0否 1是';
-- 添加测试订单录入表 郑昌隆 2020-02-12
DROP TABLE IF EXISTS `tab_test_order`;
CREATE TABLE `tab_test_order` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`order_type` tinyint(2) DEFAULT '0' COMMENT '0-未知1-sdk充值2-平台币充值3-超级签充值',
`server_type` tinyint(2) DEFAULT '1' COMMENT '1-测试内网 2-测试外网',
`order_no` varchar(256) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '平台充值订单号',
`cp_order_no` varchar(256) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'CP订单号',
`user_account` varchar(30) COLLATE utf8mb4_bin DEFAULT '' COMMENT '用户账号',
`game_id` int(11) DEFAULT '0' COMMENT '游戏ID',
`game_name` varchar(30) COLLATE utf8mb4_bin DEFAULT '' COMMENT '游戏名称',
`order_amount` decimal(10,2) DEFAULT NULL COMMENT '订单金额',
`pay_amount` decimal(10,2) DEFAULT NULL COMMENT '支付金额',
`pay_time` int(11) DEFAULT '0' COMMENT '交易时间',
`pay_way` int(11) DEFAULT NULL COMMENT '-1绑币,0平台币,1支付宝,2微信,7金猪,9双乾支付-支付宝,10双乾支付-银联,15双乾支付-快捷',
`add_time` int(11) DEFAULT '0' COMMENT '添加时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

Loading…
Cancel
Save