From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 五月 2025 22:31:33 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 206 insertions(+), 14 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 ff03857..771d12c 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
@@ -5,21 +5,23 @@
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.order.api.model.TChargingOrder;
-import com.ruoyi.order.api.model.TChargingOrderRefund;
+import com.ruoyi.order.api.dto.SettlementConfirmAdd;
+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;
-import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
-import com.ruoyi.order.api.vo.ChargingOrderVO;
-import com.ruoyi.order.api.vo.TCharingOrderVO;
+import com.ruoyi.order.api.vo.*;
import com.ruoyi.order.dto.*;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
+import com.ruoyi.order.vo.EndOfChargePageInfo;
+import com.ruoyi.order.vo.StatisticsOfBatteryVO;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -78,6 +80,20 @@
/**
+ * 安全检测数据
+ * @param securityDetection
+ */
+ void securityDetection(SecurityDetectionVO securityDetection);
+
+
+ /**
+ * 启动充电应发
+ * @param message
+ */
+ void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
+
+
+ /**
* 充电启动失败后的退款回调处理
* @param out_refund_no
* @param refund_id
@@ -86,8 +102,17 @@
* @return
*/
AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time);
-
-
+
+
+ /**
+ * 启动失败退款操作
+ * @param code
+ */
+ void refund(String code);
+
+
+
+ void refund1(String code, BigDecimal money);
/**
* 获取充电中的详情
@@ -103,6 +128,15 @@
* @return
*/
AjaxResult stopCharging(String id);
+
+
+ /**
+ * 停止充电应答结果处理
+ * @param platformStopChargingReply
+ */
+ void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply);
+
+
TCharingOrderVO chargingOrder(ChargingOrderQuery dto);
@@ -116,19 +150,21 @@
List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
- Map<String, BigDecimal> countAll(LocalDate sixBefore);
+ Map<String, Object> countAll(List<Integer> siteIds);
- List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds);
ChargingOrderTimeVO chargingList(ChargingListQuery dto);
+
+ R payRefund(PayOrderRefundDto payOrderQueryDto);
ChargingOrderListInfoVO chargingInfo(String uid);
@@ -138,4 +174,160 @@
* @param query
*/
void chargeMonitoring(UploadRealTimeMonitoringDataQuery query);
+
+
+ /**
+ * 自动结束充电后的处理逻辑
+ * @param code
+ */
+ void endCharge(String code, Integer endMode);
+
+ /**
+ * 停止充电返回账单后计算费用
+ * @param vo
+ */
+ R endChargeBillingCharge(TransactionRecordMessageVO vo);
+
+
+
+ /**
+ * 异常结束充电处理逻辑
+ * @param orderCode
+ */
+ void excelEndCharge(String orderCode);
+
+ List<Map<String, Object>> getByDate(LocalDate start,LocalDate end, List<Integer> siteIds);
+
+ List<Map<String, Object>> queryPower(List<Integer> siteIds);
+
+ Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+
+ List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto);
+ List<Map<String, Object>> usersDay1();
+
+ List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto);
+ List<Map<String, Object>> usersByQuery1(ChargingStatisticsQueryDto statisticsQueryDto);
+
+
+ List<Map<String, Object>> getUserTagCount();
+
+ List<Map<String, Object>> getVipCount();
+
+ List<Map<String, Object>> unitConsumption(ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> carUserMethod();
+
+ List<Map<String, Object>> carUserBrand();
+
+ Map<String, Object> countLocalCar();
+
+ Double getAver(List<Integer> siteIds);
+
+ List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds);
+
+
+ /**
+ * 根据车牌号和开始时间查询充电数据
+ * @param query
+ * @return
+ */
+ TChargingOrder getChargingOrderByLicensePlate(GetChargingOrderByLicensePlate query);
+
+
+ TSettlementConfirm settlementAdd(SettlementConfirmAdd dto);
+
+ PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto);
+
+ SettlementTotalVO settlementTotal(String time);
+ SettlementTotalVO settlementTotalR(String time,Long userId);
+
+ List<Map<String, Object>> countBySource(List<Integer> siteIds,ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> equipmentUserType2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> equipmentMapbroke1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> equipmentMapbroke2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> equipmentMapOut1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> equipmentMapOut2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> needElec(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> getHourType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> getDateType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> getMonthType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> getchargingCapacity(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> countAllUserData();
+
+ List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+
+ /**
+ * 获取充电结束页面详情
+ * @param id
+ * @return
+ */
+ EndOfChargePageInfo getEndOfChargePageInfo(String id);
+
+ Long countNoTag();
+
+
+ /**
+ * 获取订单数据
+ * @param order
+ * @return
+ */
+ 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();
+
+
+ /**
+ *
+ * 手动推送订单给第三方平台
+ * @param code
+ * @return
+ */
+ R pushOrderInfo(String code);
+
+
+ R addChargingOrderSummaryData();
+
+ /**
+ * 大屏-新能源汽车电池安全检测次数统计
+ */
+ R<StatisticsOfBatteryVO> getStatisticsOfBattery();
+
+ BigDecimal getSumDegreeBySiteIds(List<Integer> siteIds);
}
--
Gitblit v1.7.1