Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -1470,10 +1470,12 @@ class CompanyStatementSetController extends Controller {
 					"statement_info"=>json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE)
 				];
 			}
+			//无需补点不统计其他金额
+			if($type == 2 && $v['statement_money'] == 0){
+				continue ;
+			}
 			//聚合未结算数据
 			$lsres = $LackStatement->where("company_id='{$k}' and is_pool = 0")->select();
-			// dd($lsres);
-			
 			$del_lack_ids = [];
 			if(count($lsres) > 0){
 				//进行聚合
@@ -1506,9 +1508,6 @@ class CompanyStatementSetController extends Controller {
 			if($v['platform_amount'] == 0 && $v['statement_money'] == 0){
 				continue ;
 			}
-			if($type == 2 && $v['statement_money'] == 0){
-				//补点不存
-			}else{
 			if($v['platform_amount'] < 300){
 				//存未满
 				// if($lackcompany['pay_amount'] != 0){
@@ -1554,7 +1553,6 @@ class CompanyStatementSetController extends Controller {
 			}
 		}
 	}
-	}
 	/**
 	 * 保存信息汇总信息
 	 */