From 7335f5da1536b996cd0dad35a690b04384af1759 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 15:20:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=B8=B8=E9=9D=9E0?= =?UTF-8?q?=E9=83=BD=E8=A6=81=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index b3c0fb626..01e75078f 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -653,14 +653,14 @@ class CompanyStatementController extends ThinkController } if($va['pay_amount'] < $no_pool_money){ //依旧小于不结算金额存旧版 - if($lackcompany['pay_amount'] > 0){ + if($lackcompany['pay_amount'] != 0){ $lask_id = $LackStatement->add($lackcompany); $v['create_lack_ids'][] =$lask_id; $v['lack_statement_money'] +=$lackcompany['statement_money']; $v['lack_platform_amount'] +=$lackcompany['platform_amount']; } }else{ - if($va['pay_amount'] > 0){ + if($va['pay_amount'] != 0){ //存成功 $company =[ "pool_id"=>0, From 978a42b4df2a4a0b1c128feac8284929803b3d74 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 15:24:24 +0800 Subject: [PATCH 2/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=88=A4=E5=AE=9A=E4=BE=9D=E6=97=A7=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=B5=81=E6=B0=B4?= 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 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 01e75078f..e727fe19d 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['pay_amount'] < $no_pool_money){ + if($va['platform_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['pay_amount'] < $no_pool_money){ + if($va['platform_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 f64485abe..bff112784 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -1067,7 +1067,7 @@ class CompanyStatementSetController extends Controller { if($type == 2 && $v['statement_money'] == 0){ //补点不存 }else{ - if($v['pay_amount'] < 300){ + if($v['platform_amount'] < 300){ //存未满 if($lackcompany['pay_amount'] > 0){ $lask_id = $LackStatement->add($lackcompany); From b2239380bfd0aab6ce71d5faffbd3670c9d2a29f Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 5 Aug 2020 15:32:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=9F=E6=95=B0?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementSetController.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index bff112784..1bb986703 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -715,7 +715,7 @@ class CompanyStatementSetController extends Controller { //金额为0不补点 continue; } - if($add_data['platform_amount'] <= 0){ + if($add_data['platform_amount'] == 0){ return; } // dd($add_data); @@ -1069,7 +1069,7 @@ class CompanyStatementSetController extends Controller { }else{ if($v['platform_amount'] < 300){ //存未满 - if($lackcompany['pay_amount'] > 0){ + if($lackcompany['pay_amount'] != 0){ $lask_id = $LackStatement->add($lackcompany); $countdata['create_lack_ids'][] =$lask_id; $countdata['lack_statement_money'] +=$lackcompany['statement_money']; @@ -1077,7 +1077,7 @@ class CompanyStatementSetController extends Controller { } }else{ - if($v['pay_amount'] > 0){ + if($v['pay_amount'] != 0){ //存成功配置单号 $company =[ "pool_id"=>0,