From 7054f82fdea55f5b9ad6f1ff0758fed7a98f63f9 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 13 Jan 2021 09:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=A1=A5=E7=82=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementController.class.php      | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php
index d6b84bc75..b70cdca38 100644
--- a/Application/Admin/Controller/CompanyStatementController.class.php
+++ b/Application/Admin/Controller/CompanyStatementController.class.php
@@ -591,6 +591,8 @@ class CompanyStatementController extends ThinkController
 
         $line = 1;
         $count = [];
+
+        $week_line = 2;
         //获取对接人
         foreach($infolist as $k=>&$v){
             $infolist[$k]['reward'] = 0;
@@ -622,6 +624,9 @@ class CompanyStatementController extends ThinkController
                 $v['statement_money'] = "=ROUND(";
             }
 
+            $handle_data = A("CompanyStatementPool")->changeDataStruct($v['statement_info'],$is_export,$week_line);
+            $v['statement_info'] = $handle_data;
+
             $row = 0;
             foreach($v['statement_info'] as $ke=>&$va){
                 $va['row'] = count($va['game_list']);
@@ -639,12 +644,12 @@ class CompanyStatementController extends ThinkController
 
                     if($is_export){
                         if($v['withdraw_type'] != 3) {
-                            $val['sum_money'] = "=ROUND(K{$line}*(L{$line}+M{$line}),2)";
+                            $val['sum_money'] = "=ROUND((K{$line}-L{$line})*(M{$line}+N{$line}),2)";
                         } else {
-                            $val['sum_money'] = "=ROUND(K{$line}*(M{$line}),2)";
+                            $val['sum_money'] = "=ROUND((K{$line}-L{$line})*(N{$line}),2)";
                         }
 //                        $val['sum_money'] =  "=J{$line}*(K{$line}+L{$line})";
-                        $v['statement_money'] .= "N{$line}+";
+                        $v['statement_money'] .= "S{$line}+";
                     }else{
                         $count['platform_amount'] += $val['pay_amount'];
                         $count['sum_money'] +=  $val['sum_money'];
@@ -674,10 +679,18 @@ class CompanyStatementController extends ThinkController
             }
         }
 
+//        if($is_export){
+//            $count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
+//            $count["sum_money"] = "=ROUND(SUM(Q2:Q".$line."),2)";
+//        }
+
         if($is_export){
             $count["platform_amount"] = "=ROUND(SUM(K2:K".$line."),2)";
-            $count["sum_money"] = "=ROUND(SUM(Q2:Q".$line."),2)";
+            $count["week_money"] = "=ROUND(SUM(S2:S".$line."),2)";
+            $count["sum_money"] = "=ROUND(SUM(T2:T".$line."),2)";
         }
+
+        $this->assign("withdraw_type",3);
         $this->assign("data",$infolist);
         $this->assign("count",$count);
         $this->assign("is_export",$is_export);