From 09358eb661b9aa96548f87214d0bab106859b17c Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 15 Oct 2021 16:26:23 +0800 Subject: [PATCH] update gift --- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b867ca7dc..8fd3a33ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -441,7 +441,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if(EnumCouponVerifyType.VERIFY_B.equals(couponVerifyType) && !cm.getMerchantId().equals(bUser.getMerchantId())){ throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL); } - merchantId = cm.getId(); + merchantId = cm.getMerchantId(); }else if(EnumCouponType.COUPON_GIFT.getCode().equals(wxCoupon.getType())){ if (StringUtils.isBlank(wxCoupon.getGiftList())){ logger.error("券包: coupon-" + wxCoupon.getId() + "数据异常" + "couponOrder-" + couponOrder.getId());