diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index 644ed66d2..e98afaf73 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -9,10 +9,7 @@ import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponChannelVo; -import com.iformall.enums.EnumCampaignStatus; -import com.iformall.enums.EnumCouponChannelType; -import com.iformall.enums.EnumPayWay; -import com.iformall.enums.EnumProjectPlat; +import com.iformall.enums.*; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponChannelService; import io.swagger.annotations.Api; @@ -69,7 +66,7 @@ public class WxCampaignController extends BaseController { wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setSubTargetId(wxCampaign.getId()); - wxCouponChannel.setStatus(0); + wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setShowBeginTime(new Date()); List couponList = wxCouponChannelService.listVo(wxCouponChannel); wxCampaign.setCoupons(couponList); 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 d28f3bcd9..37ba40770 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -252,10 +252,9 @@ public class WxTopicServiceImpl implements WxTopicService { wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); wxCouponChannel.setShowBeginTime(new Date()); wxCouponChannel.setSubTargetId(wxTopic.getId()); - PageInfo wxCouponChannelVoPageInfo = wxCouponChannelService.listPageCVo(wxCouponChannel, 1, 100); - if(wxCouponChannelVoPageInfo != null && wxCouponChannelVoPageInfo.getList() != null - && wxCouponChannelVoPageInfo.getList().size() > 0){ - wxTopic.setCouponList(wxCouponChannelVoPageInfo.getList()); + List wxCouponChannelVos = wxCouponChannelService.listVo(wxCouponChannel); + if(wxCouponChannelVos != null && wxCouponChannelVos.size() > 0){ + wxTopic.setCouponList(wxCouponChannelVos); } } return wxTopic;