From f3a33392a04c30ec58282e3ff68ae58fc5b7a971 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期四, 16 十月 2025 17:32:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
index 986cdb2..88c6763 100644
--- a/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
+++ b/api/src/main/java/com/ruoyi/api/third/controller/LockerApiController.java
@@ -68,11 +68,26 @@
String boxNum = keyCollectionInfo.getBoxNum();
requestLog.setBoxNum(boxNum);
+
}
requestLog.setType(0);
logService.insertRequestLog(requestLog);
- return keyCollectionInfoService.takeReview(keyCollectionInfo);
+ AjaxResult ajaxResult = keyCollectionInfoService.takeReview(keyCollectionInfo);
+ if (!ajaxResult.get("code").equals(0)){
+ ajaxResult = keyCollectionInfoService.selectSmartLockerApplication(takeReviewDto);
+
+ }else {
+ if (keyCollectionInfo != null) {
+ String boxNum = (String) ajaxResult.get("boxNumber");
+ if (StringUtils.isEmpty(boxNum) || (Integer.parseInt(boxNum) < 1 && Integer.parseInt(boxNum) > 60)) {
+ boxNum = keyCollectionInfoService.selectCwBoxNum(keyCollectionInfo.getLicensePlateNumber());
+ ajaxResult.put("boxNumber",boxNum);
+ }
+
+ }
+ }
+ return ajaxResult;
}
--
Gitblit v1.8.0