From 91df8c9b3dac121493b03c9ce1890953c1879603 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 16 三月 2025 13:00:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 b9c35e2..cad5ef5 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
@@ -400,11 +400,12 @@
@GetMapping(value = "/pay/order/charging/details")
@ApiOperation(value = "充电明细", tags = {"管理后台-支付订单-订单信息"})
public R<List<TChargingOrderAccountingStrategy>> chargingDetail(Long orderId) {
+ TChargingOrder chargingOrder = chargingOrderService.getById(orderId);
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId)
.orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
- LocalDateTime createTime = tChargingOrderAccountingStrategy.getCreateTime();
+ LocalDateTime createTime = chargingOrder.getStartTime();
String format = createTime.format(formatter);
String startTime = tChargingOrderAccountingStrategy.getStartTime();
if("00:00".equals(startTime)){
@@ -570,7 +571,7 @@
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, strategyId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
- LocalDateTime createTime = tChargingOrderAccountingStrategy.getCreateTime();
+ LocalDateTime createTime = byId.getStartTime();
String format = createTime.format(formatter);
String startTime = tChargingOrderAccountingStrategy.getStartTime();
if("00:00".equals(startTime)){
--
Gitblit v1.7.1