From 3650ce7f5d42d1bef58abea9693f20d1f209d3b0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 10 十月 2026 14:02:27 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 162 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 2d3875b..d762d88 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,7 +5,10 @@
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.dto.DeviceStartChargingDTO;
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;
@@ -18,6 +21,7 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -42,6 +46,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);
@@ -86,6 +99,13 @@
*/
@PostMapping(value = "/t-charging-order/getOrderByCode/{code}")
R<TChargingOrder> getOrderByCode(@PathVariable("code") String code);
+
+ /**
+ * 根据订单编号前缀将握手 VIN 写入对应订单表
+ */
+ @PostMapping(value = "/t-charging-order/updateHandshakeVin")
+ R<Boolean> updateHandshakeVin(@RequestParam("orderCode") String orderCode,
+ @RequestParam("vin") String vin);
/**
@@ -153,6 +173,28 @@
/**
+ * 充电支付成功回调通知
+ * @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_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
* @param refund_id
@@ -205,7 +247,7 @@
* @param vo
*/
@PostMapping("/t-charging-order/endChargeBillingCharge")
- void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
+ R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
/**
* 获取充电订单数据
@@ -214,8 +256,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
@@ -224,5 +273,114 @@
* @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);
+
+ /**
+ * 充电桩大屏 获取站点集合中总的充电量
+ */
+ @GetMapping("/t-charging-order/getSumDegreeBySiteIds")
+ R<BigDecimal> getSumDegreeBySiteIds(@RequestParam("siteIds") List<Integer> SiteIds);
+
+ /**
+ * 充电桩大屏 获取站点集合中累计充电量(已结束+已支付订单口径, 与 large-screen/summary 一致)
+ */
+ @GetMapping("/t-charging-order/getLargeScreenTotalCapacity")
+ R<BigDecimal> getLargeScreenTotalCapacity(@RequestParam("siteIds") List<Integer> siteIds);
+
+ /**
+ * 查询指定站点中实际发生过充电的用户ID
+ */
+ @PostMapping("/t-charging-order/getAppUserIdsBySiteIds")
+ R<List<Long>> getAppUserIdsBySiteIds(@RequestBody List<Integer> siteIds);
+
+ @PostMapping("/t-vin-charging-order/inner/charging-status")
+ R<List<VinChargingStatusVO>> getChargingVinStatus(@RequestBody List<Long> vinIds);
+
+
+// /**
+// * 获取充电订单列表
+// * @param statusList
+// * @return
+// */
+// @GetMapping("/t-charging-order/getOrderListByStatus")
+// R<List<TChargingOrder>> getOrderListByStatus(List<Integer> statusList);
+
+ /**
+ * 添加订单
+ * @param chargingOrder
+ * @return
+ */
+ @PostMapping("/t-charging-order/addChargingOrder")
+ R<Long> addChargingOrder(@RequestBody TChargingOrder chargingOrder);
+
+ /**
+ * 设备主动发起充电（刷卡/VIN码）鉴权建单
+ * @param dto 启动鉴权请求（桩编码、枪编号、启动方式、账户、卡密码）
+ * @return 鉴权结果（含订单编号与失败原因）
+ */
+ @PostMapping("/t-charging-order/inner/device-start-charging")
+ R<DeviceStartChargingVO> deviceStartCharging(@RequestBody DeviceStartChargingDTO dto);
+
+ /**
+ * 统计公司名下进行中的充电订单数（三表合计，状态 2=启动中/3=充电中/4=停止中，
+ * 账户模式切换：分配→共享 前校验使用）
+ *
+ * @param companyId 所属公司ID
+ * @return 进行中订单数
+ */
+ @PostMapping("/t-charging-order/inner/count-active-by-company")
+ R<Integer> countActiveByCompany(@RequestParam("companyId") Integer companyId);
}
--
Gitblit v1.7.1