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 @@