Przeglądaj źródła

/、

release_toaliyun_real
xhxu 4 lat temu
rodzic
commit
5fcf0222bd
2 zmienionych plików z 5 dodań i 9 usunięć
  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 Wyświetl plik

@@ -9,10 +9,7 @@ import com.iformall.domain.po.WxCampaign;
import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxCouponChannelVo; 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.WxCampaignService;
import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponChannelService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -69,7 +66,7 @@ public class WxCampaignController extends BaseController {
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode());
wxCouponChannel.setSubTargetId(wxCampaign.getId()); wxCouponChannel.setSubTargetId(wxCampaign.getId());
wxCouponChannel.setStatus(0);
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setShowBeginTime(new Date()); wxCouponChannel.setShowBeginTime(new Date());
List<WxCouponChannelVo> couponList = wxCouponChannelService.listVo(wxCouponChannel); List<WxCouponChannelVo> couponList = wxCouponChannelService.listVo(wxCouponChannel);
wxCampaign.setCoupons(couponList); wxCampaign.setCoupons(couponList);


+ 3
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java Wyświetl plik

@@ -252,10 +252,9 @@ public class WxTopicServiceImpl implements WxTopicService {
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC);
wxCouponChannel.setShowBeginTime(new Date()); wxCouponChannel.setShowBeginTime(new Date());
wxCouponChannel.setSubTargetId(wxTopic.getId()); 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; return wxTopic;


Ładowanie…
Anuluj
Zapisz