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); } 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..4841014b9 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); @@ -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)); 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 diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 12112db21..ee1a85d74 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 @@ -492,9 +492,6 @@ and cc.`sub_target_id` = #{subTargetId} - - and cm.`merchant_id` = #{merchantId} - and cc.id in