From ec345b6a552512e3908db34bb59115df498feb20 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 21 Jan 2022 18:01:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?/=E3=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/mapper/WxCUserTagsMapper.java | 2 -- .../src/main/resources/mapper/WxCUserTagsMapper.xml | 3 +-- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 6 ------ .../src/main/resources/mapper/WxCouponMerchantMapper.xml | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java index f9af4a229..4549ae26f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserTagsMapper.java @@ -1,8 +1,6 @@ package com.iformall.mapper; -import java.util.Date; import java.util.List; -import java.util.Map; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCUserTags; diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index b4b958309..bc5dd8440 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -95,10 +95,9 @@ from wx_c_user_tags where tenant_id = #{tenantId} - and JSON_CONTAINS(cut.tags,#{tagIds}) + and JSON_CONTAINS(tags,#{tagIds}) - diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 6e3156c3c..0aabc6faf 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -702,13 +702,7 @@ - - - diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index 910ec2175..f8026d351 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -84,7 +84,7 @@ - select distinct cm.merchant_id from wx_coupon_merchant cm where cm.status = 0 From 9545b3dab0dc304cb49fb1fc3008b66b68414b20 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 22 Jan 2022 11:02:43 +0800 Subject: [PATCH 2/2] =?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