diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 8e0f15096..c9cb23744 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -535,14 +535,31 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } + Map> couponMerchantVoMap = null; + if (null != mallCouponMerchantVoMap) { + couponMerchantVoMap = new HashMap>(); + for (Iterator it = mallCouponMerchantVoMap.keySet().iterator();it.hasNext();) { + String mtid = it.next(); + Map> couponMerchantList = mallCouponMerchantVoMap.get(mtid); + if (null != couponMerchantList) { + for (Iterator cid = couponMerchantList.keySet().iterator();cid.hasNext();) { + Long couponId = cid.next(); + List merchantVoList = couponMerchantList.get(couponId); + if (null != merchantVoList && merchantVoList.size() > 0 ) { + List vlist = couponMerchantVoMap.get(couponId); + if (null != vlist && vlist.size() > 0 ) { + merchantVoList.addAll(vlist); + } + couponMerchantVoMap.put(couponId, merchantVoList); + } + } + } + } + } + + for (int i = 0 ; i < couponOrderList.size() ; i ++) { WxCouponOrder couponOrder = couponOrderList.get(i); - Map> couponMerchantVoMap = null; - if (!StringUtils.isBlank(couponOrder.getBTenantId())) { - if (null != mallCouponMerchantVoMap){ - couponMerchantVoMap = mallCouponMerchantVoMap.get(couponOrder.getBTenantId()); - } - } if (null == couponMerchantVoMap) { couponMerchantVoMap = new HashMap>(); }