|
|
|
@@ -174,7 +174,8 @@ public class WxProjectConfigController extends BaseController { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initMall"); |
|
|
|
try { |
|
|
|
//集团版 |
|
|
|
if(EnumSaleType.GROUP.getCode().equals(wxMall.getSaleType())){ |
|
|
|
if(EnumSaleType.GROUP.getCode().equals(wxMall.getSaleType()) |
|
|
|
|| EnumSaleType.GROUP_v1.getCode().equals(wxMall.getSaleType())){ |
|
|
|
wxMall.setGroupSupport(EnumGroupSupport.SUPPORT.getCode()); |
|
|
|
}else{ |
|
|
|
wxMall.setGroupSupport(EnumGroupSupport.NOT_SUPPORT.getCode()); |
|
|
|
@@ -653,7 +654,7 @@ public class WxProjectConfigController extends BaseController { |
|
|
|
TenantEntity tenantEntity = new TenantEntity(); |
|
|
|
tenantEntity.setTenantId(tenantId); |
|
|
|
WxMall parentWxMall = wxMallService.getByTenantInfo(tenantEntity); |
|
|
|
if(parentWxMall == null || !EnumSaleType.GROUP.getCode().equals(parentWxMall.getSaleType()) |
|
|
|
if(parentWxMall == null |
|
|
|
|| !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) |
|
|
|
|| StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
@@ -690,7 +691,7 @@ public class WxProjectConfigController extends BaseController { |
|
|
|
tenantEntity.setTenantId(tenantId); |
|
|
|
|
|
|
|
WxMall parentWxMall = wxMallService.getByTenantInfo(tenantEntity); |
|
|
|
if(parentWxMall == null || !EnumSaleType.GROUP.getCode().equals(parentWxMall.getSaleType()) |
|
|
|
if(parentWxMall == null |
|
|
|
|| !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) |
|
|
|
|| StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
|