From 792cbb986fb8c32f6bbc1638c4ae264372e7a28f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 一月 2025 19:31:36 +0800
Subject: [PATCH] 新增引流接口及业务逻辑

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 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 57b0caa..175381f 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
@@ -19,7 +19,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;
@@ -140,7 +142,7 @@
 
 	List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
 
-	Map<String, Object> countAll(LocalDate sixBefore);
+	Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds);
 
     List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);
 
@@ -178,6 +180,12 @@
 	 */
 	void endChargeBillingCharge(TransactionRecordMessageVO vo);
 	
+//	/**
+//	 * 停止充电返回账单后计算费用
+//	 * @param vo
+//	 */
+//	void endChargeBillingCharge1(TransactionRecordMessageVO vo);
+	
 	
 
 	/**
@@ -194,7 +202,7 @@
 
 	List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);
 
-	List<Map<String, Object>> usersDay();
+	List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto);
 	List<Map<String, Object>> usersDay1();
 
 	List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
@@ -231,8 +239,9 @@
 	PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);
 
     SettlementTotalVO settlementTotal(String time);
+    SettlementTotalVO settlementTotalR(String time,Long userId);
 
-	List<Map<String, Object>> countBySource(List<Integer> siteIds);
+	List<Map<String, Object>> countBySource(List<Integer> siteIds,ChargingStatisticsQueryDto statisticsQueryDto);
 
 	List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
 
@@ -277,4 +286,21 @@
 	 * @return
 	 */
 	List<TChargingOrder> getChargingOrder(TChargingOrderVo order);
+
+    Long countCar(List<String> brands);
+	
+	
+	/**
+	 * 添加三方平台充电订单数据
+	 * @param chargingGunId
+	 */
+	R addTripartitePlatformOrder(Integer chargingGunId, String operatorId, Integer rechargePaymentType, BigDecimal paymentAmount, String startChargeSeq);
+	
+	
+	/**
+	 * 三方平台停止充电操作
+	 * @param startChargeSeq
+	 * @return
+	 */
+	R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);
 }

--
Gitblit v1.7.1