From 70c9bae5aead66cabfc51cb3fb80d7945870dc39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= Date: Tue, 5 Aug 2025 20:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java | 2 +- ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java | 4 ++-- .../java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java index bb2a58a43..54c749e6b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java @@ -33,7 +33,7 @@ public class FsNotice extends AbstractNotice { private String defaultAppId; @Value("${fs.robot.appSecret:AZTpyNiW4hpLRXcDhrdjJcr8Z404gVqf}") private String defaultAppSecret; - @Value("${fs.robot.defaultChatId:oc_4f66ce3cf471f50aac6c3fdae7f0aad9}") + @Value("${fs.robot.defaultChatId:oc_34e207df88addd15d83ec274fda95ef6}") private String defaultChatId; @Value("${fs.robot.monitorSwitch:true}") private Boolean monitorSwitch; diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java index e52fcfc21..5252081f1 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java @@ -975,7 +975,7 @@ public class XktTask { //支付状态->已支付，收款单到账 storeOrderService.refundSuccess(storeOrderRefund.getRefundOrder().getId(), storeOrderRefund.getRefundOrderDetails().stream().map(SimpleEntity::getId).collect(Collectors.toList()), - SecurityUtils.getUserId()); + null); } else { //可能是退款失败，也可能是退款处理中，重复调用支付宝接口时只要参数正确也不会重复退款 boolean success = paymentManager.refundStoreOrder(storeOrderRefund); @@ -985,7 +985,7 @@ public class XktTask { //支付状态->已支付，收款单到账 storeOrderService.refundSuccess(storeOrderRefund.getRefundOrder().getId(), storeOrderRefund.getRefundOrderDetails().stream().map(SimpleEntity::getId).collect(Collectors.toList()), - SecurityUtils.getUserId()); + null); } else { fsNotice.sendMsg2DefaultChat("退款失败", "参数: " + JSON.toJSONString(storeOrderRefund)); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java index bf6dc97f6..e479f9f9b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/manager/impl/AliPaymentMangerImpl.java @@ -222,8 +222,8 @@ public class AliPaymentMangerImpl implements PaymentManager, InitializingBean { model.setRefundReason("正常退款"); // 设置退款请求号 model.setOutRequestNo(orderRefund.getRefundOrder().getOrderNo()); + request.setBizModel(model); try { - //TODO 沙箱环境接口无法完全退款？ AlipayTradeRefundResponse response = alipayClient.certificateExecute(request); log.info("支付宝退款：{}", response.getBody()); String fundChange = JSON.parseObject(response.getBody())