diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 0a9bd8312..b9d3eb09f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; import java.util.*; +import java.util.stream.Collectors; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; @@ -10,6 +11,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponMerchant; import com.iformall.domain.vo.WxCouponCVo; +import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxCouponMerchantMapper; @@ -71,7 +73,15 @@ public class WxCouponServiceImpl implements WxCouponService { @Override public WxCouponCVo getVoById(Long id) { - return wxCouponMapper.findVoDetail(id); + WxCouponCVo wxCouponCVo = wxCouponMapper.findVoDetail(id); + List merchantList = wxCouponCVo.getMerchantVoList(); + if (merchantList != null) { + merchantList = merchantList.stream().filter( + m->m.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())) + .collect(Collectors.toList()); + } + wxCouponCVo.setMerchantVoList(merchantList); + return wxCouponCVo; }