From 300d87d14d70a4eb305cb7eb839c3964d9bada45 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 15:29:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCouponChannelServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index fde56040c..49dd2bed3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -353,7 +353,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Override public List newfindListVo(WxCouponChannel wxCouponChannel) { handleCouponIds(wxCouponChannel); - if(-999L == wxCouponChannel.getId()){ + if(wxCouponChannel.getId() != null && wxCouponChannel.getId().equals(-999L)){ return new ArrayList<>(); } List list = wxCouponChannelMapper.newfindCList(wxCouponChannel); From 058456e36e5ffb7345a21a96c17f4e69d043b327 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 15:31:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCouponChannelServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 49dd2bed3..4841014b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -387,7 +387,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { logger.info("listPageCVo.chache.get:{}", pageInfo.getList()==null?0:pageInfo.getList().size()); }else{ handleCouponIds(record); - if(-999L == record.getId()){ + if(record.getId() != null && record.getId().equals(-999L)){ return new PageInfo(); } pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.newfindCList(record)); @@ -397,7 +397,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } }else{ handleCouponIds(record); - if(-999L == record.getId()){ + if(record.getId() != null && record.getId().equals(-999L)){ return new PageInfo(); } pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.newfindCList(record)); From 958cee9164370d860a8f46a9156a2cef63d6397b Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 15:38:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponChannelMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 12112db21..fb768e40e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -427,7 +427,7 @@ - select cc.`id`,cc.`tenant_id`,cc.`parent_tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`, cc.`target_ad`,cc.`business`,cc.`sub_business`,cc.`show_begin_time`,cc.`begin_time`,cc.`end_time`,cc.`status`, cc.`create_date`,cc.`update_date`,cc.`sub_target_id`,cc.qr_code From c1ba7521a9b7d91b6dccb52cc8942b871c443133 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 15:40:43 +0800 Subject: [PATCH 4/6] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponChannelMapper.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index fb768e40e..ee1a85d74 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -492,9 +492,6 @@ and cc.`sub_target_id` = #{subTargetId} - - and cm.`merchant_id` = #{merchantId} - and cc.id in From 362b91480314a287814fb98d77d8e610819e3d58 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 15:49:55 +0800 Subject: [PATCH 5/6] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxBusinessMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 2d1d256ee..8d6b36463 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -90,10 +90,10 @@ and cc.`parent_tenant_id` = #{parentTenantId} - + and cc.target_ad = 1 - + and cc.target_ad = 101 ) > 0 From 86eaf6f95b9436d766fb4b5eb60551ecff78bf99 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 16:06:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCampaignController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index 94c301c71..1ec4d519f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -59,8 +59,13 @@ public class WxCampaignController extends BaseController { wxCampaign.updateTenantInfo(getTenantInfo()); wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.setSortColumns(BaseEntity.SortField.SortNum_ASC, BaseEntity.SortField.CreateTime_ASC); - // TODO 缓存优化 - final PageInfo page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize); + + String key = getTenantInfo().getTenantId(); + PageInfo page = RedisCacheUtils.getCacheObject(redisTemplate, "wxCampaignList:"+key, PageInfo.class); + if (null == page ) { + page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize); + RedisCacheUtils.cache(redisTemplate, "wxCampaignList:"+key, page, 100); + } return new ResultData(page); }