From 37b255992c6fcc88b51d30a724f2fe0b54b989ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?= <14103883+leaf-phos@user.noreply.gitee.com> Date: Mon, 28 Apr 2025 18:05:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=80=BB=E8=BE=91=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/bst/pay/service/impl/PayServiceImpl.java | 4 ++-- .../bst/refund/service/impl/RefundServiceImpl.java | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/pay/service/impl/PayServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/pay/service/impl/PayServiceImpl.java index 6a97541..28e4ecd 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/pay/service/impl/PayServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/pay/service/impl/PayServiceImpl.java @@ -490,12 +490,12 @@ public class PayServiceImpl implements PayService { // 增加退款中金额 int addRefunding = payMapper.addRefundingAmount(dto.getId(), dto.getRefundAmount(), dto.getType()); - ServiceUtil.assertion(addRefunding != 1, "记录退款中的金额失败"); + ServiceUtil.assertion(addRefunding != 1, "ID为%s的支付单记录退款中的金额失败", dto.getId()); // 创建退款订单 Refund refundPo = refundConverter.toPo(dto, pay); int refund = refundService.createRefund(refundPo); - ServiceUtil.assertion(refund != 1, "申请退款失败"); + ServiceUtil.assertion(refund != 1, "ID为%s的支付单申请退款失败", dto.getId()); return refund; }); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/refund/service/impl/RefundServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/refund/service/impl/RefundServiceImpl.java index e3f208d..61a77fb 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/refund/service/impl/RefundServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/refund/service/impl/RefundServiceImpl.java @@ -2,9 +2,7 @@ package com.ruoyi.bst.refund.service.impl; import java.util.List; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import com.ruoyi.common.utils.SnowFlakeUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; @@ -25,6 +23,7 @@ import com.ruoyi.bst.refund.service.RefundService; import com.ruoyi.common.pay.PayApi; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServiceUtil; +import com.ruoyi.common.utils.SnowFlakeUtil; import com.ruoyi.common.utils.StringUtils; /** @@ -135,6 +134,7 @@ public class RefundServiceImpl implements RefundService @Override public int createRefund(Refund refund) { Integer result = transactionTemplate.execute(status -> { + // 新增退款单 refund.setStatus(RefundStatus.REFUNDING.getStatus()); int insertRefund = this.insertRefund(refund); ServiceUtil.assertion(insertRefund != 1, "创建退款订单失败"); @@ -160,9 +160,7 @@ public class RefundServiceImpl implements RefundService // 判断是否同步通知，若是则直接处理支付成功 if (channelApiType.getIsRefundSync() != null && channelApiType.getIsRefundSync()) { - scheduledExecutorService.schedule(() -> { - this.handleRefundSuccess(refund.getNo()); - }, 10, TimeUnit.SECONDS); + this.handleRefundSuccess(refund.getNo()); } return insertRefund; @@ -196,12 +194,12 @@ public class RefundServiceImpl implements RefundService query.setId(refund.getId()); query.setStatus(RefundStatus.REFUNDING.getStatus()); int rows = refundMapper.updateByQuery(data, query); - ServiceUtil.assertion(rows != 1, "修改退款订单状态失败"); + ServiceUtil.assertion(rows != 1, "修改编号为%s的退款订单状态失败", no); // 处理支付单 RefundVO newRefund = this.selectRefundByNo(no); int handleResult = payService.handleRefundSuccess(newRefund); - ServiceUtil.assertion(handleResult != 1, "修改支付单状态失败"); + ServiceUtil.assertion(handleResult != 1, "修改编号为%s的支付单状态失败", newRefund.getPayNo()); return rows; });