From a69b21dd14ac018255e2b3a465a948dc6f3bdb47 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sat, 25 Jul 2020 18:25:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=8D=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=91=A8=E6=9C=88=E7=BB=93=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementController.class.php      |  7 ++++++-
 .../CompanyStatementPoolController.class.php  | 19 ++++++++++++++---
 .../View/CompanyStatementPool/lists.html      | 12 ++++++++++-
 .../View/CompanyStatementPool/viewPuPool.html | 21 ++++++++++++++-----
 4 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php
index 0743c12af..4bfb3d8b8 100644
--- a/Application/Admin/Controller/CompanyStatementController.class.php
+++ b/Application/Admin/Controller/CompanyStatementController.class.php
@@ -498,7 +498,12 @@ class CompanyStatementController extends ThinkController
                 $v['verify_status'] = 5;
                 $v['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s"),"verify_user"=>"system","verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]);
             }
-
+            //判断周月结
+            if(($v["statement_end_time"]-$v['statement_begin_time']) > 7*24*3600){
+                $v["withdraw_type"] = 1;
+            }else{
+                $v["withdraw_type"] = 0;
+            }
             $pool_id = $Pool->add($v);
             if($pool_id == false){
                 $this->ajaxReturn(array('status' => 0,"info"=>"汇总失败"));
diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 8882d4205..88a25469b 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -16,7 +16,11 @@ class CompanyStatementPoolController extends ThinkController
         "1"=>"是",
         "2"=>"否"
     ];
-    
+    public $WithdrawType = [
+        "0"=>"周结",
+        "1"=>"月结",
+        "2"=>"下游个人补点"
+    ];
     public $VerifyStatus=[
         "-2"=>"拒绝打款",
         "-1"=>"审批拒绝",
@@ -94,6 +98,9 @@ class CompanyStatementPoolController extends ThinkController
         if(isset($_REQUEST['is_payment'])){
             $map['is_payment'] = $_REQUEST['is_payment'];
         }
+        if(isset($_REQUEST['withdraw_type'])){
+            $map['withdraw_type'] = $_REQUEST['withdraw_type'];
+        }
         
 
         // $this->checkListOrCountAuthRestMap($map);//导出权限
@@ -116,6 +123,7 @@ class CompanyStatementPoolController extends ThinkController
             $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}";
 
             $v['ext_file_type'] = empty($v['ext_file']) ? "无" : "有";
+            $v['withdraw_type'] = $this->WithdrawType[$v['withdraw_type']];;
 
             $v['verify_log'] = json_decode($v['verify_log'], true);
             if (isset($params['export'])) {
@@ -177,6 +185,7 @@ class CompanyStatementPoolController extends ThinkController
         $this->assign('CompanyType',$this->CompanyType);
         $this->assign('IsPayment',$this->IsPayment);
         $this->assign('VerifyStatus',$this->VerifyStatus);
+        $this->assign('WithdrawType',$this->WithdrawType);
         $this->display();
 
     }
@@ -232,7 +241,11 @@ class CompanyStatementPoolController extends ThinkController
 
                 if($is_export){
                     //J3*(K3+L3)+M3-N3
-                    $va['sum_money'] =  "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}";
+                    if($va['statement_type'] > 0){ //罚款服务器费用
+                        $va['sum_money'] =  "=J{$line}";
+                    }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}+";
 
@@ -284,7 +297,7 @@ class CompanyStatementPoolController extends ThinkController
 
                 if($is_export){
                     $v['statement_money_exp'] .= "H{$line}+";
-                    
+
                     $va['d_statement_money'] =  "=D{$line}*(1-G{$line})*(E{$line}+F{$line})";
 
                     $count['platform_amount_exp'] .= "D{$line}+";
diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html
index d83953056..d40073fee 100644
--- a/Application/Admin/View/CompanyStatementPool/lists.html
+++ b/Application/Admin/View/CompanyStatementPool/lists.html
@@ -102,6 +102,15 @@
                 </div>
             </div>
 
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="withdraw_type" name="withdraw_type" class="select_gallery" >
+                    <option value="">结算周期</option>
+                    <volist name="WithdrawType" id="vo">
+                        <option value="{$key}" <if condition="isset($_GET['withdraw_type']) && $key eq I('withdraw_type')">selected</if> >{$vo}</option>
+                    </volist>
+                </select>
+            </div>
+
             <div class="input-list input-list-promote search_label_rehab">
                 <select id="verify_status" name="verify_status" class="select_gallery" >
                     <option value="">请选择审核状态</option>
@@ -146,6 +155,7 @@
                         <th>结算汇总单订单号</th>
                         <th>结算时间</th>
                         <th>结算类型</th>
+                        <th>结算周期</th>
                         <th>是否打款</th>
                         <th>结算金额</th>
                         <th>结算流水</th>
@@ -172,8 +182,8 @@
                                 <td>{$data.statement_num}</td>
                                 <td>{$data.valid}</td>
                                 <td>{$data.company_type_str}</td>
+                                <td>{$data.withdraw_type}</td>
                                 <td>{$data.is_payment_str}</td>
-
                                 <td>{$data.statement_money}</td>
                                 <td>{$data.platform_amount}</td>
                                 <td>{$data.lack_statement_money}</td>
diff --git a/Application/Admin/View/CompanyStatementPool/viewPuPool.html b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
index bc15698e0..8874584d9 100644
--- a/Application/Admin/View/CompanyStatementPool/viewPuPool.html
+++ b/Application/Admin/View/CompanyStatementPool/viewPuPool.html
@@ -133,15 +133,20 @@
                             <td>{$com['statement_info'][0]['game_type_name']}</td>
                             <td>{$com['statement_info'][0]['statement_begin_time']} ~ {$com['statement_info'][0]['statement_end_time']}</td>
                             <td>{$com['statement_info'][0]['pay_amount']}</td>
+                            <if condition="$com['statement_info'][0]['statement_type'] neq 0">
+                                <td></td>
+                                <td></td>
+                            <else />
+                                <td>{$com['statement_info'][0]['ratio']|default=0}%</td>
+                                <td>{$com['statement_info'][0]['increment_ratio']|default=0}%</td>
+                            </if>
 
-                            <td>{$com['statement_info'][0]['ratio']|default=0}%</td>
-                            <td>{$com['statement_info'][0]['increment_ratio']|default=0}%</td>
                             <td>{$com['statement_info'][0]['reward']}</td>
                             <td>{$com['statement_info'][0]['fine']}</td>
                             <td>{$com['statement_info'][0]['sum_money']}</td>
 
                             <td rowspan="{$com.statement_count}">{$com.company_info.payee_name}</td>
-                            <td rowspan="{$com.statement_count}">{$com.company_info.bank_account}</td>
+                            <td rowspan="{$com.statement_count}">&nbsp;{$com.company_info.bank_account}</td>
                             <td rowspan="{$com.statement_count}">{$com.company_info.opening_bank}</td>
                             <td rowspan="{$com.statement_count}"></td>
                             <td rowspan="{$com.statement_count}">{$com.remark}</td>
@@ -155,8 +160,14 @@
                                     <td>{$it['statement_begin_time']} ~ {$it['statement_end_time']}</td>
                                     <td>{$it['pay_amount']}</td>
 
-                                    <td>{$it['ratio']|default=0}%</td>
-                                    <td>{$it['increment_ratio']|default=0}%</td>
+                                    <if condition="$it['statement_type'] neq 0">
+                                        <td></td>
+                                        <td></td>
+                                    <else />
+                                        <td>{$it['ratio']|default=0}%</td>
+                                        <td>{$it['increment_ratio']|default=0}%</td>
+                                    </if>
+
                                     <td>{$it['reward']}</td>
                                     <td>{$it['fine']}</td>
                                     <td>{$it['sum_money']}</td>