From e46db188efe1fb54f7617426bd6cef6deb076009 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 三月 2025 15:35:22 +0800
Subject: [PATCH] 充电桩bug修改

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java |   78 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 2 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 2d3875b..2a22b03 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
@@ -6,6 +6,7 @@
 import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
+import com.ruoyi.order.api.model.AddTripartitePlatformOrder;
 import com.ruoyi.order.api.model.ChargingListQuery;
 import com.ruoyi.order.api.model.TChargingOrder;
 import com.ruoyi.order.api.model.TSettlementConfirm;
@@ -42,6 +43,15 @@
 
     @PostMapping(value = "/t-charging-order/getBySiteIdAndTime")
     R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto);
+    
+    
+    /**
+     * 根据站点id和时间区间查询订单数据
+     * @param chargingPercentProvinceDto
+     * @return
+     */
+    @PostMapping(value = "/t-charging-order/getOrderBySiteIdAndTime")
+    R<List<TChargingOrder>> getOrderBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto);
 
 
 
@@ -153,6 +163,17 @@
     
     
     /**
+     * 充电支付成功回调通知
+     * @param out_trade_no
+     * @param transaction_id
+     * @param attach
+     */
+    @PostMapping("/t-charging-order/chargingOrderALICallback")
+    void chargingOrderALICallback(@RequestParam("out_trade_no") String out_trade_no,
+                                  @RequestParam("transaction_id") String transaction_id,
+                                  @RequestParam("attach") String attach);
+    
+    /**
      * 远程启动失败后退款回调
      * @param out_refund_no
      * @param refund_id
@@ -205,7 +226,7 @@
      * @param vo
      */
     @PostMapping("/t-charging-order/endChargeBillingCharge")
-    void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
+    R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
     
     /**
      * 获取充电订单数据
@@ -224,5 +245,58 @@
      * @return
      */
     @PostMapping("/t-charging-order/getCarChargingOrder")
-    R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime);
+    R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime,
+                                                @RequestParam("endTime") String endTime);
+    
+    
+    /**
+     * 根据车牌号查询指定时间范围内的数据
+     * @param plateNum
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @PostMapping("/t-charging-order/getCarChargingOrderByPlateNum")
+    R<List<TChargingOrder>> getCarChargingOrderByPlateNum(@RequestParam("plateNum") String plateNum, @RequestParam("startTime") String startTime,
+                                                @RequestParam("endTime") String endTime);
+    
+    
+    
+    
+    /**
+     * 添加三方平台充电订单数据
+     * @return
+     */
+    @PostMapping("/t-charging-order/addTripartitePlatformOrder")
+    R addTripartitePlatformOrder(@RequestBody AddTripartitePlatformOrder query);
+    
+    
+    /**
+     * 根据三方平台订单id获取充电数据
+     * @param startChargeSeq
+     * @return
+     */
+    @PostMapping("/t-charging-order/getChargingOrderByStartChargeSeq")
+    R<TChargingOrder> getChargingOrderByStartChargeSeq(@RequestParam("startChargeSeq") String startChargeSeq);
+    
+    
+    
+    /**
+     * 根据三方平台订单ids获取充电数据
+     * @param startChargeSeqs
+     * @return
+     */
+    @PostMapping("/t-charging-order/getChargingOrderByStartChargeSeqs")
+    R<List<TChargingOrder>> getChargingOrderByStartChargeSeqs(@RequestParam("startChargeSeqs") List<String> startChargeSeqs);
+    
+    
+    
+    
+    /**
+     * 三方平台请求停止充电
+     * @param startChargeSeq
+     * @return
+     */
+    @PostMapping("/t-charging-order/tripartitePlatformStopCharge")
+    R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);
 }

--
Gitblit v1.7.1