Просмотр исходного кода

[退款提示修改][刷卡支付]:退款提示修改

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
f18409aedb
2 измененных файлов: 8 добавлений и 6 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +6
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java

+ 2
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -178,6 +178,8 @@ public enum ErrorCode{
REFUND_PAY_ORDER_IS_ZERO(12012, "退款支付订单金额为0"), REFUND_PAY_ORDER_IS_ZERO(12012, "退款支付订单金额为0"),
REFUND_ORDER_ERROR(12013, "退款订单异常"), REFUND_ORDER_ERROR(12013, "退款订单异常"),
REFUND_ORDER_NOTIFY_CHECK_SIGN_ERROR(12014, "退款验签失败"), 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没找到"), APP_ID_NOT_FOUND(12020, "APPID没找到"),
MCH_INFO_NOT_FOUND(12021, "微信商户平台信息没找到"), MCH_INFO_NOT_FOUND(12021, "微信商户平台信息没找到"),


+ 6
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java Просмотреть файл

@@ -250,11 +250,11 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId);
if (wxMerchantBUser == null) { if (wxMerchantBUser == null) {
logger.error("操作员ID不存在:" + bUserId); 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())) { 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) { } else if (refundWay == EnumRefundWay.ADMIN) {
logger.info("ADMIN端发起退款: bUserId-" + bUserId); logger.info("ADMIN端发起退款: bUserId-" + bUserId);
@@ -625,11 +625,11 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId);
if (wxMerchantBUser == null) { if (wxMerchantBUser == null) {
logger.error("操作员ID不存在:" + bUserId); 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())) { 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) { } else if (refundWay == EnumRefundWay.ADMIN) {
logger.info("ADMIN端发起退款: bUserId-" + bUserId); logger.info("ADMIN端发起退款: bUserId-" + bUserId);


Загрузка…
Отмена
Сохранить