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

Areas/Api/Controllers/v1/MainServer/MerchantParamSetController.cs

@@ -116,6 +116,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)
             {