diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index b1bcaec9e..6ffc811bc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -153,6 +153,7 @@ public class WxCouponChannelController extends BaseController { } } CouponCacheUtils.removeDouyinLivePageCache(redisTemplate, this.getTenantInfo().getTenantId(), null, null); + wxCouponService.clearCIndexCache(getTenantInfo()); return resultData; } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 6e9623d56..dbf900933 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -206,6 +206,33 @@ public class WxCouponController extends BaseController { return resultData; } + @TenantIgnore + @ApiOperation("新增接口") + @PostMapping("updateHtml") + public ResultData updateHtml(@RequestBody WxCoupon wxCoupon) { + logger.debug("[" + getIpAddr() + "] WxCouponController::updateHtml"); + TenantEntity tenantEntity = getTenantInfo(); + wxCoupon.updateTenantInfo(tenantEntity); + + if(null == wxCoupon.getContentType() || null == EnumCouponContentType.getEnum(wxCoupon.getContentType())){ + return new ResultData(Result.ERROR,"contentType参数错误"); + } + + if(null == wxCoupon.getId()){ + return new ResultData(Result.ERROR,"id参数错误"); + } + + WxCoupon coupon = wxCouponService.findById(wxCoupon); + if(null == coupon){ + return new ResultData(Result.ERROR,"id参数错误"); + } + wxCouponService.update(wxCoupon); + CouponCacheUtils.removeCouponCache(redisTemplate, wxCoupon.getId()); + CouponCacheUtils.removeCouponMerchantCache(redisTemplate, wxCoupon.getId(),null); + CouponCacheUtils.removeOnlyCouponCache(redisTemplate, wxCoupon.getId()); + return new ResultData(); + } + @TenantIgnore @ApiOperation("根据id更新接口") @PostMapping("update") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 669e40319..d87ca35f4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -48,7 +48,7 @@ public class WxCouponChannelController extends BaseController { @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; - @RedisCache + //@RedisCache @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -69,29 +69,45 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); wxCouponChannel.setShowBeginTime(new Date()); - if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode().equals(wxCouponChannel.getTargetAd()) - || EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.getCode().equals(wxCouponChannel.getTargetAd())){ - PageInfo page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); - if(page.getList() != null && page.getList().size() > 0){ - filterTimed(wxCouponChannel, page); - } - return new ResultData(page); - } - String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() - + wxCouponChannel.getTenantId() + "_" - + wxCouponChannel.getTargetAd() + "_" - + wxCouponChannel.getBusiness() + "_" - + pageNum + ":"+ pageNum + ":"; - PageInfo page = RedisCacheUtils.getCacheObject(redisTemplate, key, PageInfo.class); - logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); - if (null == page ) { - page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); - if(page.getList() != null && page.getList().size() > 0){ - filterTimed(wxCouponChannel, page); - RedisCacheUtils.cache(redisTemplate, key, page, 100); - } - } + + wxCouponChannel.getTenantId() + "_" + + wxCouponChannel.getTargetAd() + "_" + + wxCouponChannel.getBusiness() + "_" + + pageNum + ":"+ pageNum + ":"; + PageInfo page = RedisCacheUtils.getCacheObject(redisTemplate, key, PageInfo.class); + logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); + if (null == page ) { + page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); + if(page.getList() != null && page.getList().size() > 0){ + filterTimed(wxCouponChannel, page); + RedisCacheUtils.cache(redisTemplate, key, page, 600); + } + } +// if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode().equals(wxCouponChannel.getTargetAd()) +// || EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.getCode().equals(wxCouponChannel.getTargetAd())){ +// +// +// PageInfo page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); +// if(page.getList() != null && page.getList().size() > 0){ +// filterTimed(wxCouponChannel, page); +// } +// return new ResultData(page); +// } +// +// String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() +// + wxCouponChannel.getTenantId() + "_" +// + wxCouponChannel.getTargetAd() + "_" +// + wxCouponChannel.getBusiness() + "_" +// + pageNum + ":"+ pageNum + ":"; +// PageInfo page = RedisCacheUtils.getCacheObject(redisTemplate, key, PageInfo.class); +// logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); +// if (null == page ) { +// page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); +// if(page.getList() != null && page.getList().size() > 0){ +// filterTimed(wxCouponChannel, page); +// RedisCacheUtils.cache(redisTemplate, key, page, 100); +// } +// } return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index ae945ef7f..d59257ace 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -319,4 +319,6 @@ public interface WxCouponService { WxCouponCVo getDraftCoupon(Long couponId, String tenantId, TenantEntity mallTenantEntity); Map findCouponDetail(TenantEntity tenantInfo, Long id); + + public void clearCIndexCache(TenantEntity tenantEntity); } 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 275a486f5..730694164 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -763,7 +763,7 @@ public class WxCouponServiceImpl implements WxCouponService { } //清空缓存 - clearCache(record); + clearCIndexCache(record); return new ResultData(record.getId()); } @@ -1141,7 +1141,7 @@ public class WxCouponServiceImpl implements WxCouponService { coupon.setUpdateDate(new Date()); wxCouponMapper.updateById(coupon); //清空缓存 - clearCache(record); + clearCIndexCache(record); return new ResultData(record.getId()); } @@ -1150,7 +1150,8 @@ public class WxCouponServiceImpl implements WxCouponService { * 清除c端首页券列表缓存 * @param tenantEntity */ - public void clearCache(TenantEntity tenantEntity){ + @Override + public void clearCIndexCache(TenantEntity tenantEntity){ for (int i = 1; i <=5 ; i++) { String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() +tenantEntity.getTenantId()+"_" + i + ":"; cdRedisTemplate.delete(key);