|
|
|
@@ -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()); |
|
|
|
|