|
|
|
@@ -961,7 +961,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
if (null != couponId && null != merchantId) { |
|
|
|
List<WxMerchantVo> volist = retMap.get(couponId); |
|
|
|
if (null == volist) { |
|
|
|
volist = new ArrayList<WxMerchantVo>(); |
|
|
|
volist = new ArrayList<>(); |
|
|
|
} |
|
|
|
retMap.put(couponId, volist); |
|
|
|
WxMerchantVo vo = merchantToVo(cm,merchantMap.get(merchantId),hasShop,merchantShopVoList); |
|
|
|
|