删除冗余代码，调整商户活动配置限制

Areas/Api/Controllers/Main/MerchantParamSetController.cs

@@ -32,12 +32,6 @@ namespace MySystem.Areas.Api.Controllers.v1
             value = DesDecrypt(value);
             value = value.Replace("null", "\"\"");
             JsonData data = JsonMapper.ToObject(value);
-            int Id = int.Parse(function.CheckInt(data.getItem("Id").ToString()));
-            var merchant = MerchantInfoService.Query(Id);
-            if (merchant.Id > 0 && merchant.IsAct == 0)
-            {
-                return Json(new AppResultJson() { Status = "-1", Info = "商户尚未激活,不能开启活动" });
-            }
             Dictionary<string, object> Obj = DetailDo(value);
             return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
         }
@@ -118,6 +112,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
             MerchantInfo merchant = maindb.MerchantInfo.FirstOrDefault(m => m.Id == Id);
+            if (merchant.Id > 0 && merchant.IsAct == 0)
+            {
+                return new AppResultJson() { Status = "-1", Info = "商户尚未激活,不能开启活动配置活动参数" };
+            }
             MobileCodeCheck mobilecheck = RedisDbconn.Instance.Get<MobileCodeCheck>("MobileCodeCheck:" + merchant.Mobile);
             if (mobilecheck == null)
             {