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

特殊补点功能修改

Application/Admin/Controller/CompanyStatementController.class.php

@@ -984,8 +984,35 @@ class CompanyStatementController extends ThinkController
             $radioMap['company_id'] = $_REQUEST['company_id'];
         }
 
+
+
         $start_time = strtotime($_REQUEST['time_start']);
         $end_time = strtotime($_REQUEST['time_end']) + 86399;
+        $check_add = M("company_statement","tab_")->field("statement_begin_time,statement_end_time,statement_info,company_type")->where(['company_id'=>$_REQUEST['company_id']])->select();
+
+        foreach ($check_add as $key => $value) {
+
+            if ($value['statement_end_time'] >= $start_time && $value['statement_end_time']<=$end_time
+                ||$value['statement_begin_time']>=$start_time && $value['statement_begin_time']<=$end_time
+                ||$value['statement_begin_time']>=$start_time && $value['statement_end_time'] <= $end_time)
+            {
+
+                $statementInfo = json_decode($value['statement_info'],true);;
+                if ($value['company_type'] == 2) {
+                    $statementInfo = $statementInfo['game_list'];
+                }
+
+                foreach ($statementInfo as $k => $v) {
+                    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']}有结算过的部分,请重新选择"]);
+                    }
+                }
+
+            }
+
+        }
+
+
         if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
             $map['payed_time'] = ['between', [$start_time, $end_time]];
 
@@ -1176,7 +1203,7 @@ class CompanyStatementController extends ThinkController
         }
 
 
-        $this->ajaxReturn(['status'=>1,'data'=>$handleData]);
+        $this->ajaxReturn(['status'=>1,'data'=>$handleData,'msg'=>'']);
 
     }
 

Application/Admin/View/CompanyStatement/viewSpecialComplement.html

@@ -521,7 +521,7 @@
                             }
 
                         } else {
-                            layer.msg('获取数据失败');
+                            layer.msg(result.msg);
                         }
                         is_add = 1;
                         layer.closeAll("loading");