开发

jiangping

2023-10-13 c1a2d61c91cc28dec10d03f8735a4cf28add3b79

 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java

@@ -352,6 +352,21 @@
        //修改后
        String after = JSONObject.toJSONString(update);

        //插入虚拟锁头和站点上-------
        Bikes bike = new Bikes();
        bike.setIsdeleted(Constants.ZERO);
        bike.setCode(model.getBikeCode());
        bike.setSiteId(update.getBackSiteId());
        bike.setLockId(update.getBackLockId());
        if(bikesMapper.selectCount(new QueryWrapper<>(bike)) == 0){
            bike.setId(Constants.getUUID());
            bike.setParamId(model.getParamId());
            bike.setLastBackDate(model.getRentDate());
            bike.setStatus(Constants.ZERO);
            bike.setInfo("强制还车绑定");
            bikesMapper.insert(bike);
        }

        ActionLog log = new ActionLog();
        log.setId(Constants.getUUID());
        log.setIsdeleted(Constants.ZERO);
@@ -651,13 +666,10 @@
            //进行
            dealMemberRidesBack(memberRides,bikes);
        }

        return  0;

    }

    private void dealMemberRidesBack(MemberRides memberRides,MemberRides param) {

        int freeTime = 0;
        try {
            freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
@@ -675,6 +687,20 @@
        update.setDuration(duration>0?duration:0);
        update.setBackType(Constants.ONE);
        update.setBackInfo("用户正常还车");

        Bikes bikes = new Bikes();
        bikes.setSiteId(memberRides.getBackSiteId());
        bikes.setLockId(memberRides.getBackLockId());
//        bikes.setCode(memberRides.getBikeCode());
        bikes = bikesMapper.selectById(new QueryWrapper<>(bikes).last("limit 1"));
        if(bikes != null ) {
            UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
            updateWrapper.lambda().set(Bikes::getId, bikes.getId());
            updateWrapper.lambda().set(Bikes::getEditDate,new Date());
            updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
            //更新自行车最后还车时间
            bikesMapper.updateById(bikes);
        }
        //更新还车记录为已还车
        memberRidesMapper.updateById(update);
    }