| @@ -535,14 +535,31 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| } | } | ||||
| Map<Long, List<WxMerchantVo>> couponMerchantVoMap = null; | |||||
| if (null != mallCouponMerchantVoMap) { | |||||
| couponMerchantVoMap = new HashMap<Long, List<WxMerchantVo>>(); | |||||
| for (Iterator<String> it = mallCouponMerchantVoMap.keySet().iterator();it.hasNext();) { | |||||
| String mtid = it.next(); | |||||
| Map<Long,List<WxMerchantVo>> couponMerchantList = mallCouponMerchantVoMap.get(mtid); | |||||
| if (null != couponMerchantList) { | |||||
| for (Iterator<Long> cid = couponMerchantList.keySet().iterator();cid.hasNext();) { | |||||
| Long couponId = cid.next(); | |||||
| List<WxMerchantVo> merchantVoList = couponMerchantList.get(couponId); | |||||
| if (null != merchantVoList && merchantVoList.size() > 0 ) { | |||||
| List<WxMerchantVo> 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 ++) { | for (int i = 0 ; i < couponOrderList.size() ; i ++) { | ||||
| WxCouponOrder couponOrder = couponOrderList.get(i); | WxCouponOrder couponOrder = couponOrderList.get(i); | ||||
| Map<Long, List<WxMerchantVo>> couponMerchantVoMap = null; | |||||
| if (!StringUtils.isBlank(couponOrder.getBTenantId())) { | |||||
| if (null != mallCouponMerchantVoMap){ | |||||
| couponMerchantVoMap = mallCouponMerchantVoMap.get(couponOrder.getBTenantId()); | |||||
| } | |||||
| } | |||||
| if (null == couponMerchantVoMap) { | if (null == couponMerchantVoMap) { | ||||
| couponMerchantVoMap = new HashMap<Long, List<WxMerchantVo>>(); | couponMerchantVoMap = new HashMap<Long, List<WxMerchantVo>>(); | ||||
| } | } | ||||