|
|
|
@ -1097,7 +1097,6 @@ class ExportController extends Controller
|
|
|
|
|
}else{
|
|
|
|
|
$map['spend_time'] = array('BETWEEN', array($startTime, $endTime));
|
|
|
|
|
}
|
|
|
|
|
$map['pay_status'] = $payStatus;
|
|
|
|
|
if ($id == 71) {
|
|
|
|
|
$map['pay_real_status'] = $payStatus;
|
|
|
|
|
} else {
|
|
|
|
@ -1147,7 +1146,7 @@ class ExportController extends Controller
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($id == 71) {
|
|
|
|
|
$map['pay_way'] = ['in', ['41']];
|
|
|
|
|
$map['pay_way'] = ['in', '41'];
|
|
|
|
|
} else {
|
|
|
|
|
if (isset($_REQUEST['pay_way'])) {
|
|
|
|
|
if ($_REQUEST['pay_way'] == 2) {
|
|
|
|
|