From 74dbde1f3b2f42c42a67ccd1df82f4d89c729559 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 17:40:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-payment/src/main/java/com/ruoyi/payment/controller/WxPayController.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 2ac473e..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
@@ -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