From a16c9bebf9ab97e04afa67db1665549af86948fb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 二月 2025 17:02:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index 2d3875b..f684535 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -153,6 +153,17 @@
     
     
     /**
+     * 充电支付成功回调通知
+     * @param out_trade_no
+     * @param transaction_id
+     * @param attach
+     */
+    @PostMapping("/t-charging-order/chargingOrderALICallback")
+    void chargingOrderALICallback(@RequestParam("out_trade_no") String out_trade_no,
+                                  @RequestParam("transaction_id") String transaction_id,
+                                  @RequestParam("attach") String attach);
+    
+    /**
      * 远程启动失败后退款回调
      * @param out_refund_no
      * @param refund_id
@@ -205,7 +216,7 @@
      * @param vo
      */
     @PostMapping("/t-charging-order/endChargeBillingCharge")
-    void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
+    R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
     
     /**
      * 获取充电订单数据

--
Gitblit v1.7.1