From e2882cc5aa57c560e94a8d20d4b4379011142807 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 3 Feb 2021 11:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BA=BF=E4=B8=8A=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8B=E7=BB=93=E7=AE=97=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php     | 15 ++++++++++++---
 .../View/CompanyStatementPool/viewPuPool.html    | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 411003d29..9acb82d58 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -740,7 +740,9 @@ class CompanyStatementPoolController extends ThinkController
             "sum_money"=>0,//打款合计
             "pool_lack_count"=>0,//本周未结算流水合计
             "st_lack_count"=>0,//本周暂不结算合计
-            "st_count"=>0//本次应支付
+            "st_count"=>0,//本次应支付
+            'online_pay'=>0,//线上支付
+            'offline_pay'=>0//线下支付
         ];
         $week_line = 2;
         $pool_statement_begin_time = date('Y.m.d', $pool_info['statement_begin_time']);
@@ -810,11 +812,16 @@ class CompanyStatementPoolController extends ThinkController
                 $count['week_money'] +=  $va['week_amount'];
                 $count['sum_money'] +=  $va['week_amount'];
             }
-
             if(!$is_statement){
                 $count['st_lack_count'] += $v['statement_money'];
             }else{
                 $count['st_count'] += $v['statement_money'];
+                if($v['is_payment'] == 1){
+                    //线上
+                    $count['online_pay'] += $v['statement_money'];
+                }else{
+                    $count['offline_pay'] += $v['statement_money'];
+                }
             }
 
             $v['row'] = $row;
@@ -842,7 +849,9 @@ class CompanyStatementPoolController extends ThinkController
                 $count["st_lack_count"] =  '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"否"),2)';
                 //本次应支付
                 $count["st_count"] =  '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"是"),2)';
-
+                
+                $count["online_pay"] =  '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"是",X2:X'.$line.',"是"),2)';
+                $count["offline_pay"] =  '=ROUND(SUMIFS(T2:T'.$line.',Y2:Y'.$line.',"是",X2:X'.$line.',"否"),2)';
             }
             $count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
             $count["week_money"] = "=ROUND(SUM(S2:S".$line."),2)";
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index 808c368c6..fc0630305 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -320,7 +320,12 @@
                                 <td colspan="5" rowspan="3"></td>
                                 <td colspan="3">打款合计：</td>
                                 <td>{$count.sum_money}</td>
-                                <td colspan="6" rowspan="3"></td>
+
+                                <td></td>
+                                <td>线上支付:</td>
+                                <td>{$count.online_pay}</td>
+
+                                <td colspan="3" rowspan="3"></td>
                                 <if condition="!$is_export">
                                     <td rowspan="3"></td>
                                 </if>
@@ -331,6 +336,11 @@
                                 <td>{$count.pool_lack_count}</td>
                                 <td colspan="3">本周暂不结算合计:</td>
                                 <td>{$count.st_lack_count}</td>
+
+                                <td></td>
+                                <td>线下支付:</td>
+                                <td>{$count.offline_pay}</td>
+
                             </tr>
 
                             <tr>
@@ -338,6 +348,10 @@
                                 <td></td>
                                 <td colspan="3">本次应支付:</td>
                                 <td>{$count.st_count}</td>
+
+                                <td></td>
+                                <td></td>
+                                <td></td>
                             </tr>
 
                         <else />