Explorar el Código

bug

release_toaliyun_real
xhxu hace 5 años
padre
commit
28a1fd4c32
Se han modificado 2 ficheros con 5 adiciones y 5 borrados
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java Ver fichero

@@ -689,10 +689,10 @@ public class WxProjectConfigController extends BaseController {
}else{ }else{
subTenantIdStrs = StringUtils.join(subTenantIds, ','); 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 if(parentWxMall == null || parentWxMall.getSaleType() != 100
|| !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) || !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())
|| StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){


+ 1
- 1
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Ver fichero

@@ -137,7 +137,7 @@ public enum ErrorCode{
PUSH_LIMIT_NOT_INRANG(2042, "不在疲劳度允许的时间段"), PUSH_LIMIT_NOT_INRANG(2042, "不在疲劳度允许的时间段"),


COUPON_ONLY_FOR_NEW_MEMBER(2044, "您已经参加过新会员活动"), COUPON_ONLY_FOR_NEW_MEMBER(2044, "您已经参加过新会员活动"),
COUPON_ALREADY_IN_NEW_MEMBER(2045, "您正在参加别的新会员活动"),
COUPON_ALREADY_IN_NEW_MEMBER(2045, "您已经不是新用户"),
COUPON_VALID_NOT_SUPPORTED(2046, "券类型不支持"), COUPON_VALID_NOT_SUPPORTED(2046, "券类型不支持"),
/** /**
* 车流 2040 * 车流 2040


Cargando…
Cancelar
Guardar