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); } }