From 531c94e27fd3dc2abe8ad72485f66e9e141a0bae Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 07 九月 2024 10:00:06 +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, 11 insertions(+), 2 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 366a8c3..5979a05 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
@@ -7,6 +7,7 @@
 import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
 import com.ruoyi.order.api.model.ChargingListQuery;
 import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.api.model.TSettlementConfirm;
 import com.ruoyi.order.api.query.TChargingCountQuery;
 import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
 import com.ruoyi.order.api.vo.ChargingBillVO;
@@ -96,8 +97,8 @@
      */
     @PostMapping("/t-charging-order/excelEndCharge")
     void excelEndCharge(@RequestParam("code") String code);
-    
-    
+
+
     /**
      * 根据车牌号和时间查询有效的充电数据
      * @param query
@@ -105,4 +106,12 @@
      */
     @PostMapping("/t-charging-order/getChargingOrderByLicensePlate")
     R<TChargingOrder> getChargingOrderByLicensePlate(@RequestBody GetChargingOrderByLicensePlate query);
+
+    /**
+     * 获取充电结算记录
+     * @param uid
+     * @return
+     */
+    @GetMapping(value = "/financial/settlement/downloadSettlement/{uid}")
+    public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid);
 }

--
Gitblit v1.7.1