From a85ab71180fdcb02b3cae304ebc96bb2ca12423c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 十一月 2024 17:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 ae33132..94b480a 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
@@ -199,4 +199,19 @@
      */
     @PostMapping("/t-charging-order/terminateSuccessfulResponse")
     void terminateSuccessfulResponse(@RequestBody PlatformStopChargingReplyVO platformStopChargingReply);
+    
+    /**
+     * 停止充电返回账单后计算费用
+     * @param vo
+     */
+    @PostMapping("/t-charging-order/endChargeBillingCharge")
+    void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
+    
+    /**
+     * 获取充电订单数据
+     * @param order
+     * @return
+     */
+    @PostMapping("/t-charging-order/getChargingOrder")
+    R<List<TChargingOrder>> getChargingOrder(@RequestBody TChargingOrderVo order);
 }

--
Gitblit v1.7.1