From e6fde3df693e13282b6f8ff824b7d046c590cfed Mon Sep 17 00:00:00 2001 From: "bl\\GQS02" Date: Thu, 6 Nov 2025 20:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BA=A4=E6=98=93=E6=B5=81?= =?UTF-8?q?=E6=B0=B4=E5=8F=B7=E6=9F=A5=E8=AF=A20x3b=E6=8A=A5=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/service/OrderService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 6b1c2f252..4ee1d5ba8 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -775,16 +775,16 @@ public class OrderService { String chargingDegree = dto.getChargingDegree(); // 获取订单结算时间 - Date settlementTime = orderBasicInfo.getSettlementTime(); + // Date settlementTime = orderBasicInfo.getSettlementTime(); // 获取订单停止充电时间 - Date chargeEndTime = orderBasicInfo.getChargeEndTime(); + // Date chargeEndTime = orderBasicInfo.getChargeEndTime(); // 如果订单结算时间与订单停止充电时间都为空，则打印错误信息并返回 - if (settlementTime == null && chargeEndTime == null) { - log.error("人工结算订单 error -订单结算时间与订单停止充电时间都为空"); - return false; - } + // if (settlementTime == null && chargeEndTime == null) { + // log.error("人工结算订单 error -订单结算时间与订单停止充电时间都为空"); + // return false; + // } // LocalDateTime localDateTime = DateUtils.date2LocalDateTime(settlementTime != null ? settlementTime : chargeEndTime); // 开始时间为localDateTime减30秒