Merge branch 'feature/resource_config' into release

Application/Admin/Controller/ResourceVerifyConfigController.class.php

@@ -114,9 +114,9 @@ class ResourceVerifyConfigController extends ThinkController
             if (I('old_value_ratio')<0 || I('old_value_ratio') > 100) {
                 $this->error('可申请额度占总充值量的比例必须在0-100之间');
             }
+            $game_name = trim(I('game_name'));
             $model = M($this->modelName, 'tab_');
-            $save['game_id'] = I('game_id');
-            $save['game_name'] = trim(I('game_name'));
+            $save['game_name'] = $game_name;
             $save['sdk_version'] = I('sdk_version');
             $save['new_apply_count'] = I('new_apply_count');
             $save['new_low_value'] = I('new_low_value');
@@ -136,7 +136,7 @@ class ResourceVerifyConfigController extends ThinkController
                     $saveAll[] = $save;
                 }
             } else {
-                $game_id = DM('game')->where(['relation_game_name' => I('game_name')])->getField('id');
+                $game_id = DM('game')->where(['relation_game_name' => I('game_name'), 'sdk_version' => I('sdk_version')])->getField('id');
                 $save['game_id'] = $game_id;
                 $saveAll[] = $save;
             }