From 50dde470ec18f292e8e58547ef1c4a4cbd4138b2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 24 九月 2025 15:08:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
index 546a0b7..24be986 100644
--- a/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
+++ b/ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java
@@ -101,7 +101,7 @@
*/
@ApiOperation("订单退款")
@PostMapping(value = "refundOrderR")
- public R<String> refundOrderR(@RequestBody WxPaymentRefundModel model) {
+ public R<Map<String, Object>> refundOrderR(@RequestBody WxPaymentRefundModel model) {
Map<String, Object> result = wxV3Pay.refund(model);
log.info("退款结果：{}", result);
// 微信支付退款单号
@@ -116,7 +116,7 @@
String success_time = Objects.nonNull(result.get("success_time")) ? result.get("success_time").toString() : null;
// 退款状态 RefundEnum
String status = result.get("status").toString();
- return R.ok(status);
+ return R.ok(result);
}
/**
* 支付回调
@@ -197,14 +197,15 @@
chargingOrderClient.chargingOrderStartupFailureWxRefund(out_refund_no, refund_id, tradeState, success_time);
System.err.println("----充电启动失败退款回调通知");
break;
- case "GDF":
- shoppingOrderClient.cancelShoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);
- System.err.println("----商城订单取消退款回调通知");
+ //会员订单
+ case "HYF":
+ orderClient.vipWxRefund(out_refund_no, refund_id, tradeState, success_time);
+ System.err.println("----会员订单消退款回调通知");
break;
- //充电订单
+ //购物订单
case "GWF":
chargingOrderClient.shoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);
- System.err.println("----管理后台取消购物订单退款回调通知");
+ System.err.println("----购物订单退款回调通知");
break;
}
--
Gitblit v1.7.1