From 1bcc12e18a21e4fd5a297d710fe94617f74d398a Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 14 五月 2026 10:01:49 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.0' into 2.0.1

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 18a12bc..4ba6144 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -379,7 +379,7 @@
 			}
 			myChargingOrderInfo.setPower(power);
 		}
-		myChargingOrderInfo.setActionable(myChargingOrderInfo.getEndTime() + 604800000L < System.currentTimeMillis() ? 0 : 1);
+		myChargingOrderInfo.setActionable(myChargingOrderInfo.getEndTime()==null || myChargingOrderInfo.getEndTime() + 604800000L < System.currentTimeMillis() ? 0 : 1);
 		long count = orderAppealService.count(Wrappers.lambdaQuery(TOrderAppeal.class)
 				.eq(TOrderAppeal::getOrderId, id));
 		myChargingOrderInfo.setIsAppeal(count > 0 ? 0 : 1);

--
Gitblit v1.7.1