hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 12:18:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mall + pay：

Browse Source 
1. 优化 PayClient 退款逻辑，返回业务失败 errorCode + errorMsg 错误码
This commit is contained in:
YunaiV
2023-07-18 22:36:03 +08:00
parent 3f410c2735
commit 888c488206
4 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
View File

@@ -237,6 +237,7 @@ public class PayOrderServiceImpl implements PayOrderService {
TenantUtils.execute(channel.getTenantId(), () -> notifyPayOrder(channel, notify));
}
// TODO 芋艿：事务问题
private void notifyPayOrder(PayChannelDO channel, PayOrderRespDTO notify) {
// 情况一：支付成功的回调
if (PayOrderStatusRespEnum.isSuccess(notify.getStatus())) {
@@ -372,7 +373,7 @@ public class PayOrderServiceImpl implements PayOrderService {
throw exception(ORDER_NOT_FOUND);
}
if (!PayOrderStatusEnum.isSuccess(order.getStatus())) {
throw exception(REFUND_PRICE_EXCEED);
throw exception(ORDER_STATUS_IS_NOT_SUCCESS);
}
if (order.getRefundPrice() + incrRefundPrice > order.getPrice()) {
throw exception(REFUND_PRICE_EXCEED);
@@ -389,7 +390,10 @@ public class PayOrderServiceImpl implements PayOrderService {
updateObj.setStatus(PayOrderStatusEnum.CLOSED.getStatus())
.setRefundStatus(PayOrderRefundStatusEnum.PART.getStatus());
}
orderMapper.updateByIdAndStatus(id, PayOrderStatusEnum.SUCCESS.getStatus(), updateObj);
int updateCount = orderMapper.updateByIdAndStatus(id, PayOrderStatusEnum.SUCCESS.getStatus(), updateObj);
if (updateCount == 0) {
throw exception(ORDER_STATUS_IS_NOT_SUCCESS);
}
}
}

47
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java
View File

@@ -206,7 +206,6 @@ public class PayRefundServiceImpl implements PayRefundService {
}
@Override
@Transactional(rollbackFor = Exception.class)
public void notifyRefund(Long channelId, PayRefundRespDTO notify) {
// 校验支付渠道是否有效
channelService.validPayChannel(channelId);
@@ -218,15 +217,20 @@ public class PayRefundServiceImpl implements PayRefundService {
TenantUtils.execute(channel.getTenantId(), () -> notifyRefund(channel, notify));
}
// TODO 芋艿：事务问题
private void notifyRefund(PayChannelDO channel, PayRefundRespDTO notify) {
// 情况一：退款成功
if (PayRefundStatusRespEnum.isSuccess(notify.getStatus())) {
notifyRefundSuccess(channel, notify);
} else {
return;
}
// 情况二：退款失败
if (PayRefundStatusRespEnum.isFailure(notify.getStatus())) {
notifyRefundFailure(channel, notify);
}
}
private void notifyRefundSuccess(PayChannelDO channel, PayRefundRespDTO notify) {
public void notifyRefundSuccess(PayChannelDO channel, PayRefundRespDTO notify) {
// 1.1 查询 PayRefundDO
PayRefundDO refund = refundMapper.selectByAppIdAndNo(
channel.getAppId(), notify.getOutRefundNo());
@@ -234,12 +238,12 @@ public class PayRefundServiceImpl implements PayRefundService {
throw exception(ErrorCodeConstants.REFUND_NOT_FOUND);
}
if (PayRefundStatusEnum.isSuccess(refund.getStatus())) { // 如果已经是成功，直接返回，不用重复更新
log.info("[notifyRefundSuccess][退款订单({}) 已经是退款成功，无需更新]", refund.getId());
return;
}
if (!PayRefundStatusEnum.WAITING.getStatus().equals(refund.getStatus())) {
throw exception(ErrorCodeConstants.REFUND_STATUS_IS_NOT_WAITING);
}
// 1.2 更新 PayRefundDO
PayRefundDO updateRefundObj = new PayRefundDO()
.setSuccessTime(notify.getSuccessTime())
@@ -250,17 +254,46 @@ public class PayRefundServiceImpl implements PayRefundService {
if (updateCounts == 0) { // 校验状态，必须是等待状态
throw exception(ErrorCodeConstants.REFUND_STATUS_IS_NOT_WAITING);
}
log.info("[notifyRefundSuccess][退款订单({}) 更新为退款成功]", refund.getId());
// 2. 更新订单
orderService.updateOrderRefundPrice(refund.getOrderId(), refund.getRefundPrice());
// 3. 插入退款通知记录
// 3. 插入退款通知记录 TODO 芋艿：退款成功
notifyService.createPayNotifyTask(PayNotifyTaskCreateReqDTO.builder()
.type(PayNotifyTypeEnum.REFUND.getType()).dataId(refund.getId()).build());
}
private void notifyRefundFailure(PayChannelDO channel, PayRefundRespDTO notify) {
// TODO 芋艿：未实现
@Transactional(rollbackFor = Exception.class)
public void notifyRefundFailure(PayChannelDO channel, PayRefundRespDTO notify) {
// 1.1 查询 PayRefundDO
PayRefundDO refund = refundMapper.selectByAppIdAndNo(
channel.getAppId(), notify.getOutRefundNo());
if (refund == null) {
throw exception(ErrorCodeConstants.REFUND_NOT_FOUND);
}
if (PayRefundStatusEnum.isFailure(refund.getStatus())) { // 如果已经是成功，直接返回，不用重复更新
log.info("[notifyRefundSuccess][退款订单({}) 已经是退款关闭，无需更新]", refund.getId());
return;
}
if (!PayRefundStatusEnum.WAITING.getStatus().equals(refund.getStatus())) {
throw exception(ErrorCodeConstants.REFUND_STATUS_IS_NOT_WAITING);
}
// 1.2 更新 PayRefundDO
PayRefundDO updateRefundObj = new PayRefundDO()
.setChannelRefundNo(notify.getChannelRefundNo())
.setStatus(PayRefundStatusEnum.FAILURE.getStatus())
.setChannelNotifyData(toJsonString(notify))
.setChannelErrorCode(notify.getChannelErrorCode()).setChannelErrorMsg(notify.getChannelErrorMsg());
int updateCounts = refundMapper.updateByIdAndStatus(refund.getId(), refund.getStatus(), updateRefundObj);
if (updateCounts == 0) { // 校验状态，必须是等待状态
throw exception(ErrorCodeConstants.REFUND_STATUS_IS_NOT_WAITING);
}
log.info("[notifyRefundFailure][退款订单({}) 更新为退款失败]", refund.getId());
// 2. 插入退款通知记录 TODO 芋艿：退款失败
notifyService.createPayNotifyTask(PayNotifyTaskCreateReqDTO.builder()
.type(PayNotifyTypeEnum.REFUND.getType()).dataId(refund.getId()).build());
}
}