From 9a60b01ad3235461d88c714f12fda05d32652415 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 22 Nov 2022 11:43:28 +0800 Subject: [PATCH 1/3] //coupon brand --- .../basic/WxProjectConfigController.java | 5 +++-- .../main/java/com/iformall/common/ErrorCode.java | 1 + .../main/java/com/iformall/enums/EnumSaleType.java | 1 + .../java/com/iformall/mapper/WxMerchantMapper.java | 2 ++ .../com/iformall/service/WxMerchantService.java | 1 + .../service/impl/WxMerchantServiceImpl.java | 14 ++++++++++++++ .../impl/WxRentPropertyContractServiceImpl.java | 1 + .../src/main/resources/mapper/WxMerchantMapper.xml | 14 ++++++++++++++ .../basic/WxProjectConfigController.java | 7 ++++--- 9 files changed, 41 insertions(+), 5 deletions(-) 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); From f2949fe268af81c695fb006d35affcc3b9ac78d7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 22 Nov 2022 15:24:28 +0800 Subject: [PATCH 2/3] //coupon brand --- .../controller/basic/WxBrandController.java | 18 ++++++++++----- .../com/iformall/tenant/TenantInfoImpl.java | 2 ++ .../V2022112200001__update_brand.sql | 4 ++++ .../com/iformall/tenant/TenantInfoImpl.java | 2 ++ .../com/iformall/tenant/TenantInfoImpl.java | 2 ++ .../com/iformall/tenant/TenantInfoImpl.java | 2 ++ .../service/impl/WxBrandServiceImpl.java | 4 ++-- .../controller/basic/WxBrandController.java | 22 +++++++++++++------ 8 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2022112200001__update_brand.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index bcbc18009..8ac33d2bc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -2,6 +2,8 @@ package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; +import com.iformall.annotation.TenantIgnore; +import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -49,7 +51,7 @@ public class WxBrandController extends BaseController { if (null == wxBrand) { wxBrand = new WxBrand(); } - wxBrand.updateTenantInfo(getTenantInfo()); + wxBrand.setTenantId(getTenantInfo().getFinalTenantId()); wxBrand.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = wxBrandService.listAsPage(wxBrand, pageNum, pageSize); return new ResultData(page); @@ -59,20 +61,24 @@ public class WxBrandController extends BaseController { @SystemControllerLog(description = "品牌-增加") public ResultData add(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::add"); - wxBrand.updateTenantInfo(getTenantInfo()); + wxBrand.setTenantId(getTenantInfo().getFinalTenantId()); return wxBrandService.save(wxBrand); } + @TenantIgnore @PostMapping("update") @SystemControllerLog(description = "品牌-更新") public ResultData update(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::update"); - wxBrand.updateTenantInfo(getTenantInfo()); + + if(wxBrand.getId() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ //判断是否解绑商户 WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.updateTenantInfo(wxBrand); +// wxMerchant.updateTenantInfo(wxBrand); wxMerchant.setIsDel(EnumYesOrNo.NO.getCode()); wxMerchant.setBrand(wxBrand.getId()); @@ -118,10 +124,10 @@ public class WxBrandController extends BaseController { public ResultData hasBrand(String name, Long id) { logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand"); WxBrand wxBrand = new WxBrand(); - wxBrand.updateTenantInfo(getTenantInfo()); + wxBrand.setId(id); + wxBrand.setTenantId(getTenantInfo().getFinalTenantId()); wxBrand.setName(name); - wxBrand.setId(id); return wxBrandService.hasBrand(wxBrand); } diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index bffd69cbd..516ece127 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -22,6 +22,7 @@ public class TenantInfoImpl implements TenantInfo { "mall_permission", "mall_sale_type", "mall_user_role", + "wx_brand", "wx_channel", "wx_business", "wx_sub_business", @@ -74,6 +75,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_mall", "wx_appinfo", "wx_authorizer_info", + "wx_brand", "wx_c_user", "tt_c_user", "wx_user_visit", diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022112200001__update_brand.sql b/mallinkAdmin/src/main/resources/db/migration/V2022112200001__update_brand.sql new file mode 100644 index 000000000..591f32362 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022112200001__update_brand.sql @@ -0,0 +1,4 @@ +--历史品牌数据 +UPDATE `mallink`.`wx_brand` SET `tenant_id` = `parent_tenant_id` WHERE `parent_tenant_id` is not null and `parent_tenant_id` != ''; + +UPDATE `mallink`.`wx_brand` SET `parent_tenant_id` = null; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index db75874e7..1c08c0f19 100644 --- a/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -23,6 +23,7 @@ public class TenantInfoImpl implements TenantInfo { "mall_permission", "mall_sale_type", "mall_user_role", + "wx_brand", "wx_channel", "wx_business", "wx_coupon_type", @@ -62,6 +63,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_mall", "wx_appinfo", "wx_authorizer_info", + "wx_brand", "wx_c_user", "tt_c_user", "wx_user_visit", diff --git a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 136963e46..1fba2c551 100644 --- a/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -23,6 +23,7 @@ public class TenantInfoImpl implements TenantInfo { "mall_permission", "mall_sale_type", "mall_user_role", + "wx_brand", "wx_channel", "wx_business", "wx_coupon_type", @@ -67,6 +68,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_mall", "wx_appinfo", "wx_authorizer_info", + "wx_brand", "wx_c_user", "tt_c_user", "wx_user_visit", diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 136963e46..1fba2c551 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -23,6 +23,7 @@ public class TenantInfoImpl implements TenantInfo { "mall_permission", "mall_sale_type", "mall_user_role", + "wx_brand", "wx_channel", "wx_business", "wx_coupon_type", @@ -67,6 +68,7 @@ public class TenantInfoImpl implements TenantInfo { "wx_mall", "wx_appinfo", "wx_authorizer_info", + "wx_brand", "wx_c_user", "tt_c_user", "wx_user_visit", diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index 17fc75e43..043580740 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -101,7 +101,7 @@ public class WxBrandServiceImpl implements WxBrandService { @Override public List> queryBrand(TenantEntity tenantEntity) { WxBrand wxBrand = new WxBrand(); - wxBrand.updateTenantInfo(tenantEntity); + wxBrand.setTenantId(tenantEntity.getFinalTenantId()); return wxBrandMapper.queryBrandByTenant(wxBrand); } @@ -115,7 +115,7 @@ public class WxBrandServiceImpl implements WxBrandService { @Override public Map getAllMap(TenantEntity tenantEntity) { WxBrand brandQ = new WxBrand(); - brandQ.updateTenantInfo(tenantEntity); + brandQ.setTenantId(tenantEntity.getFinalTenantId()); List brandList = wxBrandMapper.findList(brandQ); Map map = new HashMap(); if (null != brandList) { diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 1ad48608f..8ac33d2bc 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -2,6 +2,8 @@ package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; +import com.iformall.annotation.TenantIgnore; +import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -9,6 +11,7 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxBrand; import com.iformall.domain.po.WxMerchant; import com.iformall.enums.EnumDelFlag; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxBrandService; import com.iformall.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; @@ -48,7 +51,7 @@ public class WxBrandController extends BaseController { if (null == wxBrand) { wxBrand = new WxBrand(); } - wxBrand.updateTenantInfo(getTenantInfo()); + wxBrand.setTenantId(getTenantInfo().getFinalTenantId()); wxBrand.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = wxBrandService.listAsPage(wxBrand, pageNum, pageSize); return new ResultData(page); @@ -58,22 +61,26 @@ public class WxBrandController extends BaseController { @SystemControllerLog(description = "品牌-增加") public ResultData add(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::add"); - wxBrand.updateTenantInfo(getTenantInfo()); + wxBrand.setTenantId(getTenantInfo().getFinalTenantId()); return wxBrandService.save(wxBrand); } + @TenantIgnore @PostMapping("update") @SystemControllerLog(description = "品牌-更新") public ResultData update(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::update"); - wxBrand.updateTenantInfo(getTenantInfo()); + + if(wxBrand.getId() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){ //判断是否解绑商户 WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setIsDel(0); +// wxMerchant.updateTenantInfo(wxBrand); + wxMerchant.setIsDel(EnumYesOrNo.NO.getCode()); wxMerchant.setBrand(wxBrand.getId()); - wxMerchant.updateTenantInfo(wxBrand); List merchantList = wxMerchantService.findList(wxMerchant); if(CollectionUtils.isNotEmpty(merchantList)){ @@ -117,9 +124,10 @@ public class WxBrandController extends BaseController { public ResultData hasBrand(String name, Long id) { logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand"); WxBrand wxBrand = new WxBrand(); - wxBrand.updateTenantInfo(getTenantInfo()); - wxBrand.setName(name); wxBrand.setId(id); + wxBrand.setTenantId(getTenantInfo().getFinalTenantId()); + wxBrand.setName(name); + return wxBrandService.hasBrand(wxBrand); } From 752ca540f960e699a819163e39c2a3f1a2e5ad10 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 22 Nov 2022 15:43:26 +0800 Subject: [PATCH 3/3] //coupon brand --- .../com/iformall/service/impl/WxCouponChannelServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 5447e0a3d..8ae1a002b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -203,7 +203,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } //清除缓存 clearCache(record); - return new ResultData(); + return new ResultData(record); } /**