Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

sen

2025-09-10 9578ae952527cdafc64d642f5183aa60ef92b7f2

 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;



@@ -215,9 +219,24 @@
            logger.info("要求出发时间"+ dateToStr+"，领取钥匙超时"+keyTimeout+"个小时");
            return AjaxResult.error("要求出发时间"+ dateToStr+"，领取钥匙超时"+keyTimeout+"个小时");
        }
        AjaxResult success = new AjaxResult(0, "成功",2);
        AjaxResult success = new AjaxResult(0, "成功",1);
        success.put("boxNum",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("boxNum",smartLockerApplication.getLockerPort());
        logger.info("成功返回{}",success);
        return success;
    }
}