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 df9af776c..34a014e25 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -560,9 +560,8 @@ public class WxProjectConfigController extends BaseController { setTenantId(wxMall.getParentTenantId()); }}; WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); - logger.info(parentWxMall.toString()); if(parentWxMall == null || parentWxMall.getSaleType() != 100 - || !parentWxMall.equals(EnumGroupSupport.SUPPORT.getCode()) + || !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index bc75f8f09..c395ed8e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -245,6 +245,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { /** * 初始化数据 */ + } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 9e9d1a276..efcfc6a9d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -931,7 +931,7 @@ and wo.`parent_tenant_id` = #{parentTenantId} - and wop.`tenant_id` = #{tenantId} + and wop.`parent_tenant_id` = #{parentTenantId} ) * 100