From 8236caa8042288fcb9b584c21d6157f713183626 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 13 二月 2025 16:36:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
index 78112c2..9689489 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -7,10 +7,7 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.dto.SettlementConfirmAdd;
-import com.ruoyi.order.api.model.ChargingListQuery;
-import com.ruoyi.order.api.model.TChargingOrder;
-import com.ruoyi.order.api.model.TChargingOrderRefund;
-import com.ruoyi.order.api.model.TSettlementConfirm;
+import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.query.SettlementListQuery;
import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
@@ -19,7 +16,9 @@
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.vo.EndOfChargePageInfo;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -280,4 +279,26 @@
List<TChargingOrder> getChargingOrder(TChargingOrderVo order);
Long countCar(List<String> brands);
+
+
+ /**
+ * 添加三方平台充电订单数据
+ * @param query
+ */
+ R addTripartitePlatformOrder(AddTripartitePlatformOrder query);
+
+
+ /**
+ * 三方平台停止充电操作
+ * @param startChargeSeq
+ * @return
+ */
+ R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);
+
+
+ /**
+ * 获取充电后没有扣除费用的数据
+ * @return
+ */
+ R getNotPaymentChargingOrder();
}
--
Gitblit v1.7.1