From 7e354f60788a251ff53a76de1d7bb45d59593905 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 26 Dec 2018 14:16:48 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF][=E4=BF=AE=E5=A4=8D]:=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=97=B6=E6=98=BE=E7=A4=BAB=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- .../com/iformall/service/impl/WxRefundOrderServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 62b68fbd9..648d274de 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -189,7 +189,7 @@ public enum ErrorCode{ 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端用户不一致"), + 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 ed0f48973..471f45251 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -284,7 +284,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.error("操作员ID不存在:" + bUserId); throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_IS_NULL); } - if (isMerchantOrder(wxOrder, wxMerchantBUser.getMerchantId())) { + if (!isMerchantOrder(wxOrder, wxMerchantBUser.getMerchantId())) { logger.error("订单: productId-" + wxOrder.getProductId() + "退款: couponMerchantId-" + wxMerchantBUser.getMerchantId()); throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_NOT_EQUAL); } @@ -648,7 +648,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { logger.error("操作员ID不存在:" + bUserId); throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_IS_NULL); } - if (isMerchantOrder(wxOrder, wxMerchantBUser.getMerchantId())) { + if (!isMerchantOrder(wxOrder, wxMerchantBUser.getMerchantId())) { logger.error("订单: productId-" + wxOrder.getProductId() + "退款: MerchantId-" + wxMerchantBUser.getMerchantId()); throw new MallinkException(ErrorCode.REFUND_ORDER_BUSER_NOT_EQUAL); }