From 2c51f96fd55949db562fd0ef608b55ccb1530a1e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 03 十一月 2024 18:38:05 +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 | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 ae33132..33352e4 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
@@ -120,8 +120,8 @@
@GetMapping(value = "/financial/settlement/downloadSettlement/{uid}")
public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid);
- @GetMapping(value = "/financial/settlement/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR(String time);
+ @GetMapping(value = "/financial/settlement/settlementTotalR/{time}")
+ public R<SettlementTotalVO> settlementTotalR(@PathVariable("time")String time);
/**
* 修改充电订单
@@ -199,4 +199,30 @@
*/
@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);
+
+
+ /**
+ * 根据车辆id获取指定时间范围内的数据
+ * @param carId
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @PostMapping("/t-charging-order/getCarChargingOrder")
+ R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime);
}
--
Gitblit v1.7.1