From 77930f84c8962eb365bb1bd9303d844555f93221 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 0cdb324..a0e24bb 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -375,10 +375,7 @@
                 .eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getStatus, 3));
         return R.ok(one);
     }
-    
-    
-    
-    
+
     @ResponseBody
     @GetMapping(value = "/getMyChargingOrderList")
     @ApiOperation(value = "获取充电记录列表", tags = {"小程序-充电记录"})
@@ -463,7 +460,7 @@
      * @param request
      */
     @ResponseBody
-    @PostMapping(value = "/chargingOrderALICallback")
+    @PostMapping(value = "/chargingOrderStartupFailureWxRefund")
     public void chargingOrderStartupFailureWxRefund(HttpServletRequest request){
         WxRefundNotifyResp data = wxPaymentClient.refundNotify(request).getData();
         if(null != data){

--
Gitblit v1.7.1