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