From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 五月 2025 22:31:33 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 985ca03..2ac473e 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
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.feignClient.OrderClient;
+import com.ruoyi.order.api.feignClient.ShoppingOrderClient;
import com.ruoyi.payment.api.vo.PaymentOrder;
import com.ruoyi.payment.api.vo.WxRefundNotifyResp;
import com.ruoyi.payment.wx.enums.RefundEnum;
@@ -41,6 +42,9 @@
@Resource
private ChargingOrderClient chargingOrderClient;
+
+ @Resource
+ private ShoppingOrderClient shoppingOrderClient;
@@ -97,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);
// 微信支付退款单号
@@ -112,14 +116,14 @@
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);
}
/**
* 支付回调
*/
@PostMapping("pay/notify")
@ApiOperation("订单回调")
- public R<Map<String, Object>> payNotify(HttpServletRequest request) throws Exception {
+ public void payNotify(HttpServletRequest request) throws Exception {
try {
Map<String, Object> params = wxV3Pay.verifyNotify(request, new TypeReference<Map<String, Object>>() {});
log.info("支付回调：{}", params);
@@ -143,13 +147,10 @@
break;
}
wxV3Pay.ack();
- return R.ok(params);
} catch (Exception e) {
log.error("支付回调异常：{}", e, e);
wxV3Pay.ack(false, e.getMessage());
- return R.fail("回调异常");
}
-
}
/**
@@ -171,7 +172,7 @@
* 退款回调
*/
@PostMapping("refund/notify")
- public R<WxRefundNotifyResp> refundNotify(HttpServletRequest request) throws IOException {
+ public void refundNotify(HttpServletRequest request) throws IOException {
try {
Map<String, Object> params = wxV3Pay.verifyNotify(request, new TypeReference<Map<String, Object>>() {
});
@@ -196,6 +197,10 @@
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("----商城订单取消退款回调通知");
+ break;
//充电订单
case "GWF":
chargingOrderClient.shoppingOrderWxRefund(out_refund_no, refund_id, tradeState, success_time);
@@ -211,14 +216,13 @@
resp.setRefund_id(refund_id);
resp.setSuccess_time(success_time);
wxV3Pay.ack();
- return R.ok(resp);
} else {
wxV3Pay.ack(false, "不是成功的退款状态");
}
} catch (Exception e) {
+ e.printStackTrace();
wxV3Pay.ack(false, e.getMessage());
}
- return R.fail();
}
/**
--
Gitblit v1.7.1