From ea7bafec91c8755bf04a86678d40a8c2617a121d Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 11 Aug 2020 15:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8=E9=87=8D?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementPoolController.class.php | 2 +-
 .../Admin/Controller/CompanyStatementSetController.class.php  | 4 +++-
 Application/Admin/View/CompanyStatementPool/lists.html        | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 06140f036..e554313b6 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -786,7 +786,7 @@ class CompanyStatementPoolController extends ThinkController
         //重新计算
         $stime = $info['statement_end_time']-0+1;
         $type = $info['withdraw_type'];
-        A("CompanyStatementSet")->promoteUserPool($type,$stime,true,$info['is_payment']);
+        A("CompanyStatementSet")->promoteUserPool($type,$stime,true);
 
         M()->commit();
         $this->ajaxReturn(array(
diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index 6b6558659..85c10b0fa 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -1118,7 +1118,9 @@ class CompanyStatementSetController extends Controller {
         }
 		if($data['statement_money'] == 0){
 			$data['verify_status'] = 5;
-			$data['verify_log'] = json_encode(["create_user"=>"system","create_time"=>date("Y-m-d H:i:s"),"verify_user"=>$op_name,"verify_time"=>date("Y-m-d H:i:s"),"payment_user"=>"system","payment_time"=>date("Y-m-d H:i:s")]);
+			$data['verify_log'] = json_encode(["create_user"=>$op_name,"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")]);
+		}else{
+			$data['verify_log'] = json_encode(["create_user"=>$op_name,"create_time"=>date("Y-m-d H:i:s")]);
 		}
 		$data['create_lack_ids'] = implode(",",$data['create_lack_ids']);
 		$data['del_lack_ids'] = implode(",",$data['del_lack_ids']);
diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html
index 1ccc25ea1..d275a57bb 100644
--- a/Application/Admin/View/CompanyStatementPool/lists.html
+++ b/Application/Admin/View/CompanyStatementPool/lists.html
@@ -155,7 +155,7 @@
                         <th>结算时间</th>
                         <th>结算类型</th>
                         <th>结算周期</th>
-                        <th>是否打款</th>
+                        <!-- <th>是否打款</th> -->
                         <th>结算金额</th>
                         <!-- <th>结算流水</th> -->
                         <th>不结算金额</th>
@@ -182,7 +182,7 @@
                                 <td>{$data.valid}</td>
                                 <td>{$data.company_type_str}</td>
                                 <td>{$data.withdraw_type}</td>
-                                <td>{$data.is_payment_str}</td>
+                                <!-- <td>{$data.is_payment_str}</td> -->
                                 <td>{$data.statement_money}</td>
                                 <!-- <td>{$data.platform_amount}</td> -->
                                 <td>{$data.lack_statement_money}</td>