xhxu 4 лет назад
Родитель
Сommit
5fcf0222bd
2 измененных файлов: 5 добавлений и 9 удалений
  1. +2
    -5
      mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java
  2. +3
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java

+ 2
- 5
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<WxCouponChannelVo> couponList = wxCouponChannelService.listVo(wxCouponChannel);
wxCampaign.setCoupons(couponList);


+ 3
- 4
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<WxCouponChannelVo> wxCouponChannelVoPageInfo = wxCouponChannelService.listPageCVo(wxCouponChannel, 1, 100);
if(wxCouponChannelVoPageInfo != null && wxCouponChannelVoPageInfo.getList() != null
&& wxCouponChannelVoPageInfo.getList().size() > 0){
wxTopic.setCouponList(wxCouponChannelVoPageInfo.getList());
List<WxCouponChannelVo> wxCouponChannelVos = wxCouponChannelService.listVo(wxCouponChannel);
if(wxCouponChannelVos != null && wxCouponChannelVos.size() > 0){
wxTopic.setCouponList(wxCouponChannelVos);
}
}
return wxTopic;


Загрузка…
Отмена
Сохранить