From 1adec9fead03f0f788a73f9349ccba86569e31f3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 30 四月 2025 19:40:11 +0800
Subject: [PATCH] 修改rocketmq连接方式和修改发起充电异常情况下将订单挂起的功能
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 f411893..a1652ce 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
@@ -20,6 +20,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -107,6 +108,10 @@
* @param code
*/
void refund(String code);
+
+
+
+ void refund1(String code, BigDecimal money);
/**
* 获取充电中的详情
@@ -144,17 +149,17 @@
List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
- Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds);
+ Map<String, Object> countAll(List<Integer> siteIds);
- List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getSumByType(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getDateData(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getDateData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getWeekData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getMonthData(LocalDate start,LocalDate end,List<Integer> siteIds);
- List<Map<String, Object>> getYearData(LocalDate start,LocalDate end);
+ List<Map<String, Object>> getYearData(LocalDate start,LocalDate end,List<Integer> siteIds);
ChargingOrderTimeVO chargingList(ChargingListQuery dto);
@@ -190,13 +195,12 @@
*/
void excelEndCharge(String orderCode);
- List<Map<String, Object>> getByDate(LocalDate start,LocalDate end);
+ 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>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds);
List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto);
List<Map<String, Object>> usersDay1();
@@ -306,4 +310,13 @@
* @return
*/
R getNotPaymentChargingOrder();
+
+
+ /**
+ *
+ * 手动推送订单给第三方平台
+ * @param code
+ * @return
+ */
+ R pushOrderInfo(String code);
}
--
Gitblit v1.7.1