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

优化游戏统计时间

Application/Admin/Controller/CompanyStatementController.class.php

@@ -616,7 +616,7 @@ class CompanyStatementController extends ThinkController
         }
         
         //创建基础未满基础信息
-        if($va['statement_money'] < $no_pool_money){
+        if($va['pay_amount'] < $no_pool_money){
             $lackcompany =[
                 "company_id"=>$company_info['id'],
                 "company_type"=>$v['company_type'],
@@ -651,7 +651,7 @@ class CompanyStatementController extends ThinkController
                 array_multisort($last_names,SORT_DESC,SORT_STRING,$va['statement_info']);
             }
         }
-        if($va['statement_money'] < $no_pool_money){
+        if($va['pay_amount'] < $no_pool_money){
             //依旧小于不结算金额存旧版
             if($lackcompany['pay_amount'] > 0){
                 $lask_id = $LackStatement->add($lackcompany);

Application/Admin/Controller/CompanyStatementSetController.class.php

@@ -1023,7 +1023,7 @@ class CompanyStatementSetController extends Controller {
 				"ali_user"=>$v['ali_user'],
 				"ali_account"=>$v['ali_account']
 			];
-			if($v['statement_money'] < 300){
+			if($v['pay_amount'] < 300){
 				$lackcompany =[
 					"company_id"=>$k,
 					"company_type"=>2,
@@ -1067,7 +1067,7 @@ class CompanyStatementSetController extends Controller {
 			if($type == 2 && $v['statement_money'] == 0){
 				//补点不存
 			}else{
-				if($v['statement_money'] < 300){
+				if($v['pay_amount'] < 300){
 					//存未满
 					if($lackcompany['pay_amount'] > 0){
 						$lask_id = $LackStatement->add($lackcompany);

Application/Admin/Controller/ExportController.class.php

@@ -8303,7 +8303,7 @@ class ExportController extends Controller
             if (!empty($map['_string'])) {
                 $map['_string'] .= " and ";
             }
-            $map['_string'] .= " s.payed_time < {$timeend}";
+            $map['_string'] .= " s.pay_time <= {$timeend}";
         }
 
         if (!empty(I('game_type_id'))) {

Application/Admin/Controller/FinanceController.class.php

@@ -730,7 +730,7 @@ class FinanceController extends ThinkController
             if (!empty($map['_string'])) {
                 $map['_string'] .= " and ";
             }
-            $map['_string'] .= " s.payed_time < {$timeend}";
+            $map['_string'] .= " s.payed_time <= {$timeend}";
         }
 
         if (!empty(I('game_type_id'))) {