From 28a1fd4c32432776039f71d89abf001b51f760d1 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 22 Dec 2020 11:33:11 +0800 Subject: [PATCH] bug --- .../controller/basic/WxProjectConfigController.java | 8 ++++---- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index f8f4ee0ff..36a723781 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -689,10 +689,10 @@ public class WxProjectConfigController extends BaseController { }else{ subTenantIdStrs = StringUtils.join(subTenantIds, ','); } - TenantEntity TenantEntity = new TenantEntity(){{ - setTenantId(tenantId); - }}; - WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + + WxMall parentWxMall = wxMallService.getByTenantInfo(tenantEntity); if(parentWxMall == null || parentWxMall.getSaleType() != 100 || !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 2cc59dbc3..e0cd67f52 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -137,7 +137,7 @@ public enum ErrorCode{ PUSH_LIMIT_NOT_INRANG(2042, "不在疲劳度允许的时间段"), COUPON_ONLY_FOR_NEW_MEMBER(2044, "您已经参加过新会员活动"), - COUPON_ALREADY_IN_NEW_MEMBER(2045, "您正在参加别的新会员活动"), + COUPON_ALREADY_IN_NEW_MEMBER(2045, "您已经不是新用户"), COUPON_VALID_NOT_SUPPORTED(2046, "券类型不支持"), /** * 车流 2040