From 2af3951b94fbb902ccb70bcd425c3ef70ed3c823 Mon Sep 17 00:00:00 2001
From: 19173159168 <majian314@163.com>
Date: Sun, 24 Aug 2025 19:25:40 +0800
Subject: [PATCH] bug

---
 .../ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java    | 5 +++--
 .../src/main/resources/templates/operation/car/car.html      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
index 54c988e..18d6346 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java
@@ -122,9 +122,10 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
         zcOrderMainMapper.deleteZcOrderSubByOrderId(orderId);
         return zcOrderMainMapper.deleteZcOrderMainByOrderId(orderId);
     }
-
+    @Transactional
     @Override
     public int updateManualEndOrder(Long orderId) {
+        ZcOrderMain queryOrder = zcOrderMainMapper.selectZcOrderMainByOrderId(orderId);
         //订单手动结束逻辑待完善
         //1、修改订单状态，2计算逾期费用(如果有逾期)，3、释放车辆状态
         //1、修改订单状态
@@ -134,7 +135,7 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService
         zcOrderMain.setUpdateBy(ShiroUtils.getSysUser().getLoginName());
         zcOrderMain.setUpdateTime(DateUtils.getNowDate());
         // 2计算逾期费用
-        long overdueDays = DateUtils.daysBetween(DateUtils.getNowDate(),zcOrderMain.getEndRentTime());
+        long overdueDays = DateUtils.daysBetween(DateUtils.getNowDate(),queryOrder.getEndRentTime());
         if(overdueDays > 0) {
             zcOrderMain.setOverdueDays(overdueDays);
             zcOrderMain.setOverdueAmount(zcOrderMain.getOverdueFee().multiply(new BigDecimal(zcOrderMain.getOverdueDays())));
diff --git a/ruoyi-admin/src/main/resources/templates/operation/car/car.html b/ruoyi-admin/src/main/resources/templates/operation/car/car.html
index 7aca937..c66a607 100644
--- a/ruoyi-admin/src/main/resources/templates/operation/car/car.html
+++ b/ruoyi-admin/src/main/resources/templates/operation/car/car.html
@@ -28,7 +28,7 @@
 
                             <li>
                                 <label>所属运营商：</label>
-                                <select name="operatingId" id="operatingId" >
+                                <select name="operatorId" id="operatorId" >
                                     <option value="">请选择所属运营商</option>
                                     <option th:each="company : ${companyList}" th:value="${company.id}" th:text="${company.companyName}"></option>
                                 </select>