Merge pull request 'feature/finance_payment_20210115' (#188) from feature/finance_payment_20210115 into release

优化上游

Application/Admin/Controller/SubCompanyStatementSetController.class.php

@@ -71,7 +71,27 @@ class SubCompanyStatementSetController extends Controller {
 		}
 		$nowdate = date("Y-m-d",$stime);
 		$d = (int)date("d",$stime);
+		$w = (int)date("w",$stime);
+		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($company == "cp"){
+				$this->cpStatement(0,$stime);
+				echo "∟----CP周结统计ok".PHP_EOL;
+			}
+			if($company == "pc"){
+				$this->promoteCompanyStatement(0,$stime);
+				echo "∟----推广公司周结统计ok".PHP_EOL;
+			}
+		}
 		if($d == 1){
 			if($company == "all"){
 				echo $nowdate.":".PHP_EOL;
@@ -81,7 +101,6 @@ class SubCompanyStatementSetController extends Controller {
 				echo "∟----CP月结&补点统计ok".PHP_EOL;
 
 				$this->promoteCompanyStatement(1,$stime);
-				$this->promoteCompanyStatement(2,$stime);
 
 				$this->officeCompanyStatement($stime); //官方结算
 				echo "∟----官方/推广公司月结统计ok".PHP_EOL;
@@ -95,7 +114,6 @@ class SubCompanyStatementSetController extends Controller {
 			}
 			if($company == "pc"){
 				$this->promoteCompanyStatement(1,$stime);
-				$this->promoteCompanyStatement(2,$stime);
 				$this->officeCompanyStatement($stime); //官方结算
 				echo "∟----官方/推广公司月结&补点统计ok".PHP_EOL;
 			}
@@ -103,7 +121,8 @@ class SubCompanyStatementSetController extends Controller {
 				$this->promoteUserPool(1,$stime);
 				echo "∟----推广个人月结&补点统计ok".PHP_EOL;
 			}
-		}else{
+		}
+		if($w != 1 && $d != 1){
 			echo $nowdate."非月初，无需任何处理".PHP_EOL;
 		}
 	}
@@ -254,6 +273,7 @@ class SubCompanyStatementSetController extends Controller {
 				}
 			}
 			unset($add_data['id'],$add_data['remark'],$add_data['confirm_status'],$add_data['confirm_log']);
+			$add_data['verify_status'] = 0;
 			$add_data['verify_log'] = $verify_log;
 			$add_data['op_time'] =time();
 			$add_data['statement_info'] = json_encode($add_data['statement_info'],JSON_UNESCAPED_UNICODE);
@@ -497,7 +517,6 @@ class SubCompanyStatementSetController extends Controller {
 				//非重算
 				return $v;
 			}
-			
 			$StatementDb->add($v);
 		}
 	}