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 b9739d2b4..4ac381cb1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -154,7 +154,7 @@ public class WxProjectConfigController extends BaseController { tenantEntity.setTenantId(wxMall.getId().toString()); 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); @@ -177,7 +177,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()); diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index b34b3b6e8..2fb2ac045 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -113,6 +113,7 @@ public enum ErrorCode{ MERCHANT_BUSER_NOT_VALID(2016, "商户用户不存在或已被禁用"), MERCHANT_HASRENTCONTRACT(2017,"该商户存在计租中合同"), MERCHANT_CODE_IS_FOUND(2018, "商户编码已存在"), + MERCHANT_BRAND_IS_FOUND(2019, "品牌商户已存在"), /** * 券 diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSaleType.java b/mallinkService/src/main/java/com/iformall/enums/EnumSaleType.java index 5b1f5169c..2379bfa62 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumSaleType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSaleType.java @@ -13,6 +13,7 @@ public enum EnumSaleType { WX_ENJOY_TRY(4, "速享试用版"), TT_ALL_ROUND(11, "抖音尊享版"), GROUP(100, "集团版"), + GROUP_v1(101, "集团版"), WX_JM_ALL_ROUND(1035001036,"金茂全能版"), ; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index d751472a6..acdceeb66 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -30,6 +30,7 @@ public interface WxMerchantMapper extends CommonMapper { int hasMerchant(WxMerchant wxMerchant); int hasMerchantEncode(WxMerchant wxMerchant); + int hasMerchantBrand(WxMerchant wxMerchant); void updateCreditLocked(WxMerchant wxMerchant); @@ -56,4 +57,5 @@ public interface WxMerchantMapper extends CommonMapper { Map findShopMerchant(@Param("id")Long id); int deleteByUpdate(Long id); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 719d6702f..76e910f84 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -160,6 +160,7 @@ public interface WxMerchantService { boolean hasMerchant(WxMerchant wxMerchant); boolean hasMerchantEncode(WxMerchant wxMerchant); + boolean hasMerchantBrand(WxMerchant wxMerchant); WxMerchant getMerchantByEncode(String encode); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 2ea1bc34f..8c486f4af 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -509,9 +509,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (hasMerchant(wxMerchant)) { return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); } + //检查商户唯一编码 if (hasMerchantEncode(wxMerchant)) { return new ResultData(ErrorCode.MERCHANT_CODE_IS_FOUND); } + //检查品牌 + if (hasMerchantBrand(wxMerchant)) { + return new ResultData(ErrorCode.MERCHANT_BRAND_IS_FOUND); + } //保存商户商铺的关联 List shopidlist = wxMerchant.getShopids(); if (shopidlist.isEmpty()) { @@ -1026,6 +1031,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { } } + @Override + public boolean hasMerchantBrand(WxMerchant wxMerchant) { + if(wxMerchant.getBrand() != null && wxMallService.isgroupSupport(wxMerchant)){ + wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + return wxMerchantMapper.hasMerchantBrand(wxMerchant) > 0 ? true : false; + } + return false; + } + @Override public WxMerchant getMerchantByEncode(String encode){ return wxMerchantMapper.getMerchantByEncode(encode); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 7dbaa22a3..5147c1370 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -101,6 +101,7 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract data.put("status", wfr.getStatus()); data.put("userName", wfr.getUserName()); data.put("remark", wfr.getRemark()); + data.put("updateDate",wfr.getUpdateDate()); result.add(data); } return new ResultData(result); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index f0c4b050c..3a99819ab 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -313,10 +313,24 @@ + + + update wx_merchant set credit_locked = #{creditLocked} where tenant_id = #{tenantId} diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index d2da2e7a4..c2185a0dc 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -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);