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

外团特殊比例自动审核通过

Application/Admin/Controller/CompanyGameRatioController.class.php

@@ -602,6 +602,17 @@ class CompanyGameRatioController extends AdminController
             $save['verify_log']=json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]);
             //获取旧比例
             $this->getOldRatio($save);
+
+            $promote_data = M("promote_company","tab_")->where(['id'=>$save['company_id']])->find();
+
+            if ($promote_data['company_belong'] != '1' && $promote_data['company_belong'] != '2') {
+                $save['verify_log'] = json_decode($save['verify_log'],true);
+                $save['verify_log']['market_user']="AUTO";
+                $save['verify_log']['market_time']=date("Y-m-d H:i:s");
+                $save['verify_log'] = json_encode($save['verify_log']);
+                $save['status']=1;
+            }
+
             //判断已有未审核
             $where = [
                 "relation_game_id"=>$save['relation_game_id'],
@@ -716,9 +727,20 @@ class CompanyGameRatioController extends AdminController
             $save['end_time'] = $params['end_time'] ? strtotime($params['end_time'])+86399 : 0;
             $save['remark'] = $params['remark'] ?? '';
             $save['turnover_type'] = $params['turnover_type'] ?? 1;
-            if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time']){
+            if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time'] || $y['turnover_type'] != $save['turnover_type']){
                 $save['status'] = 0;
                 $save['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]);
+
+                $promote_data = M("promote_company","tab_")->where(['id'=>$y['company_id']])->find();
+
+                if ($promote_data['company_belong'] != '1' && $promote_data['company_belong'] != '2') {
+                    $save['verify_log'] = json_decode($save['verify_log'],true);
+                    $save['verify_log']['market_user']="AUTO";
+                    $save['verify_log']['market_time']=date("Y-m-d H:i:s");
+                    $save['verify_log'] = json_encode($save['verify_log']);
+                    $save['status']=1;
+                }
+
             }
             M("company_game_ratio_log","tab_")->save($save);
             addOperationLog(['op_type'=>1,'key'=>$save['id'],'op_name'=>'修改','url'=>U('lists')]);