Merge branch 'hotfix/payStatistic' of wmtx/platform into release

判定是否录入过修正

Application/Admin/Controller/CompanyStatementController.class.php

@@ -1152,9 +1152,20 @@ class CompanyStatementController extends ThinkController
 
                 $statementInfo = json_decode($value['statement_info'],true);;
                 if ($value['company_type'] == 2) {
-                    $statementInfo = $statementInfo['game_list'];
-                }
 
+                    foreach ($statementInfo as $sk => $sv) {
+                        $statementInfos = $sv['game_list'];
+                        foreach ($statementInfos as $k => $v) {
+                            if (strtotime(str_replace('.','-',$v['statement_end_time'])) >= $start_time && strtotime(str_replace('.','-',$v['statement_end_time']))<=$end_time
+                                ||strtotime(str_replace('.','-',$v['statement_begin_time']))>=$start_time && strtotime(str_replace('.','-',$v['statement_begin_time']))<=$end_time
+                                ||strtotime(str_replace('.','-',$v['statement_begin_time']))<=$start_time && strtotime(str_replace('.','-',$v['statement_end_time'])) >= $end_time) {
+                                if (in_array($v['relation_game_id'], $relation_game_data)) {
+                                    $this->ajaxReturn(['status' => 0, 'data' => [], 'msg' => "《{$v['game_name']}》在日期：{$_REQUEST['time_start']}-{$_REQUEST['time_end']}有结算过的部分,请重新选择"]);
+                                }
+                            }
+                        }
+                    }
+                } else {
                     foreach ($statementInfo as $k => $v) {
                         if (strtotime(str_replace('.','-',$v['statement_end_time'])) >= $start_time && strtotime(str_replace('.','-',$v['statement_end_time']))<=$end_time
                             ||strtotime(str_replace('.','-',$v['statement_begin_time']))>=$start_time && strtotime(str_replace('.','-',$v['statement_begin_time']))<=$end_time
@@ -1164,6 +1175,8 @@ class CompanyStatementController extends ThinkController
                             }
                         }
                     }
+                }
+
 
 //            }