From 08cb536e4002deb3012e1bbf3a4f00a017a6118f Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 10 Mar 2022 18:16:58 +0800 Subject: [PATCH] /disable --- .../service/impl/WxMerchantServiceImpl.java | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index e4522e009..d9e79cec0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -361,6 +361,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { private boolean isCouponMerchantValid(Long couponId,TenantEntity tenantEntity) { List merchantVoList = findMerchantListByProduct(tenantEntity,couponId,false); + if(merchantVoList == null){ + return false; + } if (merchantVoList.stream().anyMatch((cm->cm.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())))){ return true; } @@ -1594,27 +1597,25 @@ public class WxMerchantServiceImpl implements WxMerchantService { List retList = new ArrayList(); for (int i = 0 ; i < couponMerchantList.size() ; i++) { WxCouponMerchant cm = couponMerchantList.get(i); - if (null != cm) { - WxMerchantVo vo = new WxMerchantVo(); - vo.setParameter(cm.getParameter()); - if (null != cm.getMerchantId()) { - WxMerchant m = merchantMap.get(cm.getMerchantId()); - if (null != m) { - vo.setId(m.getId()); - vo.setMerchantImgUrl(m.getImgUrl()); - vo.setMerchantName(m.getName()); - vo.setMerchantLinkPhone(m.getLinkPhone()); - vo.setMerchantStatus(m.getStatus()); - vo.setBusinessId(m.getBusinessId()); - vo.setSubBusinessId(m.getSubBusinessId()); - vo.setLinkLinePhone(m.getLinkLinePhone()); - vo.setMerchantStatus(m.getStatus()); - if (null != merchantShopVoMap) { - vo.setShopVoList(merchantShopVoMap.get(m.getId())); - } - } - } - retList.add(vo); + if (null != cm && null != cm.getMerchantId()) { + WxMerchant m = merchantMap.get(cm.getMerchantId()); + if (null != m) { + WxMerchantVo vo = new WxMerchantVo(); + vo.setParameter(cm.getParameter()); + + vo.setId(m.getId()); + vo.setMerchantImgUrl(m.getImgUrl()); + vo.setMerchantName(m.getName()); + vo.setMerchantLinkPhone(m.getLinkPhone()); + vo.setMerchantStatus(m.getStatus()); + vo.setBusinessId(m.getBusinessId()); + vo.setSubBusinessId(m.getSubBusinessId()); + vo.setLinkLinePhone(m.getLinkLinePhone()); + if (null != merchantShopVoMap) { + vo.setShopVoList(merchantShopVoMap.get(m.getId())); + } + retList.add(vo); + } } } if (retList.size() <=0 ) {