From 9545b3dab0dc304cb49fb1fc3008b66b68414b20 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 22 Jan 2022 11:02:43 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponChannelController.java | 12 ++++++++---- .../com/iformall/service/impl/WxGameServiceImpl.java | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 9b98b5522..0d7d9e4c0 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -89,8 +89,10 @@ public class WxCouponChannelController extends BaseController { logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); if (null == page ) { page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); - filterTimed(wxCouponChannel, page); - RedisCacheUtils.cache(redisTemplate, key, page, 100); + if(page.getList() != null && page.getList().size() > 0){ + filterTimed(wxCouponChannel, page); + RedisCacheUtils.cache(redisTemplate, key, page, 100); + } } return new ResultData(page); } @@ -171,8 +173,10 @@ public class WxCouponChannelController extends BaseController { logger.info("WxCouponChannelController.chache.get:{} page:{}",key,page); if (null == page ) { page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); - filterTimed(wxCouponChannel, page); - RedisCacheUtils.cache(redisTemplate, key, page, 100); + if(page.getList() != null && page.getList().size() > 0){ + filterTimed(wxCouponChannel, page); + RedisCacheUtils.cache(redisTemplate, key, page, 100); + } } if(wxCouponChannel.getMerchantId() != null){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index bb01aadeb..b6251be3f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -233,8 +233,10 @@ public class WxGameServiceImpl implements WxGameService { List voList = wxCouponChannelService.newfindListVo(couponChannelQ); Map wxCouponChannelsMap = new HashMap(); - for(WxCouponChannelVo wxCouponChannelVo: voList) { - wxCouponChannelsMap.put(wxCouponChannelVo.getCouponId(), wxCouponChannelVo); + if(voList != null && voList.size() > 0){ + for(WxCouponChannelVo wxCouponChannelVo: voList) { + wxCouponChannelsMap.put(wxCouponChannelVo.getCouponId(), wxCouponChannelVo); + } } // get game's coupon