From 385f96f1011a878f676b82fed5507d96e4e71c77 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 15 Mar 2023 15:05:58 +0800
Subject: [PATCH] update

---
 .../src/main/java/com/jsowell/service/OrderService.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 fec7cabfe..2cd63b988 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -471,9 +471,11 @@ public class OrderService {
 			String chargingTime = "0分钟";
 			if (orderVO.getStartTime() != null) {
 				Date startTimeDate = DateUtils.parseDate(orderVO.getStartTime());
-				Date endTimeDate = new Date();
+				Date endTimeDate;
 				if (orderVO.getEndTime() != null) {
 					endTimeDate = DateUtils.parseDate(orderVO.getEndTime());
+				} else {
+					endTimeDate = new Date();
 				}
 				// 计算出两个时间差
 				chargingTime = DateUtils.getDatePoor(endTimeDate, startTimeDate);