From 0d4c9f50ee2bc3e4a03abd91ac7c9e03891d37f2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 17:41:19 +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 | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 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 e54666c..2a22b03 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
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
+import com.ruoyi.order.api.model.AddTripartitePlatformOrder;
import com.ruoyi.order.api.model.ChargingListQuery;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
@@ -42,6 +43,15 @@
@PostMapping(value = "/t-charging-order/getBySiteIdAndTime")
R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto);
+
+
+ /**
+ * 根据站点id和时间区间查询订单数据
+ * @param chargingPercentProvinceDto
+ * @return
+ */
+ @PostMapping(value = "/t-charging-order/getOrderBySiteIdAndTime")
+ R<List<TChargingOrder>> getOrderBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto);
@@ -216,7 +226,7 @@
* @param vo
*/
@PostMapping("/t-charging-order/endChargeBillingCharge")
- void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
+ R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
/**
* 获取充电订单数据
@@ -235,5 +245,58 @@
* @return
*/
@PostMapping("/t-charging-order/getCarChargingOrder")
- R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime);
+ R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime,
+ @RequestParam("endTime") String endTime);
+
+
+ /**
+ * 根据车牌号查询指定时间范围内的数据
+ * @param plateNum
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @PostMapping("/t-charging-order/getCarChargingOrderByPlateNum")
+ R<List<TChargingOrder>> getCarChargingOrderByPlateNum(@RequestParam("plateNum") String plateNum, @RequestParam("startTime") String startTime,
+ @RequestParam("endTime") String endTime);
+
+
+
+
+ /**
+ * 添加三方平台充电订单数据
+ * @return
+ */
+ @PostMapping("/t-charging-order/addTripartitePlatformOrder")
+ R addTripartitePlatformOrder(@RequestBody AddTripartitePlatformOrder query);
+
+
+ /**
+ * 根据三方平台订单id获取充电数据
+ * @param startChargeSeq
+ * @return
+ */
+ @PostMapping("/t-charging-order/getChargingOrderByStartChargeSeq")
+ R<TChargingOrder> getChargingOrderByStartChargeSeq(@RequestParam("startChargeSeq") String startChargeSeq);
+
+
+
+ /**
+ * 根据三方平台订单ids获取充电数据
+ * @param startChargeSeqs
+ * @return
+ */
+ @PostMapping("/t-charging-order/getChargingOrderByStartChargeSeqs")
+ R<List<TChargingOrder>> getChargingOrderByStartChargeSeqs(@RequestParam("startChargeSeqs") List<String> startChargeSeqs);
+
+
+
+
+ /**
+ * 三方平台请求停止充电
+ * @param startChargeSeq
+ * @return
+ */
+ @PostMapping("/t-charging-order/tripartitePlatformStopCharge")
+ R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);
}
--
Gitblit v1.7.1