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 0421ef77e..83c680ed7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -5,18 +5,13 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.controller.app.WxAppinfoController; import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.EnumCouponSourceType; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.mapper.WxCouponChannelMapper; -import com.iformall.service.QrCodeService; import com.iformall.service.WxCouponChannelService; -import com.iformall.service.WxCouponService; -import com.iformall.service.WxFlowService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 57627923e..155182248 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -71,8 +71,9 @@ public class WxCouponChannelController extends BaseController { } wxCouponChannel.setShowBeginTime(new Date()); - String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() + wxCouponChannel.getTenantId() + "_" + pageNum + ":"; + String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() + wxCouponChannel.getTenantId() + "_" + wxCouponChannel.getBusiness() + "_" + 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); filterTimed(wxCouponChannel, page); @@ -106,7 +107,7 @@ public class WxCouponChannelController extends BaseController { // return new ResultData(map); // } - @RedisCache(expireTime = 100) + @RedisCache() @ApiOperation("商户活动列表信息") @PostMapping("listByMerchant") @ApiImplicitParams({ @@ -153,6 +154,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 ) { page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index a9afd0b88..a5feb1f55 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -46,6 +46,7 @@ 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 ) { show = wxTopicService.show(wxTopic); RedisCacheUtils.cache(redisTemplate, key, show, 100); @@ -63,6 +64,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 ) { topicList = wxTopicService.showList(wxTopic); RedisCacheUtils.cache(redisTemplate, key, topicList, 100); 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 c3fc9e6db..b3518d137 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -26,8 +26,6 @@ import com.iformall.service.excel.WxCardDataExporter; import com.iformall.service.excel.WxCouponDataExporter; import com.iformall.service.excel.WxPressDataExporter; -import cn.afterturn.easypoi.handler.inter.IExcelExportServer; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger;