From 0e0eeba3a38dd8389dfa5edd5d8a01b9cc42018f Mon Sep 17 00:00:00 2001 From: dzq Date: Wed, 11 Jun 2025 10:19:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E9=80=80=E6=AC=BE):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A7=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE=E5=95=86=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 检查订单创建时间以确定使用新旧商户进行退款。旧订单需使用旧商户退款，若失败则尝试新商户退款。 --- .../shop/approval/ReturnApprovalApplicationService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java index f45b48a..137fead 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java @@ -159,7 +159,9 @@ public class ReturnApprovalApplicationService { // 微信退款 RefundVO refundVO = null; try { - // 检查订单创建时间是否在2025年6月10日11:05之前 + /* 检查订单创建时间是否在2025年6月10日11:05之前 + 之前的旧订单收款商户和新订单收款商户不一致，需要使用旧订单收款商户进行退款 + */ Date cutoffDate = DateUtil.parse("2025-06-10 11:05:00", "yyyy-MM-dd HH:mm:ss"); if (orderModel.getCreateTime().after(cutoffDate)) { refundVO = paymentApplicationService.refund( @@ -181,6 +183,7 @@ public class ReturnApprovalApplicationService { paymentOperationLogCommand.initBaseEntity(); paymentOperationLogApplicationService.addPaymentOperationLog(paymentOperationLogCommand); + // 若还是失败，使用新订单收款商户进行退款 refundVO = paymentApplicationService.refund( PayApiConstants.biz_id, PayApiConstants.appkey, orderModel.getBizOrderId(), orderModel.getUcid(),