Merge pull request '修改推广后台订单查询bug' (#149) from hotfix/0203 into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/149
master
廖金灵 4 years ago
commit ff9ab580c9

@ -1488,12 +1488,12 @@ class DownloadController extends BaseController
} elseif (!empty(I('begtime')) && !empty(I('endtime'))) { } elseif (!empty(I('begtime')) && !empty(I('endtime'))) {
$map['tab_spend.spend_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]]; $map['tab_spend.spend_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
}else { }else {
$nowTime = date('Y-m-d'); // $nowTime = date('Y-m-d');
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); // $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
$initEndTime = date('Y-m-d'); // $initEndTime = date('Y-m-d');
$initBegTime = strtotime($initBegTime); // $initBegTime = strtotime($initBegTime);
$initEndTime = strtotime($initEndTime); // $initEndTime = strtotime($initEndTime);
$map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]]; // $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]];
} }
if ($payedBegTime) { if ($payedBegTime) {

@ -241,6 +241,8 @@ class QueryController extends BaseController
$parameter['row'] = $row; $parameter['row'] = $row;
$parameter['begtime'] = $initBegTime; $parameter['begtime'] = $initBegTime;
$parameter['endtime'] = $initEndTime; $parameter['endtime'] = $initEndTime;
$parameter['payed_begtime'] = I("payed_begtime", '');
$parameter['payed_endtime'] = I("payed_endtime", '');
$parameter['relation_game_id'] = $relationGameId; $parameter['relation_game_id'] = $relationGameId;
$parameter['sdk_version'] = $sdkVersion; $parameter['sdk_version'] = $sdkVersion;
$parameter['server_id'] = $serverId; $parameter['server_id'] = $serverId;

@ -432,15 +432,28 @@
layer.msg('到账时间间隔不能超过31天请重新选择日期'); layer.msg('到账时间间隔不能超过31天请重新选择日期');
return false; return false;
} }
if (sdate && !edate) {
layer.msg('下单结束时间不能为空');
return false;
}
if (!sdate && edate) {
layer.msg('下单开始时间不能为空');
return false;
}
if (payed_sdate && !payed_edate) { if (payed_sdate && !payed_edate) {
layer.msg('到账结束时间不能为空'); layer.msg('到账结束时间不能为空');
return false;
} }
if (!payed_sdate && payed_edate) { if (!payed_sdate && payed_edate) {
layer.msg('到账开始时间不能为空'); layer.msg('到账开始时间不能为空');
return false;
} }
if (!edate && !sdate && !payed_sdate && !payed_edate) { if (!edate && !sdate && !payed_sdate && !payed_edate) {
layer.msg('时间不能为空'); layer.msg('时间不能为空');
return false;
} }
var url = $(this).attr('url'); var url = $(this).attr('url');

Loading…
Cancel
Save