| @@ -83,16 +83,18 @@ public class WxCouponController extends BaseController { | |||||
| wxCoupon.setSortColumns(coryColumn); | wxCoupon.setSortColumns(coryColumn); | ||||
| wxCoupon.setSortColumn(null); | 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){ | if(!(isList == null?false:isList) && wxCoupon.getSendType() == null){ | ||||
| @@ -90,9 +90,9 @@ public class WxTopic extends TenantEntity { | |||||
| if(EnumWxTopicType.FLASH_SALE.getCode().equals(topicType)) | if(EnumWxTopicType.FLASH_SALE.getCode().equals(topicType)) | ||||
| return Constant.mainPageUrl + "?type=rb"; | return Constant.mainPageUrl + "?type=rb"; | ||||
| if(EnumWxTopicType.PRESS.getCode().equals(topicType)) | if(EnumWxTopicType.PRESS.getCode().equals(topicType)) | ||||
| return Constant.mainPageUrl + "?type=mb"; | |||||
| return Constant.mainPageUrl + "?type=bl"; | |||||
| if(EnumWxTopicType.GROUP.getCode().equals(topicType)) | if(EnumWxTopicType.GROUP.getCode().equals(topicType)) | ||||
| return Constant.mainPageUrl + "?type=ms"; | |||||
| return Constant.mainPageUrl + "?type=sl"; | |||||
| if(EnumWxTopicType.CARD_MULTIMCH.getCode().equals(topicType)) | if(EnumWxTopicType.CARD_MULTIMCH.getCode().equals(topicType)) | ||||
| return Constant.mainPageUrl + "?type=dc"; | return Constant.mainPageUrl + "?type=dc"; | ||||
| if(EnumWxTopicType.CREDIT.getCode().equals(topicType)) | if(EnumWxTopicType.CREDIT.getCode().equals(topicType)) | ||||
| @@ -393,7 +393,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { | |||||
| }else{ | }else{ | ||||
| pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponChannelMapper.findVoList(record)); | 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; | return pageInfo; | ||||
| } | } | ||||
| @@ -212,11 +212,11 @@ | |||||
| <result column="source_type" jdbcType="INTEGER" property="sourceType"/> | <result column="source_type" jdbcType="INTEGER" property="sourceType"/> | ||||
| <collection column="{productId=coupon_id,tenantId=tenant_id}" property="merchantVoList" | |||||
| <!--<collection column="{productId=coupon_id,tenantId=tenant_id}" property="merchantVoList" | |||||
| ofType="com.iformall.domain.vo.WxMerchantVo" | ofType="com.iformall.domain.vo.WxMerchantVo" | ||||
| javaType="java.util.List" | javaType="java.util.List" | ||||
| select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantNameList" > | select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantNameList" > | ||||
| </collection> | |||||
| </collection>--> | |||||
| </resultMap> | </resultMap> | ||||