Merge branch 'feature/finance_statement_three' of wmtx/platform into master

优化上游结算

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -299,7 +299,7 @@ class CompanyStatementSetController extends Controller {
 			$promote_ratio = $cp[$add_data['company_id']]['channel_rate'] ?? 0;
 			$fax_ratio = $cp[$add_data['company_id']]['taxation_rate'] ?? 0;
 			//游戏统计
-			if(!isset($v['list'])){continue;}
+            if (isset($v['list'])) {
                 foreach ($v['list'] as $ke=>$va) {
                     $game =[];
                     $game['pay_amount'] =$va['pay_money'];
@@ -325,7 +325,9 @@ class CompanyStatementSetController extends Controller {
                             $tratio1  = getGameCpRadio($game_id['id'], $va['pay_money'], true);
                             $tratio2  = getGameCpRadio($game_id['id'], $va['pay_money'], false);
                             $tratio = $tratio1-$tratio2;
-						if($tratio <= 0){continue;}
+                            if ($tratio <= 0) {
+                                continue;
+                            }
                         }
                     }
                     if ($v['first_company_type'] == 1) {
@@ -348,6 +350,9 @@ class CompanyStatementSetController extends Controller {
                     $game['statement_end_time']=$statement_end_time;
                     $game['statement_type']=0;
                     $add_data['statement_info'][] = $game;
+                }
+			}else{
+				$add_data['statement_info'] = [];
 			}
 			$add_data['platform_amount'] = $add_data['pay_amount'];
 			if($type < 2){
@@ -411,9 +416,9 @@ class CompanyStatementSetController extends Controller {
 				//金额为0不补点
 				continue;
 			}
-			if($add_data['platform_amount'] == 0){
+			if($add_data['platform_amount'] == 0 && $add_data['statement_money'] == 0){
 				//全等于0表示没有流水，小于0依旧要结算
-				return;
+				continue;
 			}
 			//添加
 			if($recount && $company_id !== false){