Ver código fonte

init bug

release_toaliyun_real
xhxu 5 anos atrás
pai
commit
a7bea5fef4
3 arquivos alterados com 3 adições e 3 exclusões
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java Ver arquivo

@@ -560,9 +560,8 @@ public class WxProjectConfigController extends BaseController {
setTenantId(wxMall.getParentTenantId()); setTenantId(wxMall.getParentTenantId());
}}; }};
WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity);
logger.info(parentWxMall.toString());
if(parentWxMall == null || parentWxMall.getSaleType() != 100 if(parentWxMall == null || parentWxMall.getSaleType() != 100
|| !parentWxMall.equals(EnumGroupSupport.SUPPORT.getCode())
|| !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())
|| StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
} }


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java Ver arquivo

@@ -245,6 +245,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
/** /**
* 初始化数据 * 初始化数据
*/ */

} }






+ 1
- 1
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Ver arquivo

@@ -931,7 +931,7 @@
</if> </if>
<if test=" null != parentTenantId and '' != parentTenantId"> <if test=" null != parentTenantId and '' != parentTenantId">
and wo.`parent_tenant_id` = #{parentTenantId} and wo.`parent_tenant_id` = #{parentTenantId}
and wop.`tenant_id` = #{tenantId}
and wop.`parent_tenant_id` = #{parentTenantId}
</if> </if>
) )
* 100 * 100


Carregando…
Cancelar
Salvar