From 72fc79723a5be2d4b132357d8e03cc0a67bedea7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 九月 2024 16:26:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 3a1672f..370d2e7 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
@@ -142,7 +142,7 @@
System.err.println("----充电支付回调");
break;
}
-
+ wxV3Pay.ack();
return R.ok(params);
} catch (Exception e) {
log.error("支付回调异常：{}", e, e);
@@ -191,7 +191,7 @@
if (tradeState.equals(RefundEnum.SUCCESS.name())) {
String substring = out_refund_no.substring(0, 3);
switch (substring){
- //购物订单
+ //充电订单
case "CDF":
chargingOrderClient.chargingOrderStartupFailureWxRefund(out_refund_no, refund_id, tradeState, success_time);
System.err.println("----充电启动失败退款回调通知");
--
Gitblit v1.7.1