From 50dfdaf4e3220e7c1f93a189879ea92bb8f46b4c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 六月 2025 17:58:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
index 51e9e2b..d47c9ae 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java
@@ -5,6 +5,7 @@
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.order.api.dto.ChargingStatisticeDTO;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
import com.ruoyi.order.api.model.AddTripartitePlatformOrder;
import com.ruoyi.order.api.model.ChargingListQuery;
@@ -19,6 +20,7 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -172,7 +174,18 @@
void chargingOrderALICallback(@RequestParam("out_trade_no") String out_trade_no,
@RequestParam("transaction_id") String transaction_id,
@RequestParam("attach") String attach);
-
+
+ /**
+ * 充电支付成功回调通知
+ * @param out_trade_no
+ * @param transaction_id
+ * @param attach
+ */
+ @PostMapping("/t-charging-order/chargingOrderALIH5Callback")
+ void chargingOrderALIH5Callback(@RequestParam("out_trade_no") String out_trade_no,
+ @RequestParam("transaction_id") String transaction_id,
+ @RequestParam("attach") String attach);
+
/**
* 远程启动失败后退款回调
* @param out_refund_no
@@ -226,7 +239,7 @@
* @param vo
*/
@PostMapping("/t-charging-order/endChargeBillingCharge")
- void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
+ R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
/**
* 获取充电订单数据
@@ -235,8 +248,15 @@
*/
@PostMapping("/t-charging-order/getChargingOrder")
R<List<TChargingOrder>> getChargingOrder(@RequestBody TChargingOrderVo order);
-
-
+ /**
+ * 获取充电订单数据
+ * @param
+ * @return
+ */
+ @PostMapping(value = "/t-charging-order/getChargingStatistics")
+ public R<List<TChargingOrder>> getChargingStatistics(@RequestBody ChargingStatisticeDTO dto);
+
+
/**
* 根据车辆id获取指定时间范围内的数据
* @param carId
@@ -299,4 +319,11 @@
*/
@PostMapping("/t-charging-order/tripartitePlatformStopCharge")
R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);
+
+ /**
+ * 充电桩大屏 获取站点集合中总的充电量
+ */
+ @GetMapping("/t-charging-order/getSumDegreeBySiteIds")
+ R<BigDecimal> getSumDegreeBySiteIds(@RequestParam("siteIds") List<Integer> SiteIds);
+
}
--
Gitblit v1.7.1