From 4c62b64cc158ed07f18ae7060dae71f9d1e3d9fd Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 10 二月 2025 13:57:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 64340cf..ef31a30 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -361,6 +361,8 @@
if (byId.getAppUserCarId()!=null) {
List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(byId.getAppUserCarId())).getData();
payOrderChargingInfo.setCarNum(data3.get(0).getLicensePlate());
+ }else{
+ payOrderChargingInfo.setCarNum(byId.getPlateNum());
}
payOrderChargingInfo.setTChargingOrder(byId);
@@ -371,6 +373,8 @@
carid.add(byId.getAppUserCarId());
R<List<TAppUserCar>> carByIds = appUserCarClient.getCarByIds(carid);
payOrderChargingInfo.setCarNum(carByIds.getData().get(0).getLicensePlate());
+ }else{
+ payOrderChargingInfo.setCarNum(byId.getPlateNum());
}
payOrderChargingInfo.setStartTime(byId.getStartTime());
payOrderChargingInfo.setEndTime(byId.getEndTime());
@@ -515,6 +519,8 @@
chargingOrderInfoVO.setVehicleModel(data.getVehicleModel());
chargingOrderInfoVO.setVehicleUse(data.getVehicleUse());
}
+ }else{
+ chargingOrderInfoVO.setLicensePlate(byId.getPlateNum());
}
// 时段总服务费
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, strategyId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
@@ -2096,6 +2102,22 @@
/**
+ * 根据车牌号查询指定时间范围内的数据
+ * @param plateNum
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ @PostMapping("/getCarChargingOrderByPlateNum")
+ public R<List<TChargingOrder>> getCarChargingOrderByPlateNum(@RequestParam("plateNum") String plateNum, @RequestParam("startTime") String startTime,
+ @RequestParam("endTime") String endTime){
+ List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getPlateNum, plateNum).eq(TChargingOrder::getDelFlag, 0)
+ .in(TChargingOrder::getStatus, Arrays.asList(4, 5)).between(TChargingOrder::getStartTime, startTime, endTime));
+ return R.ok(list);
+ }
+
+
+ /**
* 添加三方平台充电订单数据
* @return
*/
--
Gitblit v1.7.1