From 8f400975692e27d65af770acd01dadc0dea025fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 29 一月 2026 10:02:14 +0800
Subject: [PATCH] Merge branch 'dev' 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/ChargingOrderAccountingStrategyClient.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java
index 2f98b2c..db8faea 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderAccountingStrategyClient.java
@@ -4,11 +4,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.api.factory.ChargingOrderAccountingStrategyFallbackFactory;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
+import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@@ -38,4 +36,21 @@
*/
@PostMapping("/t-charging-order-accounting-strategy/getDailyChargingDegree/{days}")
R<List<Double>> getDailyChargingDegree(@PathVariable("days") Integer days, @RequestParam("siteIds") Set<Integer> siteIds);
+
+
+ /**
+ * 根据订单id查询充电明细
+ * @param chargingOrderId
+ * @return
+ */
+ @PostMapping("/t-charging-order-accounting-strategy/getChargingOrderAccountingStrategyByOrderId")
+ R<List<TChargingOrderAccountingStrategy>> getChargingOrderAccountingStrategyByOrderId(@RequestParam("chargingOrderId") Long chargingOrderId);
+
+ /**
+ * 添加充电计费明细
+ * @param accountingStrategyList
+ * @return
+ */
+ @PostMapping("/t-charging-order-accounting-strategy/addChargingOrderAccountingStrategy")
+ R<String> addChargingOrderAccountingStrategy(@RequestBody List<TChargingOrderAccountingStrategy> accountingStrategyList);
}
--
Gitblit v1.7.1