jiangping
2025-02-17 5db5a84cee050795051a27181982bcc9a64ff19e
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -386,6 +386,7 @@
        Bikes bike = new Bikes();
        bike.setIsdeleted(Constants.ZERO);
        bike.setCode(model.getBikeCode());
        bike.setType(model.getType());
        bike.setSiteId(update.getBackSiteId());
        bike.setLockId(update.getBackLockId());
        if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
@@ -393,6 +394,7 @@
            bike.setParamId(model.getParamId());
            bike.setLastBackDate(model.getRentDate());
            bike.setStatus(Constants.ZERO);
            bike.setType(Constants.ZERO);
            bike.setInfo("强制还车绑定");
            bikesMapper.insert(bike);
        }
@@ -477,6 +479,7 @@
                locks =new Locks();
                locks.setCode(Constants.formatIntegerFromStr(codes[1]));
                locks.setSiteId(codes[0]);
                locks.setId(codes[1]);
                deviceService.getLockInfo(locks);
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "当前车辆暂时无法使用,请稍后重试或更换其它车辆!");
            }
@@ -495,10 +498,10 @@
                memberRides.setRentLockId(locks.getCode());
                memberRides.setOrdreId(goodsorder.getId());
                memberRides.setRentDate(new Date());
                memberRides.setType(Constants.ZERO);
                memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
                memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
                memberRides.setCloseStatus(Constants.ZERO);
                memberRidesMapper.insert(memberRides);
                BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
            }else{
@@ -670,9 +673,9 @@
        if (!CollectionUtils.isEmpty(memberRides)){
            memberRides.forEach(s->{
                Integer between = DateUtil.betweenSeconds(s.getCreateDate(), new Date());
                // 大于阈值
                // 大于阈值,自动设为开锁成功(如实际未开锁,联系站点管理员后台进行强制还车操作)
                if (between >= 20){
                    s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
                    s.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
                    s.setEditDate(new Date());
                    memberRidesMapper.updateById(s);
                }
@@ -716,6 +719,7 @@
            bikes.setEditDate(bikes.getCreateDate());
            bikes.setSiteId(model.getSiteId());
            bikes.setLockId(model.getCode());
            bikes.setType(Constants.ZERO);
            bikes.setCode(model.getBikeCode());
            bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
            bikesMapper.insert(bikes);