diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 22d6531dd..83375226b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -83,16 +83,18 @@ public class WxCouponController extends BaseController { wxCoupon.setSortColumns(coryColumn); wxCoupon.setSortColumn(null); } - if(wxCoupon.getTargetAd() != null && wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode()){ - Integer[] typeArray = { - EnumCouponType.COUPON_MANJIAN.getCode(), - EnumCouponType.COUPON_DAIJIN.getCode(), - EnumCouponType.COUPON_LIPIN.getCode(), - EnumCouponType.COUPON_TINGCHE.getCode(), - EnumCouponType.COUPON_MULTIMCH.getCode()}; - - wxCoupon.setTypes(Arrays.asList(typeArray)); - + if(wxCoupon.getTargetAd() != null ){ + if(wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode() + || wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()){ + Integer[] typeArray = { + EnumCouponType.COUPON_MANJIAN.getCode(), + EnumCouponType.COUPON_DAIJIN.getCode(), + EnumCouponType.COUPON_LIPIN.getCode(), + EnumCouponType.COUPON_TINGCHE.getCode(), + EnumCouponType.COUPON_MULTIMCH.getCode()}; + + wxCoupon.setTypes(Arrays.asList(typeArray)); + } } if(!(isList == null?false:isList) && wxCoupon.getSendType() == null){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index e49a8b45a..1b1252993 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -90,9 +90,9 @@ public class WxTopic extends TenantEntity { if(EnumWxTopicType.FLASH_SALE.getCode().equals(topicType)) return Constant.mainPageUrl + "?type=rb"; if(EnumWxTopicType.PRESS.getCode().equals(topicType)) - return Constant.mainPageUrl + "?type=mb"; + return Constant.mainPageUrl + "?type=bl"; if(EnumWxTopicType.GROUP.getCode().equals(topicType)) - return Constant.mainPageUrl + "?type=ms"; + return Constant.mainPageUrl + "?type=sl"; if(EnumWxTopicType.CARD_MULTIMCH.getCode().equals(topicType)) return Constant.mainPageUrl + "?type=dc"; if(EnumWxTopicType.CREDIT.getCode().equals(topicType)) 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 52e67dedb..35230ef13 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -393,7 +393,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { }else{ pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoList(record)); //插入缓存 - operations.set(key, pageInfo, 50, TimeUnit.SECONDS); + operations.set(key, pageInfo, 60, TimeUnit.SECONDS); } return pageInfo; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index c26ad46e8..4290842d5 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -212,11 +212,11 @@ - - + -->