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

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

Application/Admin/Controller/CompanyGameRatioController.class.php

@@ -728,8 +728,19 @@ class CompanyGameRatioController extends AdminController
             $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']){
-//                $save['status'] = 0;
-//                $save['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]);
+                $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')]);