|
|
|
@ -1639,7 +1639,7 @@ class DownloadController extends BaseController {
|
|
|
|
|
$map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]];
|
|
|
|
|
}
|
|
|
|
|
if(!empty($begtime) && !empty($endtime)) {
|
|
|
|
|
$map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24 -1]];
|
|
|
|
|
$map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24]];
|
|
|
|
|
}
|
|
|
|
|
$serverField = '';
|
|
|
|
|
$serverJoin = '';
|
|
|
|
@ -1871,12 +1871,12 @@ class DownloadController extends BaseController {
|
|
|
|
|
$begTime = strtotime($initBegTime);
|
|
|
|
|
$endTime = strtotime($initEndTime);
|
|
|
|
|
$params['begin_time'] = $begTime;
|
|
|
|
|
$params['end_time'] = $endTime +3600 * 24 -1;
|
|
|
|
|
$params['end_time'] = $endTime -1;
|
|
|
|
|
if(!empty($map['apply_time'][1])) {
|
|
|
|
|
$begTime = $map['apply_time'][1][0];
|
|
|
|
|
$endTime = $map['apply_time'][1][1];
|
|
|
|
|
$params['begin_time'] = $begTime;
|
|
|
|
|
$params['end_time'] = $endTime + 3600 * 24 -1;
|
|
|
|
|
$params['end_time'] = $endTime -1;
|
|
|
|
|
unset($map['apply_time']);
|
|
|
|
|
}
|
|
|
|
|
if(!empty($map['tab_server.server_id'])) {
|
|
|
|
@ -2816,7 +2816,7 @@ class DownloadController extends BaseController {
|
|
|
|
|
$allData['spend_binding'] = bcadd($allData['spend_binding'], $spendBindingList[$day], 2);
|
|
|
|
|
$allData['spend_discount'] = bcadd($allData['spend_discount'], 0, 2);
|
|
|
|
|
$allData['spend_voucher'] = bcadd($allData['spend_voucher'], 0, 2);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
$allData['day'] = '合计';
|
|
|
|
|
$records[] = $allData;
|
|
|
|
|