Merge branch 'hotfix/statement_ratio_change' of wmtx/platform into master

优化个人重算

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(

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);
 	}
 
 	/**