From 008d28b1c0943744939f1bd0b9062f15a25146eb Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 27 Jan 2019 17:02:20 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][1000918]:=E4=BF=AE=E5=A4=8D=E5=95=86?= =?UTF-8?q?=E6=88=B7=E5=81=9C=E7=94=A8=E5=90=8E=E8=BF=98=E8=83=BD=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=A4=8D=E5=88=B6=E6=8A=95=E6=94=BE=E5=88=B8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxCouponServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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; }