From 4c1a03b7c77d66ee1a536bfbbbcd127168f7ceaf Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 11:23:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=8A=E6=B1=87=E6=80=BB=E9=87=91=E9=A2=9D?= =?UTF-8?q?300=E5=88=A4=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementController.class.php | 4 ++-- .../Admin/Controller/CompanyStatementSetController.class.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 2f1a47408..b3c0fb626 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -616,7 +616,7 @@ class CompanyStatementController extends ThinkController } //创建基础未满基础信息 - if($va['statement_money'] < $no_pool_money){ + if($va['pay_amount'] < $no_pool_money){ $lackcompany =[ "company_id"=>$company_info['id'], "company_type"=>$v['company_type'], @@ -651,7 +651,7 @@ class CompanyStatementController extends ThinkController array_multisort($last_names,SORT_DESC,SORT_STRING,$va['statement_info']); } } - if($va['statement_money'] < $no_pool_money){ + if($va['pay_amount'] < $no_pool_money){ //依旧小于不结算金额存旧版 if($lackcompany['pay_amount'] > 0){ $lask_id = $LackStatement->add($lackcompany); diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index c648bbab0..f64485abe 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -1023,7 +1023,7 @@ class CompanyStatementSetController extends Controller { "ali_user"=>$v['ali_user'], "ali_account"=>$v['ali_account'] ]; - if($v['statement_money'] < 300){ + if($v['pay_amount'] < 300){ $lackcompany =[ "company_id"=>$k, "company_type"=>2, @@ -1067,7 +1067,7 @@ class CompanyStatementSetController extends Controller { if($type == 2 && $v['statement_money'] == 0){ //补点不存 }else{ - if($v['statement_money'] < 300){ + if($v['pay_amount'] < 300){ //存未满 if($lackcompany['pay_amount'] > 0){ $lask_id = $LackStatement->add($lackcompany); From ba20c3683a3f615018d18f156e62a35848c014a2 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 14:27:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinanceController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 4cfd24076..bc0b8d2ba 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -726,7 +726,7 @@ class FinanceController extends ThinkController if (!empty($map['_string'])) { $map['_string'] .= " and "; } - $map['_string'] .= " s.payed_time < {$timeend}"; + $map['_string'] .= " s.payed_time <= {$timeend}"; } if (!empty(I('game_type_id'))) { From 9b61a39620d4cea0c293f871b915d612efce1e8d Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 14:31:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 3e430fb47..034c3d047 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -8298,7 +8298,7 @@ class ExportController extends Controller if (!empty($map['_string'])) { $map['_string'] .= " and "; } - $map['_string'] .= " s.pay_time < {$timeend}"; + $map['_string'] .= " s.pay_time <= {$timeend}"; } if (!empty(I('game_type_id'))) {