From f18409aedb9bce91101a44b237ed5f7720da279d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 12 Nov 2018 12:34:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=80=80=E6=AC=BE=E6=8F=90=E7=A4=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=88=B7=E5=8D=A1=E6=94=AF=E4=BB=98]:=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 2 ++ .../service/impl/WxRefundOrderServiceImpl.java | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 54889d0c8..89e598ae3 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -178,6 +178,8 @@ public enum ErrorCode{ REFUND_PAY_ORDER_IS_ZERO(12012, "退款支付订单金额为0"), REFUND_ORDER_ERROR(12013, "退款订单异常"), REFUND_ORDER_NOTIFY_CHECK_SIGN_ERROR(12014, "退款验签失败"), + REFUND_ORDER_BUSER_IS_NULL(12015, "B端用户不存在"), + REFUND_ORDER_BUSER_NOT_EQUAL(12016, "B端用户不一致"), APP_ID_NOT_FOUND(12020, "APPID没找到"), MCH_INFO_NOT_FOUND(12021, "微信商户平台信息没找到"), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index d9a1453fb..d11be56f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -250,11 +250,11 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); if (wxMerchantBUser == null) { logger.error("操作员ID不存在:" + bUserId); - throw new MallinkException(ErrorCode.COUPON_ORDER_BUSER_IS_NULL); + throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_IS_NULL); } if (!wxOrder.getMerchantId().equals(wxMerchantBUser.getMerchantId())) { - logger.error("券: couponMerchantId-" + wxOrder.getMerchantId() + "核销: couponMerchantId-" + wxMerchantBUser.getMerchantId()); - throw new MallinkException(ErrorCode.COUPON_ORDER_BUSER_IS_NULL); + logger.error("券: couponMerchantId-" + wxOrder.getMerchantId() + "退款: couponMerchantId-" + wxMerchantBUser.getMerchantId()); + throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_NOT_EQUAL); } } else if (refundWay == EnumRefundWay.ADMIN) { logger.info("ADMIN端发起退款: bUserId-" + bUserId); @@ -625,11 +625,11 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); if (wxMerchantBUser == null) { logger.error("操作员ID不存在:" + bUserId); - throw new MallinkException(ErrorCode.COUPON_ORDER_BUSER_IS_NULL); + throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_IS_NULL); } if (!wxOrder.getMerchantId().equals(wxMerchantBUser.getMerchantId())) { - logger.error("券: couponMerchantId-" + wxOrder.getMerchantId() + "核销: couponMerchantId-" + wxMerchantBUser.getMerchantId()); - throw new MallinkException(ErrorCode.COUPON_ORDER_BUSER_IS_NULL); + logger.error("券: order MerchantId-" + wxOrder.getMerchantId() + "发起用户: B端MerchantId-" + wxMerchantBUser.getMerchantId()); + throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_NOT_EQUAL); } } else if (refundWay == EnumRefundWay.ADMIN) { logger.info("ADMIN端发起退款: bUserId-" + bUserId);