From cfc72c5a140e6f3dd750b28b9566c64c713806bc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 九月 2024 13:50:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 3575abe..78d11b6 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
@@ -15,7 +15,9 @@
import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.api.vo.TCharingOrderVO;
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;
@@ -85,9 +87,9 @@
* @return
*/
AjaxResult chargingOrderStartupFailureWxRefund(String out_refund_no, String refund_id, String tradeState, String success_time);
-
-
-
+
+
+
/**
* 获取充电中的详情
* @param id
@@ -128,11 +130,29 @@
List<Map<String, BigDecimal>> 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);
}
--
Gitblit v1.7.1