From 5942e3460190320b55663ef8d57a7a2d420dcc8d Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 10 Jan 2022 22:32:07 +0800 Subject: [PATCH] fix bug --- .../service/impl/WxCouponOrderServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 ea53b0c86..987ba2edd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -569,12 +569,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } Long merchanId = merchantProductIdMap.get(co.getCouponId()); - if (merchanId == 999L) { - co.setMerchantName("多商户通用"); - co.setMerchantId(0L); - }else { - co.setMerchantName(merchantNameMap.get(merchanId)); - co.setMerchantId(merchanId); + if (null != merchanId) { + if (merchanId == 999L) { + co.setMerchantName("多商户通用"); + co.setMerchantId(0L); + }else { + co.setMerchantName(merchantNameMap.get(merchanId)); + co.setMerchantId(merchanId); + } } // WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.getById(co.getCUserId(), co.getFinalTenantId());