From 87cdefb075b52707f72ad5c4e531d6b2242d23bb Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 13 Jan 2022 01:22:47 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81send?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCouponServiceImpl.java | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) 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 31c715cc1..c068dd860 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -966,31 +966,32 @@ public class WxCouponServiceImpl implements WxCouponService { @Override public Map getCouponMerchant(List couponIds, TenantEntity tenantEntity) { Map couponMerchantMap = new HashMap(); - - List merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(tenantEntity.getTenantId(),couponIds); - - WxMerchant merchantQ = new WxMerchant(); - merchantQ.updateTenantInfo(tenantEntity); - merchantQ.setIds(merchantIds); - List merchantList = wxMerchantMapper.findIdNameList(merchantQ); - Map merchantNameMap = new HashMap(); - if (null != merchantList) { - for (int i = 0 ; i < merchantList.size() ; i ++) { - WxMerchant m = merchantList.get(i); - merchantNameMap.put(m.getId(), m.getName()); + if(null != couponIds && couponIds.size() > 0){ + List merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(tenantEntity.getTenantId(),couponIds); + + WxMerchant merchantQ = new WxMerchant(); + merchantQ.updateTenantInfo(tenantEntity); + merchantQ.setIds(merchantIds); + List merchantList = wxMerchantMapper.findIdNameList(merchantQ); + Map merchantNameMap = new HashMap(); + if (null != merchantList) { + for (int i = 0 ; i < merchantList.size() ; i ++) { + WxMerchant m = merchantList.get(i); + merchantNameMap.put(m.getId(), m.getName()); + } } - } - List merchantProductVos = wxCouponMerchantMapper.findMerchantProduct(tenantEntity.getTenantId(), merchantIds); + List merchantProductVos = wxCouponMerchantMapper.findMerchantProduct(tenantEntity.getTenantId(), merchantIds); // Map couponMerchantMap = new HashMap(); - if (null != merchantProductVos) { - for (int i = 0 ; i < merchantProductVos.size(); i ++) { - WxMerchantProductVo mp = merchantProductVos.get(i); - if(couponIds.contains(mp.getProductId())){ - if (mp.getMc() > 1) { - couponMerchantMap.put(mp.getProductId(), "多商户通用"); - }else { - couponMerchantMap.put(mp.getProductId(), merchantNameMap.get(mp.getMerchantId())); + if (null != merchantProductVos) { + for (int i = 0 ; i < merchantProductVos.size(); i ++) { + WxMerchantProductVo mp = merchantProductVos.get(i); + if(couponIds.contains(mp.getProductId())){ + if (mp.getMc() > 1) { + couponMerchantMap.put(mp.getProductId(), "多商户通用"); + }else { + couponMerchantMap.put(mp.getProductId(), merchantNameMap.get(mp.getMerchantId())); + } } } }