From b23d80cdbc375643e6a94122c6507fca79e18103 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 18 九月 2025 17:28:58 +0800
Subject: [PATCH] 新增要求出发时间
---
service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
index de6eddf..60bcd5a 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
@@ -214,13 +214,13 @@
}
Integer keyTimeout = keyCollectionInfo.getKeyTimeout();
if (keyTimeout!=null && keyTimeout>24){
- Date estimatedDepartureTime = keyCollectionInfo.getEstimatedDepartureTime();
+ Date estimatedDepartureTime = keyCollectionInfo.getRequiredDepartureTime();
String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, estimatedDepartureTime);
logger.info("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
}
AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
- success.put("boxNum",keyCollectionInfo.getBoxNum());
+ success.put("boxNumber",keyCollectionInfo.getBoxNum());
logger.info("鎴愬姛杩斿洖{}",success);
return success;
}
@@ -235,7 +235,7 @@
smartLockerApplication.setReceiveTime(new Date());
smartLockerApplicationMapper.updateSmartLockerApplication(smartLockerApplication);
AjaxResult success = new AjaxResult(0, "鎴愬姛",1);
- success.put("boxNum",smartLockerApplication.getLockerPort());
+ success.put("boxNumber",smartLockerApplication.getLockerPort());
logger.info("鎴愬姛杩斿洖{}",success);
return success;
}
--
Gitblit v1.8.0