添加商户未激活不能支付(现已关闭)、不能开启活动验证

Areas/Api/Controllers/Main/ConsumerOrdersController.cs

@@ -93,10 +93,11 @@ namespace MySystem.Areas.Api.Controllers.v1
             var merchantAdd = MerchantAddInfoService.Query(MerchantId);
             var merchantset = MerchantParamSetService.Query(MerchantId);
             string openid = "";
-            if (merchant.IsAct == 0)
-            {
-                return Json(new AppResultJson() { Status = "-1", Info = "支付失败，商户尚未激活，请前往来客吧商户版激活后使用" });
-            }
+            //商户未激活也能支付(365服务费)
+            // if (merchant.IsAct == 0)
+            // {
+            //     return Json(new AppResultJson() { Status = "-1", Info = "支付失败，商户尚未激活，请前往来客吧商户版激活后使用" });
+            // }
             if (PayMode == 1)
             {
                 openid = new AlipayFunction(_accessor.HttpContext).GetAlipayUserId(Code);

Areas/Api/Controllers/Main/MerchantParamSetController.cs

@@ -10,6 +10,7 @@ using System.Web;
 using MySystem.Models.Main;
 using LitJson;
 using Library;
+using MySystem.Service.Main;
 
 namespace MySystem.Areas.Api.Controllers.v1
 {
@@ -31,6 +32,12 @@ 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 });
         }