From c0f6fb84a98db212b0780f44430d4e0cdf1b0302 Mon Sep 17 00:00:00 2001 From: wujianwei <wjw@11.com> Date: 星期三, 10 九月 2025 15:20:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master --- service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 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 ea58f52..396bc7f 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 @@ -9,7 +9,9 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.cwgl.domain.RequestLog; +import com.ruoyi.cwgl.domain.SmartLockerApplication; import com.ruoyi.cwgl.domain.dto.TakeReviewDto; +import com.ruoyi.cwgl.mapper.SmartLockerApplicationMapper; import com.ruoyi.cwgl.service.IRequestLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -41,6 +43,8 @@ protected final Logger logger = LoggerFactory.getLogger(getClass()); @Resource private KeyCollectionInfoMapper keyCollectionInfoMapper; + @Resource + private SmartLockerApplicationMapper smartLockerApplicationMapper; @@ -216,7 +220,22 @@ 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; + } + + @Override + public AjaxResult selectSmartLockerApplication(TakeReviewDto takeReviewDto) { + SmartLockerApplication smartLockerApplication =smartLockerApplicationMapper.selectSmartLockerApplication(takeReviewDto); + if (smartLockerApplication == null){ + return AjaxResult.error("鏌ユ棤绗﹀悎瑕佹眰鐨勮皟搴﹀崟锛岃鑱旂郴璋冨害浜哄憳",3); + } + smartLockerApplication.setStatus(2); + smartLockerApplication.setReceiveTime(new Date()); + smartLockerApplicationMapper.updateSmartLockerApplication(smartLockerApplication); + AjaxResult success = new AjaxResult(0, "鎴愬姛",1); + success.put("boxNumber",smartLockerApplication.getLockerPort()); logger.info("鎴愬姛杩斿洖{}",success); return success; } -- Gitblit v1.8.0