From 52345e4eb16d9f60a75d836e8eb9a9bc72464f58 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 3 Aug 2020 11:07:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E4=BB=98=E5=AE=9D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/CompanyStatementPool/viewPuPool.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index 5b6b25910..3655703d3 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -115,6 +115,10 @@ 银行卡号 开户支行 帐户类型 + + 支付宝真实姓名 + 支付宝账号 + 备注 是否结算 @@ -154,6 +158,10 @@  {$com.company_info.bank_account} {$com.company_info.opening_bank} + + {$com.company_info.ali_user} + {$com.company_info.ali_account} + {$com.remark} 否 是 @@ -207,6 +215,8 @@ + + From 71d0d2c9d19b86d47bfcbb32a73d6852db0d7609 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 3 Aug 2020 14:35:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 19 ++++------ .../View/CompanyStatementPool/viewPuPool.html | 36 +++++++++++-------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 091555059..f83a57c60 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -207,7 +207,7 @@ class CompanyStatementPoolController extends ThinkController //获取基本信息 $infolist = M("company_statement_info","tab_")->field("*,'1' as st")->where("pool_id = '{$id}'")->select(); //获取母单 - $pool_info = M("company_statement_pool","tab_")->field('statement_num,create_lack_ids,verify_status')->where("id={$id}")->find(); + $pool_info = M("company_statement_pool","tab_")->field('statement_num,create_lack_ids,verify_status,is_payment')->where("id={$id}")->find(); $statement_num = $pool_info['statement_num']; $this->assign("title",$statement_num); $this->assign("pool_status",$pool_info['verify_status']); @@ -226,12 +226,12 @@ class CompanyStatementPoolController extends ThinkController $infolist =array_merge($infolist,$lack_info); } - $this->viewPuPool($infolist,$is_export); + $this->viewPuPool($infolist,$is_export,$pool_info); } } //个人汇总结算查看 - public function viewPuPool(&$infolist,$is_export){ + public function viewPuPool(&$infolist,$is_export,$pool_info){ // dd($infolist); $line = 1; $count = []; @@ -260,26 +260,19 @@ class CompanyStatementPoolController extends ThinkController }else{ $va['sum_money'] = "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}"; } - $count['sum_money_exp'] .= "O{$line}+"; - $count['platform_amount_exp'] .= "J{$line}+"; }else{ $count['platform_amount'] += $va['pay_amount']; $count['sum_money'] += $va['sum_money']; } } $v['statement_count'] = count($v['statement_info']); - } if($is_export){ - $platform_amount_exp = trim($count["platform_amount_exp"],"+"); - $sum_money_exp = trim($count["sum_money_exp"],"+"); - if(empty($platform_amount_exp)){ $platform_amount_exp = 0;} - if(empty($sum_money_exp)){ $sum_money_exp = 0;} - - $count["platform_amount"] = "=".$platform_amount_exp; - $count["sum_money"] = "=".$sum_money_exp; + $count["platform_amount"] = "=SUM(J2:J".$line.")"; + $count["sum_money"] = "=SUM(O2:O".$line.")"; } $this->assign("data",$infolist); + $this->assign("is_payment",$pool_info['is_payment']); $this->assign("count",$count); $this->assign("is_export",$is_export); $this->display("CompanyStatementPool/viewPuPool"); diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index 3655703d3..1673f7f1b 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -111,13 +111,16 @@ 奖励 罚款 结算金额 - 开户名 - 银行卡号 - 开户支行 - 帐户类型 - - 支付宝真实姓名 - 支付宝账号 + + 开户名 + 银行卡号 + 开户支行 + 帐户类型 + + + 支付宝真实姓名 + 支付宝账号 + 备注 是否结算 @@ -154,13 +157,17 @@ {$com['statement_info'][0]['fine']} {$com['statement_info'][0]['sum_money']} - {$com.company_info.payee_name} -  {$com.company_info.bank_account} - {$com.company_info.opening_bank} - + + {$com.company_info.payee_name} +  {$com.company_info.bank_account} + {$com.company_info.opening_bank} + + - {$com.company_info.ali_user} - {$com.company_info.ali_account} + + {$com.company_info.ali_user} + {$com.company_info.ali_account} + {$com.remark} 否 是 @@ -208,11 +215,12 @@ {$count.sum_money|default=0} - + + From 12f232219c23527f2a06627a1556a690ec8c1f65 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 3 Aug 2020 14:38:32 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/CompanyStatementPool/viewPuPool.html | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html index 1673f7f1b..f3f9dcf08 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html @@ -111,13 +111,13 @@ 奖励 罚款 结算金额 - + 开户名 银行卡号 开户支行 帐户类型 - + 支付宝真实姓名 支付宝账号 @@ -157,14 +157,14 @@ {$com['statement_info'][0]['fine']} {$com['statement_info'][0]['sum_money']} - + {$com.company_info.payee_name}  {$com.company_info.bank_account} {$com.company_info.opening_bank} - + {$com.company_info.ali_user} {$com.company_info.ali_account} @@ -215,14 +215,16 @@ {$count.sum_money|default=0} - - - - - - - - + + + + + + + + + + From a90149b31b8d10bd796c95af924c36f1d66f9849 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 3 Aug 2020 14:40:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BC=9A=E9=95=BF?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Promote/edit.html | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Application/Admin/View/Promote/edit.html b/Application/Admin/View/Promote/edit.html index bfda48013..96a199a74 100644 --- a/Application/Admin/View/Promote/edit.html +++ b/Application/Admin/View/Promote/edit.html @@ -344,22 +344,6 @@ 显示推广员的平台币余额，推广员平台币用于会长代充或者转移给下级推广员 - - - 结算模式： - - - - - - 会长推广结算模式 - - - From f7581f3504cdfd61ebb040fd98b4784c8dfbfba1 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 3 Aug 2020 15:16:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=B0=8F=E4=BA=8E0=E4=BE=9D=E6=97=A7=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index d3ea8805d..2081bbc63 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -408,8 +408,9 @@ class CompanyStatementSetController extends Controller { //金额为0不补点 continue; } - if($add_data['platform_amount'] <= 0){ - return; + if($add_data['platform_amount'] == 0){ + //全等于0表示没有流水，小于0依旧要结算 + return; } //添加 if($recount && $company_id !== false){ From f3b145f930df523dd3029a9c0f8f0237f964fa4c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Mon, 3 Aug 2020 15:30:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9C=AA=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementLackController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php index 658649fb7..2403610c6 100644 --- a/Application/Admin/Controller/CompanyStatementLackController.class.php +++ b/Application/Admin/Controller/CompanyStatementLackController.class.php @@ -55,7 +55,7 @@ class CompanyStatementLackController extends ThinkController $map['company_type'] = $_REQUEST['company_type']; } if(isset($_REQUEST['company_name'])){ - $map['company_name'] =["LIKE","%{$_REQUEST['company_id']}%"]; + $map['company_name'] =["LIKE","%{$_REQUEST['company_name']}%"]; } if(isset($_REQUEST['statement_pool_num'])){ $map['statement_pool_num'] =["LIKE","%{$_REQUEST['statement_pool_num']}%"];