From a439946207a531af1a1cda927632cbef1e8529b2 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 25 Feb 2021 14:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=90=E7=AB=99=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...SubCompanyStatementSetController.class.php | 100 ++++++------------
 1 file changed, 32 insertions(+), 68 deletions(-)

diff --git a/Application/Admin/Controller/SubCompanyStatementSetController.class.php b/Application/Admin/Controller/SubCompanyStatementSetController.class.php
index cf06e334e..f7d81e92e 100644
--- a/Application/Admin/Controller/SubCompanyStatementSetController.class.php
+++ b/Application/Admin/Controller/SubCompanyStatementSetController.class.php
@@ -70,78 +70,41 @@ class SubCompanyStatementSetController extends Controller {
 			$stime = strtotime($stime);
 		}
 		$nowdate = date("Y-m-d",$stime);
-		$w = (int)date("w",$stime);
 		$d = (int)date("d",$stime);
 
-		if($w == 1 || $d == 1){
-			if($w == 1){
-				if($company == "all"){
-					echo $nowdate.":".PHP_EOL;
-					echo "--周结begin".PHP_EOL;
-	
-					$this->cpStatement(0,$stime);
-					echo "∟----CP周结统计ok".PHP_EOL;
-	
-					$this->promoteCompanyStatement(0,$stime);
-					echo "∟----推广公司周结统计ok".PHP_EOL;
-					if(!IS_SUBSITE){
-						$this->promoteUserPool(0,$stime);
-						echo "∟----推广个人周结ok".PHP_EOL;
-					}
-					
-				}
-				if($company == "cp"){
-					$this->cpStatement(0,$stime);
-					echo "∟----CP周结统计ok".PHP_EOL;
-				}
-				if($company == "pc"){
-					$this->promoteCompanyStatement(0,$stime);
-					echo "∟----推广公司周结统计ok".PHP_EOL;
-				}
-				if($company == "pu"){
-					$this->promoteUserPool(0,$stime);
-					echo "∟----推广个人周结ok".PHP_EOL;
-				}
-				
+		if($d == 1){
+			if($company == "all"){
+				echo $nowdate.":".PHP_EOL;
+				echo "--月结&补点begin".PHP_EOL;
+
+				$this->cpStatement(1,$stime);
+				echo "∟----CP月结&补点统计ok".PHP_EOL;
+
+				$this->promoteCompanyStatement(1,$stime);
+				$this->promoteCompanyStatement(2,$stime);
+
+				$this->officeCompanyStatement($stime); //官方结算
+				echo "∟----官方/推广公司月结统计ok".PHP_EOL;
+
+				$this->promoteUserPool(1,$stime);
+				echo "∟----推广个人月结统计ok".PHP_EOL;
 			}
-			if($d == 1){
-				if($company == "all"){
-					echo $nowdate.":".PHP_EOL;
-					echo "--月结&补点begin".PHP_EOL;
-
-					$this->cpStatement(1,$stime);
-					$this->cpStatement(2,$stime);
-					echo "∟----CP月结&补点统计ok".PHP_EOL;
-
-					$this->promoteCompanyStatement(1,$stime);
-					$this->promoteCompanyStatement(2,$stime);
-					$this->officeCompanyStatement($stime); //官方结算
-					echo "∟----官方/推广公司月结&补点统计ok".PHP_EOL;
-					if(!IS_SUBSITE){
-						$this->promoteUserPool(1,$stime);
-						$this->promoteUserPool(2,$stime);
-						echo "∟----推广个人月结&补点统计ok".PHP_EOL;
-					}
-				}
-				if($company == "cp"){
-					$this->cpStatement(1,$stime);
-					$this->cpStatement(2,$stime);
-					echo "∟----CP月结&补点统计ok".PHP_EOL;
-				}
-				if($company == "pc"){
-					$this->promoteCompanyStatement(1,$stime);
-					$this->promoteCompanyStatement(2,$stime);
-					$this->officeCompanyStatement($stime); //官方结算
-					echo "∟----官方/推广公司月结&补点统计ok".PHP_EOL;
-				}
-				if($company == "pu"){
-					$this->promoteUserPool(1,$stime);
-					$this->promoteUserPool(2,$stime);
-					echo "∟----推广个人月结&补点统计ok".PHP_EOL;
-				}
+			if($company == "cp"){
+				$this->cpStatement(1,$stime);
+				echo "∟----CP月结&补点统计ok".PHP_EOL;
+			}
+			if($company == "pc"){
+				$this->promoteCompanyStatement(1,$stime);
+				$this->promoteCompanyStatement(2,$stime);
+				$this->officeCompanyStatement($stime); //官方结算
+				echo "∟----官方/推广公司月结&补点统计ok".PHP_EOL;
+			}
+			if($company == "pu"){
+				$this->promoteUserPool(1,$stime);
+				echo "∟----推广个人月结&补点统计ok".PHP_EOL;
 			}
 		}else{
-			echo $nowdate."非周一和月初，无需任何处理".PHP_EOL;
+			echo $nowdate."非月初，无需任何处理".PHP_EOL;
 		}
 	}
 	/**
@@ -425,6 +388,8 @@ class SubCompanyStatementSetController extends Controller {
 			$v['ratio']=0;
 			$v['sum_money'] = 0;
 			$v['statement_type']=0;
+			$v['platform_money'] = $v['pay_amount'];
+			$v['aggregate_money'] = 0;
 
 			$add_data['platform_amount'] += $v['pay_amount'];
 			$add_data['pay_amount'] += $v['pay_amount'];
@@ -1426,7 +1391,6 @@ class SubCompanyStatementSetController extends Controller {
 			$user['withdraw_type'] = 1;
 			//月结&补点
 			$this->doPromoteUserPool($user,1,$stime,$recount);
-			
 		}else{
 			$users['withdraw_type'] = 2;
 			$user['withdraw_type'] = 2;