From b39ad9e36ff8cebd8e4402bb1e1411ad415eb0fe Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 1 May 2019 17:24:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A0=B8=E9=94=80=E6=8F=90=E7=A4=BA][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=A0=B8=E9=94=80=E5=95=86=E6=88=B7?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/java/com/iformall/common/ErrorCode.java | 1 + .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index a4cbb0b98..b332df272 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -240,6 +240,7 @@ public enum ErrorCode{ */ VERIFY_ERROR(12050, "核销异常"), MSG_REPEAT_SEND(12061, "短信重复发送"), + VERIFY_COUPON_ORDER_MERANT_IS_NULL(12062, "卡券核销商户无权限"), /** * 解单 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 ad340faab..dfc141a03 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -301,7 +301,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); if (!couponMerchantList.stream().anyMatch(cm->cm.getMerchantId().equals(wxMerchantBUser.getMerchantId()))){ logger.error("券: coupon-" + wxCoupon.getId() + "核销: couponMerchantId-" + wxMerchantBUser.getMerchantId()); - throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); + throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERANT_IS_NULL); } }