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 |  319 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 318 insertions(+), 1 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 5650b83..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
@@ -1,7 +1,29 @@
 package com.ruoyi.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.common.core.domain.R;
+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.PageInfo;
+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.*;
+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;
 
 /**
  * <p>
@@ -12,5 +34,300 @@
  * @since 2024-08-07
  */
 public interface TChargingOrderService extends IService<TChargingOrder> {
+	
+	
+	/**
+	 * 获取小程序充电记录列表数据
+	 * @param query
+	 * @return
+	 */
+	Map<String, Object> getMyChargingOrderList(GetMyChargingOrderList query);
+	
+	
+	/**
+	 * 获取小程序充电记录明细
+	 * @param id
+	 * @return
+	 */
+	MyChargingOrderInfo getMyChargingOrderInfo(String id);
+	
+	
+	/**
+	 * 获取待开票订单列表
+	 * @param query
+	 * @return
+	 */
+	List<MyChargingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query);
+	
+	
+	/**
+	 * 充电支付
+	 * @param addChargingOrder
+	 * @return
+	 */
+	AjaxResult paymentChargingOrder(AddChargingOrder addChargingOrder);
+	
+	
+	/**
+	 * 支付成功后的回调处理逻辑
+	 * @param paymentType 支付方式:1=微信,2=支付宝
+	 * @param out_trade_no 业务流水号
+	 * @param transaction_id 三方支付流水号
+	 * @param attach 附加数据
+	 * @return
+	 */
+	AjaxResult chargingOrderCallback(Integer paymentType, String out_trade_no, String transaction_id, String attach);
+	
+	
+	/**
+	 * 安全检测数据
+	 * @param securityDetection
+	 */
+	void securityDetection(SecurityDetectionVO securityDetection);
+	
+	
+	/**
+	 * 启动充电应发
+	 * @param message
+	 */
+	void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message);
+	
+	
+	/**
+	 * 充电启动失败后的退款回调处理
+	 * @param out_refund_no
+	 * @param refund_id
+	 * @param tradeState
+	 * @param success_time
+	 * @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);
 
+	/**
+	 * 获取充电中的详情
+	 * @param id
+	 * @return
+	 */
+	ChargingDetails getChargingDetails(Integer id);
+	
+	
+	/**
+	 * 停止充电
+	 * @param id
+	 * @return
+	 */
+	AjaxResult stopCharging(String id);
+	
+	
+	/**
+	 * 停止充电应答结果处理
+	 * @param platformStopChargingReply
+	 */
+	void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply);
+	
+	
+
+	TCharingOrderVO chargingOrder(ChargingOrderQuery dto);
+
+	R<PageInfo<PayOrderDto>> payOrderQuery(PayOrderQueryDto payOrderQueryDto);
+
+    R<PageInfo<TChargingOrderRefund>> getRefundList(ChargingRefundDto chargingRefundDto);
+
+    List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto);
+
+	List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds);
+
+	List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
+
+	Map<String, Object> countAll(List<Integer> siteIds);
+
+    List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);
+
+	List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds);
+
+	List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end,List<Integer> siteIds);
+
+	List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end,List<Integer> siteIds);
+
+	List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds);
+
+    ChargingOrderTimeVO chargingList(ChargingListQuery dto);
+
+	R payRefund(PayOrderRefundDto payOrderQueryDto);
+
+	ChargingOrderListInfoVO chargingInfo(String uid);
+
+
+	/**
+	 * 处理充电订单实时监控数据相关的业务逻辑
+	 * @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