From 3fc9b578a98de7cd7b7882fccd8d1d952306fd52 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 3 Aug 2020 10:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA=E9=87=8D?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementPoolController.class.php         |  2 +-
 .../CompanyStatementSetController.class.php          | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 91a8eeeb2..091555059 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -787,7 +787,7 @@ class CompanyStatementPoolController extends ThinkController
         //重新计算
         $stime = $info['statement_end_time']-0+1;
         $type = $info['withdraw_type'];
-        A("CompanyStatementSet")->promoteUserPool($type,$stime,true);
+        A("CompanyStatementSet")->promoteUserPool($type,$stime,true,$info['is_payment']);
 
         M()->commit();
         $this->ajaxReturn(array(
diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php
index bcb5cb754..d3ea8805d 100644
--- a/Application/Admin/Controller/CompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/CompanyStatementSetController.class.php
@@ -791,7 +791,7 @@ class CompanyStatementSetController extends Controller {
 			
 		}
 	}
-	public function promoteUserPool($type,$stime,$recount = false){
+	public function promoteUserPool($type,$stime,$recount = false,$is_payment=false){
 		$t = $this->setBeginAndEndTime($type,$stime);
 		$begintime = $t[0];
 		$endtime = $t[1];
@@ -835,9 +835,15 @@ class CompanyStatementSetController extends Controller {
 			$user['withdraw_type'] = 2;
 			$this->doPromoteUserPool($user,$users,2,$stime,$recount);
 		}
+		if($is_payment !== false && $is_payment==1){
+			$this->savePromotateUserPool($users);
+		}else if($is_payment !== false && $is_payment==2){
+			$this->savePromotateUserPool($user);
+		}else{
+			$this->savePromotateUserPool($users);
+			$this->savePromotateUserPool($user);
+		}
 		
-		$this->savePromotateUserPool($users);
-		$this->savePromotateUserPool($user);
 	}
 
 	/**