From 951cd384e7b81eb7686e303f77992340cc91e6d1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 九月 2024 09:49:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 95 insertions(+), 10 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 23d19a3..61aad66 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,16 +5,20 @@
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.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.query.ChargingOrderQuery;
-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.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 org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -76,6 +80,18 @@
/**
+ * 充电启动失败后的退款回调处理
+ * @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 id
* @return
@@ -102,17 +118,86 @@
List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
- Map<String, BigDecimal> countAll(LocalDate sixBefore);
+ Map<String, Object> countAll(LocalDate sixBefore);
- List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds);
- List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getDateData(List<Long> chargingOrderIds);
- List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getWeekData(List<Long> chargingOrderIds);
- List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getMonthData(List<Long> chargingOrderIds);
- List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);
+ List<Map<String, Object>> getYearData(List<Long> chargingOrderIds);
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 orderCode
+ */
+ void excelEndCharge(String orderCode);
+
+ List<Map<String, Object>> getByDate(List<Long> chargingOrderIds);
+
+ List<Map<String, Object>> queryPower(List<Integer> siteIds);
+
+ Map<String, Object> qureryPowerLevel(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto);
+
+ List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);
+
+ List<Map<String, Object>> usersDay();
+
+ List<Map<String, Object>> usersByQuery(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();
+
+ Long 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);
}
--
Gitblit v1.7.1