diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index c162b4ae6..a8bbb0fef 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -52,7 +52,7 @@ public class WxCouponChannelController extends BaseController { @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; -// @RedisCache + @RedisCache @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -71,11 +71,14 @@ public class WxCouponChannelController extends BaseController { } wxCouponChannel.setShowBeginTime(new Date()); - String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() + wxCouponChannel.getTenantId() + "_" + wxCouponChannel.getBusiness() + "_" + pageNum + ":"; + 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 ) { - if(true){ + if (null == page ) { page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); RedisCacheUtils.cache(redisTemplate, key, page, 100); @@ -108,7 +111,7 @@ public class WxCouponChannelController extends BaseController { // return new ResultData(map); // } -// @RedisCache() + @RedisCache() @ApiOperation("商户活动列表信息") @PostMapping("listByMerchant") @ApiImplicitParams({ @@ -156,8 +159,7 @@ public class WxCouponChannelController extends BaseController { key = EnumCacheKey.MERCHANT_COUPON_PAGE_LIST.getMessage() + key + "_" + pageNum + ":"; PageInfo page = RedisCacheUtils.getCacheObject(redisTemplate, key, PageInfo.class); logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); -// if (null == page ) { - if(true){ + if (null == page ) { page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); RedisCacheUtils.cache(redisTemplate, key, page, 100); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index cfc7d2eed..a5feb1f55 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -33,7 +33,7 @@ public class WxTopicController extends BaseController { @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; -// @RedisCache + @RedisCache @GetMapping("show") public ResultData show(Integer topicType) { logger.debug("[" + getIpAddr() + "] WxTopicController::show"); @@ -47,15 +47,14 @@ public class WxTopicController extends BaseController { String key = EnumCacheKey.TOPIC_ONE.getMessage() + wxTopic.getTenantId() + ":"; WxTopic show = RedisCacheUtils.getCacheObject(redisTemplate, key, WxTopic.class); logger.info("WxCouponChannelController.chache.get:{} show:{}",key,show); -// if (null == show ) { - if(true){ + if (null == show ) { show = wxTopicService.show(wxTopic); RedisCacheUtils.cache(redisTemplate, key, show, 100); } return new ResultData(show); } -// @RedisCache + @RedisCache @GetMapping("showList") public ResultData showList() { logger.debug("[" + getIpAddr() + "] WxTopicController::showList"); @@ -66,8 +65,7 @@ public class WxTopicController extends BaseController { String key = EnumCacheKey.TOPIC_LIST.getMessage() + wxTopic.getTenantId() + ":"; List topicList = RedisCacheUtils.getCacheObject(redisTemplate, key, List.class); logger.info("WxTopicController.chache.get:{} topicList:{}",key,topicList); -// if (null == topicList ) { - if(true){ + if (null == topicList ) { topicList = wxTopicService.showList(wxTopic); RedisCacheUtils.cache(redisTemplate, key, topicList, 100); }