From ab055b9e90c2ce791822ca3aa8b331d7dc2b6d41 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 15:14:25 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCampaignController.java | 2 +- .../market/WxCouponChannelController.java | 18 +- .../controller/mem/MemCouponController.java | 2 +- .../controller/WxCouponChannelController.java | 18 +- .../controller/WxCouponChannelController.java | 16 +- .../iformall/domain/po/WxCouponChannel.java | 2 +- .../iformall/domain/vo/WxCouponChannelVo.java | 37 ++++ .../mapper/WxCouponChannelMapper.java | 4 +- .../service/WxCouponChannelService.java | 10 +- .../impl/WxCouponChannelServiceImpl.java | 209 +++++++++++------- .../service/impl/WxTopicServiceImpl.java | 2 +- 11 files changed, 187 insertions(+), 133 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 31c9cac3e..47aa916d2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -169,7 +169,7 @@ public class WxCampaignController extends BaseController { wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setSubTargetId(wxCampaign.getId()); wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - List voList = wxCouponChannelService.listVo(wxCouponChannel); + List voList = wxCouponChannelService.newfindListVo(wxCouponChannel); wxCampaign.setCoupons(voList); } return new ResultData(Result.SUCCESS, "查询成功", wxCampaign); 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 abc74ddc2..0421ef77e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -10,17 +10,13 @@ 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.EnumAppPlat; import com.iformall.enums.EnumCouponSourceType; -import com.iformall.enums.EnumPayWay; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.vo.WxCouponChannelVo; 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 com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -33,27 +29,17 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; -import java.util.Map; @RestController @RequestMapping("wxCouponChannel") @Api(description = "优惠券投放接口") public class WxCouponChannelController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponChannelService wxCouponChannelService; - @Autowired - private WxAppinfoController wxAppinfoController; - @Autowired - private WxCouponChannelMapper wxCouponChannelMapper; - @Autowired - private QrCodeService qrCodeService; - @Autowired - private WxFlowService wxFlowService; - @Autowired - private WxCouponService wxCouponService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -78,7 +64,7 @@ public class WxCouponChannelController extends BaseController { }else{ wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); } - final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); + final PageInfo page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java index 61e84e8a5..ae2c77885 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java @@ -63,7 +63,7 @@ public class MemCouponController extends BaseController { }else{ wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); } - final PageInfo page = couponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); + final PageInfo page = couponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 45218448f..df4c1af82 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -8,14 +8,7 @@ import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponChannelVo; -import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumPayWay; -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 com.iformall.utils.Constant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -28,7 +21,6 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; -import java.util.Map; @RestController @@ -39,14 +31,6 @@ public class WxCouponChannelController extends BaseController { @Autowired private WxCouponChannelService wxCouponChannelService; - @Autowired - private WxCouponChannelMapper wxCouponChannelMapper; - @Autowired - private QrCodeService qrCodeService; - @Autowired - private WxFlowService wxFlowService; - @Autowired - private WxCouponService wxCouponService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -67,7 +51,7 @@ public class WxCouponChannelController extends BaseController { }else{ wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); } - final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); + final PageInfo page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index a9fda007f..81d6317b5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -68,7 +68,7 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); } wxCouponChannel.setShowBeginTime(new Date()); - PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); + PageInfo page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); return new ResultData(page); } @@ -113,7 +113,7 @@ public class WxCouponChannelController extends BaseController { } String merchantIdStr = (String) params.get("merchantId"); - List merchantIds = (List) params.get("merchantIds"); + List merchantIds = (List) params.get("merchantIds"); Long merchantId = null; if(StringUtils.isNotBlank(merchantIdStr)){ merchantId = Long.parseLong(merchantIdStr); @@ -122,17 +122,15 @@ public class WxCouponChannelController extends BaseController { WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setMerchantId(merchantId); wxCouponChannel.setMerchantIds(merchantIds); - wxCouponChannel.setStatus(0); wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC, BaseEntity.SortField.Id_DESC); + wxCouponChannel.setShowBeginTime(new Date()); Map map = new HashedMap(); - wxCouponChannel.setShowBeginTime(new Date()); - - - //TODO待优化数据,先用缓存处理 + + String key = wxCouponChannel.getTenantId(); if (null != merchantId) { key = String.valueOf(merchantId); @@ -141,9 +139,9 @@ public class WxCouponChannelController extends BaseController { } PageInfo page = RedisCacheUtils.getCacheObject(redisTemplate, "merchantCouponList:"+key, PageInfo.class); if (null == page ) { - page = wxCouponChannelService.listByMerchant(wxCouponChannel,pageNum,pageSize); + page = wxCouponChannelService.newListPageVo(wxCouponChannel,pageNum,pageSize); filterTimed(wxCouponChannel, page); - RedisCacheUtils.cache(redisTemplate, "merchantCouponList:"+key, page, 3600); + RedisCacheUtils.cache(redisTemplate, "merchantCouponList:"+key, page, 100); } if(wxCouponChannel.getMerchantId() != null){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index ffead03e6..bebed23fd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -92,7 +92,7 @@ public class WxCouponChannel extends TenantEntity { private Long merchantId; @TableField(exist = false) - private List merchantIds; + private List merchantIds; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "用户积分", name = "userCredit") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java index f57b0c384..8f71a3406 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java @@ -3,6 +3,7 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.common.SortColumn; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import lombok.Data; import lombok.EqualsAndHashCode; @@ -166,4 +167,40 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable { public void setTitle(String title) { this.title = title; } + + /** + * 可能字段不全, 使用时先确认 + * @param c + */ + public void setWxCoupon(WxCoupon c){ + if(c != null){ + this.setRemainInventory(c.getRemainInventory()); + this.setInventory(c.getInventory()); + this.setCoverImg(c.getCoverImg()); + this.setSubTitle(c.getSubTitle()); + this.setSalePrice(c.getSalePrice()); + this.setUsePrice(c.getUsePrice()); + this.setPrice(c.getPrice()); + this.setTailPrice(c.getTailPrice()); + this.setOrigPrice(c.getOrigPrice()); + this.setUnit(c.getUnit()); + this.setUseLimitRule(c.getUseLimitRule()); + this.setUseLimitQuantity(c.getUseLimitQuantity()); + this.setSendType(c.getSendType()); + this.setSupportTransfer(c.getSupportTransfer()); + this.setPressLimitNum(c.getPressLimitNum()); + this.setAutoRefund(c.getAutoRefund()); + this.setConditions(c.getConditions()); + this.setValidType(c.getValidType()); + this.setValidStartDate(c.getValidStartDate()); + this.setValidEndDate(c.getValidEndDate()); + this.setPickStartDate(c.getPickStartDate()); + this.setPickEndDate(c.getPickEndDate()); + this.setValidDays(c.getValidDays()); + this.setCreditPrice(c.getCreditPrice()); + this.setContentType(c.getContentType()); + this.setSourceType(c.getSourceType()); + } + + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java index 4d0491627..fd906f48c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java @@ -19,9 +19,9 @@ public interface WxCouponChannelMapper extends CommonMapper findVoList(WxCouponChannel wxCouponChannel); +// List findVoList(WxCouponChannel wxCouponChannel); - List findVoListByMerchant(WxCouponChannel wxCouponChannel); +// List findVoListByMerchant(WxCouponChannel wxCouponChannel); WxCouponCVo findVoDetail(@Param("id")Long id,@Param("tenantId")String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index 025f6b92b..52e1c3a0d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -2,12 +2,10 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponChannelVo; -import com.iformall.enums.EnumPayWay; import java.util.Date; import java.util.List; @@ -32,7 +30,7 @@ public interface WxCouponChannelService { * @param pageSize * @return */ - PageInfo listPageCVo(WxCouponChannel record, Integer pageIndex, Integer pageSize); +// PageInfo listPageCVo(WxCouponChannel record, Integer pageIndex, Integer pageSize); /** @@ -42,7 +40,7 @@ public interface WxCouponChannelService { * @param pageSize * @return */ - PageInfo listByMerchant(WxCouponChannel record, Integer pageIndex, Integer pageSize); +// PageInfo listByMerchant(WxCouponChannel record, Integer pageIndex, Integer pageSize); WxCouponCVo findDetailVo(Long id,String tenantId); @@ -54,7 +52,7 @@ public interface WxCouponChannelService { * @param record * @return */ - List listVo(WxCouponChannel record); +// List listVo(WxCouponChannel record); /** * 根据Id获得实体 @@ -85,4 +83,6 @@ public interface WxCouponChannelService { int countCoupon(WxCouponChannel wxCouponChannel, List tenantEntitys); List newfindListVo(WxCouponChannel wxCouponChannel); + + PageInfo newListPageVo(WxCouponChannel record, Integer pageIndex, Integer pageSize); } 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 b8b4dfe48..fde56040c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -289,17 +289,12 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return count; } - @Override - public List newfindListVo(WxCouponChannel wxCouponChannel) { - List list = new ArrayList<>(); - - List mcids = new ArrayList<>(); - if(wxCouponChannel.getMerchantId() != null){ - mcids = wxCouponMerchantMapper.findOneMerchantProductIds(wxCouponChannel.getTenantId(), wxCouponChannel.getMerchantId()); - if(mcids == null || mcids.isEmpty()){ - return list; - } - } + /** + * 处理券相关查询参数,得到卷id list + * @param wxCouponChannel + * @return + */ + private List handleCouponParam(WxCouponChannel wxCouponChannel){ WxCoupon couponQ = new WxCoupon(); couponQ.setStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); if(wxCouponChannel.getSupportTransfer() != null){ @@ -312,52 +307,106 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { couponQ.setSourceType(wxCouponChannel.getSourceType()); } List cids = wxCouponMapper.findIdList(couponQ); + return cids; + } + + private void handleCouponIds(WxCouponChannel wxCouponChannel){ + List cids =handleCouponParam(wxCouponChannel); if(cids == null || cids.isEmpty()){ - return list; + wxCouponChannel.setId(-999L); + return; + } + if(wxCouponChannel.getMerchantId() != null){ + List mcids = wxCouponMerchantMapper.findOneMerchantProductIds(wxCouponChannel.getTenantId(), wxCouponChannel.getMerchantId()); + if(mcids == null || mcids.isEmpty()){ + wxCouponChannel.setId(-999L); + return; + } + cids.retainAll(mcids); + }else if(wxCouponChannel.getMerchantIds() != null && !wxCouponChannel.getMerchantIds().isEmpty()){ + List mcids = wxCouponMerchantMapper.findMerchantProductIds(wxCouponChannel.getTenantId(), wxCouponChannel.getMerchantIds()); + if(mcids == null || mcids.isEmpty()){ + wxCouponChannel.setId(-999L); + return; + } + cids.retainAll(mcids); } - cids.retainAll(mcids); if(cids.isEmpty()){ - return list; + wxCouponChannel.setId(-999L); + return; } wxCouponChannel.setCouponIds(cids); + } - list = wxCouponChannelMapper.newfindCList(wxCouponChannel); + private void handleWxCouponChannelVo(List list, TenantEntity tenantEntity){ + if(list == null || list.isEmpty()){ + return; + } List couponIds = list.stream().map(cc -> cc.getCouponId()).collect(Collectors.toList()); - Map couponMap = wxCouponService.getCouponMap(couponIds,wxCouponChannel); + Map couponMap = wxCouponService.getCouponMap(couponIds,tenantEntity); for (WxCouponChannelVo cc:list) { - WxCoupon c = couponMap.get(cc.getCouponId()); - if(c != null){ - cc.setRemainInventory(c.getRemainInventory()); - cc.setInventory(c.getInventory()); - cc.setCoverImg(c.getCoverImg()); - cc.setSubTitle(c.getSubTitle()); - cc.setSalePrice(c.getSalePrice()); - cc.setUsePrice(c.getUsePrice()); - cc.setPrice(c.getPrice()); - cc.setTailPrice(c.getTailPrice()); - cc.setOrigPrice(c.getOrigPrice()); - cc.setUnit(c.getUnit()); - cc.setUseLimitRule(c.getUseLimitRule()); - cc.setUseLimitQuantity(c.getUseLimitQuantity()); - cc.setSendType(c.getSendType()); - cc.setSupportTransfer(c.getSupportTransfer()); - cc.setPressLimitNum(c.getPressLimitNum()); - cc.setAutoRefund(c.getAutoRefund()); - cc.setConditions(c.getConditions()); - cc.setValidType(c.getValidType()); - cc.setValidStartDate(c.getValidStartDate()); - cc.setValidEndDate(c.getValidEndDate()); - cc.setPickStartDate(c.getPickStartDate()); - cc.setPickEndDate(c.getPickEndDate()); - cc.setValidDays(c.getValidDays()); - cc.setCreditPrice(c.getCreditPrice()); - cc.setContentType(c.getContentType()); - cc.setSourceType(c.getSourceType()); - } + cc.setWxCoupon(couponMap.get(cc.getCouponId())); } + } + + + @Override + public List newfindListVo(WxCouponChannel wxCouponChannel) { + handleCouponIds(wxCouponChannel); + if(-999L == wxCouponChannel.getId()){ + return new ArrayList<>(); + } + List list = wxCouponChannelMapper.newfindCList(wxCouponChannel); + handleWxCouponChannelVo(list,wxCouponChannel); return list; } + /** + * C端api使用,关联查找的券时已生效 + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + @Override + public PageInfo newListPageVo(WxCouponChannel record, Integer pageIndex, Integer pageSize) { + PageInfo pageInfo; + //仅c端首页走缓存 + if((EnumCouponChannelType.COUPON_CHANNEL_ID_LIST.getCode().equals(record.getTargetAd()) + || EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN_LIST.getCode().equals(record.getTargetAd())) + && new Integer(6).equals(pageSize) + && pageIndex.intValue() <=5 + && record.getBusiness() == null) { + + logger.info("listPageCVo.chache"); + String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() +record.getTenantId()+"_" + pageIndex + ":"; + ValueOperations> operations = cdRedisTemplate.opsForValue(); + boolean hasKey = cdRedisTemplate.hasKey(key); + if (hasKey) { + pageInfo = operations.get(key); + logger.info("listPageCVo.chache.get:{}", pageInfo.getList()==null?0:pageInfo.getList().size()); + }else{ + handleCouponIds(record); + if(-999L == record.getId()){ + return new PageInfo(); + } + pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.newfindCList(record)); + handleWxCouponChannelVo(pageInfo.getList(),record); + //插入缓存 + operations.set(key, pageInfo, 100, TimeUnit.SECONDS); + } + }else{ + handleCouponIds(record); + if(-999L == record.getId()){ + return new PageInfo(); + } + pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.newfindCList(record)); + handleWxCouponChannelVo(pageInfo.getList(),record); + } + + return pageInfo; + } + private boolean isCouponMerchantValid(Long couponId,String tenantId) { List merchantVoList = wxCouponMerchantMapper.findMerchantNameList(couponId,tenantId); if (merchantVoList.stream().anyMatch((cm->cm.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())))){ @@ -465,33 +514,33 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { * @param pageSize * @return */ - @Override - public PageInfo listPageCVo(WxCouponChannel record, Integer pageIndex, Integer pageSize) { - PageInfo pageInfo; - //仅c端首页走缓存 - if((EnumCouponChannelType.COUPON_CHANNEL_ID_LIST.getCode().equals(record.getTargetAd()) - || EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN_LIST.getCode().equals(record.getTargetAd())) - && new Integer(6).equals(pageSize) - && pageIndex.intValue() <=5 - && record.getBusiness() == null) { - - logger.info("listPageCVo.chache"); - String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() +record.getTenantId()+"_" + pageIndex + ":"; - ValueOperations> operations = cdRedisTemplate.opsForValue(); - boolean hasKey = cdRedisTemplate.hasKey(key); - if (hasKey) { - pageInfo = operations.get(key); - logger.info("listPageCVo.chache.get:{}", pageInfo.getList()==null?0:pageInfo.getList().size()); - }else{ - pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoList(record)); - //插入缓存 - operations.set(key, pageInfo, 600, TimeUnit.SECONDS); - } - return pageInfo; - } - - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoList(record)); - } +// @Override +// public PageInfo listPageCVo(WxCouponChannel record, Integer pageIndex, Integer pageSize) { +// PageInfo pageInfo; +// //仅c端首页走缓存 +// if((EnumCouponChannelType.COUPON_CHANNEL_ID_LIST.getCode().equals(record.getTargetAd()) +// || EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN_LIST.getCode().equals(record.getTargetAd())) +// && new Integer(6).equals(pageSize) +// && pageIndex.intValue() <=5 +// && record.getBusiness() == null) { +// +// logger.info("listPageCVo.chache"); +// String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() +record.getTenantId()+"_" + pageIndex + ":"; +// ValueOperations> operations = cdRedisTemplate.opsForValue(); +// boolean hasKey = cdRedisTemplate.hasKey(key); +// if (hasKey) { +// pageInfo = operations.get(key); +// logger.info("listPageCVo.chache.get:{}", pageInfo.getList()==null?0:pageInfo.getList().size()); +// }else{ +// pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoList(record)); +// //插入缓存 +// operations.set(key, pageInfo, 600, TimeUnit.SECONDS); +// } +// return pageInfo; +// } +// +// return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoList(record)); +// } @Override public WxCouponCVo findDetailVo(Long id,String tenantId) { @@ -503,15 +552,15 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return wxCouponChannelMapper.findVoStatusDetail(id,tenantId); } - @Override - public List listVo(WxCouponChannel record) { - return wxCouponChannelMapper.findVoList(record); - } +// @Override +// public List listVo(WxCouponChannel record) { +// return wxCouponChannelMapper.findVoList(record); +// } - @Override - public PageInfo listByMerchant(WxCouponChannel record, Integer pageNum, Integer pageSize) { - return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoListByMerchant(record)); - } +// @Override +// public PageInfo listByMerchant(WxCouponChannel record, Integer pageNum, Integer pageSize) { +// return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoListByMerchant(record)); +// } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 2d3772ad7..dede4bbb3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -204,7 +204,7 @@ public class WxTopicServiceImpl implements WxTopicService { } - PageInfo wxCouponChannelVoPageInfo = wxCouponChannelService.listPageCVo(wxCouponChannel, 1, pageSize); + PageInfo wxCouponChannelVoPageInfo = wxCouponChannelService.newListPageVo(wxCouponChannel, 1, pageSize); if(wxCouponChannelVoPageInfo != null && wxCouponChannelVoPageInfo.getList() != null && wxCouponChannelVoPageInfo.getList().size() > 0){ record.setCouponList(wxCouponChannelVoPageInfo.getList());