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 807dbdbaf..09af696e7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1211,8 +1211,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public Map> findCouponMerchantVoList(List couponIds,TenantEntity tenantEntity,boolean hasShop) { + Map> retMap = new HashMap>(); if (null == couponIds || couponIds.size() <= 0) { - return null; + return retMap; } List merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(tenantEntity.getTenantId(), couponIds); if(null != merchantIds && merchantIds.size() > 0 ) { @@ -1236,7 +1237,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { couponMerchantQ.setProductIds(couponIds); List couponMerchantList = wxCouponMerchantMapper.findList(couponMerchantQ); if (null == couponMerchantList) { - return null; + return retMap; } Map> merchantShopVoList = null; @@ -1244,7 +1245,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { merchantShopVoList = wxShopService.findMerchantShopVoListMap(tenantEntity,merchantIds); } - Map> retMap = new HashMap>(); + for (int i = 0 ; i < couponMerchantList.size() ; i ++) { WxCouponMerchant cm = couponMerchantList.get(i); Long couponId = cm.getProductId(); @@ -1263,7 +1264,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } return retMap; } - return null; + return retMap; } private WxMerchantVo merchantToVo(WxCouponMerchant cm,WxMerchant m,boolean hasShop,Map> merchantShopVoList) {