diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 30c46ecb8..bb0eda22a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -317,7 +317,7 @@ public class WxCouponController extends BaseController { CouponCacheUtils.setCouponChannelCache(redisTemplate, couponChannelIdL, couponChannel); } - Map> volist = CouponCacheUtils.getCouponMerchantCache(redisTemplate, couponChannel.getId()); + Map> volist = CouponCacheUtils.getCouponMerchantCache(redisTemplate, couponChannel.getId()); if (null == volist) { volist = couponService.getCouponMerchantList(getTenantInfo(), couponChannel.getCouponId()); if (null != volist && volist.size() > 0 ) { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index eb714c537..f335151ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -232,7 +232,7 @@ public class WxCouponOrderBVo extends WxCouponOrder { @TableField(exist = false) private Date verifyEndDate; - @Excel(name = "类型", width = 50, orderNum = "16", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "券礼包_12", "积分券_50", "积分停车券_51", "消费卡_100"}) + @Excel(name = "类型", width = 50, orderNum = "16", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "券礼包_12", "积分券_50", "积分停车券_51","抖音券_66","抖音平台券_67","抖音品牌券_68", "消费卡_100"}) @TableField(exist = false) private Integer couponType; diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 9cfcbdb4e..9d689beb9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -279,7 +279,7 @@ public interface WxCouponService { Map getCouponMap(List couponIds, TenantEntity tenantEntity); - Map> getCouponMerchantList(TenantEntity tenantInfo, Long couponId); + Map> getCouponMerchantList(TenantEntity tenantInfo, Long couponId); /** * 作废卷 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 2c2a417f8..360d58cfd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1684,7 +1684,7 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public Map> getCouponMerchantList(TenantEntity tenantInfo, Long couponId) { + public Map> getCouponMerchantList(TenantEntity tenantInfo, Long couponId) { WxCoupon wxCoupon = wxCouponMapper.selectById(couponId,tenantInfo.getTenantId()); if (EnumCouponType.isParentCoupon(wxCoupon.getType())){ WxCouponMall couponMall = new WxCouponMall(); @@ -1693,19 +1693,19 @@ public class WxCouponServiceImpl implements WxCouponService { couponMall.setStatus(EnumCouponMallStatus.FINISED.getCode()); List couponMallList = wxCouponMallMapper.findList(couponMall); if (null != couponMallList && couponMallList.size()> 0 ) { - Map> mallMerchantMap = new HashMap>(); + Map> mallMerchantMap = new HashMap>(); for (int i = 0 ; i < couponMallList.size();i++) { WxCouponMall cm = couponMallList.get(i); WxMall mall = wxMallMapper.getByTenantId(cm.getMallTenantId()); - mallMerchantMap.put(mall, getCouponMerchantList(couponId,mall)); + mallMerchantMap.put(mall.getTenantId()+"|"+mall.getName(), getCouponMerchantList(couponId,mall)); } return mallMerchantMap; } return null; }else { - Map> mallMerchantMap = new HashMap>(); + Map> mallMerchantMap = new HashMap>(); WxMall mall = wxMallMapper.getByTenantId(tenantInfo.getTenantId()); - mallMerchantMap.put(mall, getCouponMerchantList(couponId,mall)); + mallMerchantMap.put(mall.getTenantId()+"|"+mall.getName(), getCouponMerchantList(couponId,mall)); return mallMerchantMap; } } diff --git a/mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java b/mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java index d498a3ed7..010d4e76c 100644 --- a/mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java +++ b/mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java @@ -48,18 +48,18 @@ public class CouponCacheUtils { } public static void removeCouponMerchantCache(RedisTemplate template,Long couponId) { - String key = "couponMerchant:"+couponId; + String key = "couponMerchantNew:"+couponId; RedisCacheUtils.removeCache(template, key); } - public static void setCouponMerchantCache(RedisTemplate template,Long couponId,Map> merchantList) { - String key = "couponMerchant:"+couponId; + public static void setCouponMerchantCache(RedisTemplate template,Long couponId,Map> merchantList) { + String key = "couponMerchantNew:"+couponId; RedisCacheUtils.cache(template, key, merchantList, 24*3600); } - public static Map> getCouponMerchantCache(RedisTemplate template,Long couponId) { - String key = "couponMerchant:"+couponId; - return (Map>) RedisCacheUtils.getCacheListObject(template, key,Map.class); + public static Map> getCouponMerchantCache(RedisTemplate template,Long couponId) { + String key = "couponMerchantNew:"+couponId; + return (Map>) RedisCacheUtils.getCacheListObject(template, key,Map.class); } public static void removeDouyinLivePageCache(RedisTemplate template,String tenantId,Integer targetAd,Integer bussiness) {