| @@ -569,12 +569,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| Long merchanId = merchantProductIdMap.get(co.getCouponId()); | 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()); | // WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.getById(co.getCUserId(), co.getFinalTenantId()); | ||||