Merge pull request '优化特殊补点不含退款及不结算' (#590) from hotfix/special_cop into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/590
master
廖金灵 3 years ago
commit 80ef5a77b1

@ -1979,6 +1979,8 @@ class CompanyStatementController extends ThinkController
$radioMap['_string'] = "start_time < {$end_time}"; $radioMap['_string'] = "start_time < {$end_time}";
} }
$map['tab_spend.pay_status'] = 1; $map['tab_spend.pay_status'] = 1;
$map['tab_spend.is_check'] = 1;
$map['tab_spend.is_refund'] = 0;
// $map['pay_way'] = ['egt',0]; // $map['pay_way'] = ['egt',0];
$data = M("spend","tab_") $data = M("spend","tab_")
@ -2223,7 +2225,6 @@ class CompanyStatementController extends ThinkController
} }
} }
$this->ajaxReturn(['status'=>1,'data'=>$handleData,'msg'=>'']); $this->ajaxReturn(['status'=>1,'data'=>$handleData,'msg'=>'']);
} }
@ -2352,7 +2353,8 @@ class CompanyStatementController extends ThinkController
$amount_time['promote_id'] = '-1'; $amount_time['promote_id'] = '-1';
} }
$amount_time['tab_spend.pay_status'] = 1; $amount_time['tab_spend.pay_status'] = 1;
// $amount_time['pay_way'] = ['egt',0]; $amount_time['tab_spend.is_check'] = 1;
$amount_time['tab_spend.is_refund'] = 0;
foreach ($statement_info as $k => $v) { foreach ($statement_info as $k => $v) {

Loading…
Cancel
Save