bug

jiangping

2023-11-08 bbcde9efaa2a43a1d95442d9624258eae6a7659c

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

@@ -177,10 +177,12 @@
    public MemberRides findJoinById(String id) {

        MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId);
        queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                    .leftJoin(Member.class,Member::getId,MemberRides::getMemberId);
        queryWrapper.eq(MemberRides::getId, id);
        queryWrapper.selectAll(MemberRides.class);
        queryWrapper.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType) ;
        queryWrapper.selectAs(BaseParam::getName,MemberRidesDTO::getBikeType);
        queryWrapper.selectAs(Member::getOpenid,MemberRides::getMemberOpenid);
        queryWrapper.last("limit 1");

        return memberRidesJoinMapper.selectJoinOne(MemberRides.class, queryWrapper);
@@ -366,7 +368,7 @@
        update.setBackType(Constants.ONE);
        update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
        update.setBackSiteId(collect.get(Constants.FORCE_BACK_SITE).getCode());
        update.setBackLockId(collect.get(Constants.FORCE_BACK_LOCK).getCode());
        update.setBackLockId(Constants.formatIntegerFromStr(collect.get(Constants.FORCE_BACK_LOCK).getCode()));
        Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
        Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
        //计算骑行计费时长
@@ -458,17 +460,17 @@
        //查询锁头是否存在车辆 以及是否正常
        if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
            locks =new Locks();
            locks.setCode(codes[1]);
            locks.setCode(Constants.formatIntegerFromStr(codes[1]));
            locks.setSiteId(codes[0]);
            deviceService.getLockInfo(locks);
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "当前扫码锁头状态错误，已尝试更新锁头状态，请稍后重试！");
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "当前车辆暂时无法使用，请稍后重试或更换其它车辆~");
        }
        if (StringUtils.isBlank(locks.getBikeCode())) {
            locks =new Locks();
            locks.setCode(codes[1]);
            locks.setCode(Constants.formatIntegerFromStr(codes[1]));
            locks.setSiteId(codes[0]);
            deviceService.getLockInfo(locks);
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "当前扫码锁头无车辆信息，已尝试更新锁头状态，请稍后重试！");
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "当前车辆暂时无法使用，请稍后重试或更换其它车辆！");
        }
        MemberRides memberRides = new MemberRides();
        //根据车型查询计价方案
@@ -576,7 +578,7 @@
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public  int mqttLockInfoEvent(Locks locks){
        if(StringUtils.isBlank(locks.getCode()) ||StringUtils.isBlank(locks.getSiteId())){
        if( locks.getCode() ==null ||StringUtils.isBlank(locks.getSiteId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"锁头信息上报参数错误！");
        }
        //判断检查处理站点锁头信息
@@ -601,6 +603,35 @@
            update.setId(memberRides.getId());
            //（更新请求开锁中的锁头关联的骑行记录）
            memberRidesMapper.updateById( update);
        }else   if(locks.getStatus() == Constants.LockStatus.closed ){
            //如果是关锁业务，判断触发还车
            if(StringUtils.isNotBlank(locks.getBikeCode())){
                MemberRides mbikes = new MemberRides();
                mbikes.setBackLockId(locks.getCode());
                mbikes.setBackSiteId(locks.getSiteId());
                mbikes.setBikeCode(locks.getBikeCode());
                mqttCloseBikeEventDo(mbikes);
               /* if(StringUtils.isBlank(locks.getBikeCode()) ||StringUtils.isBlank(locks.getCode())
                        ||StringUtils.isBlank(bikes.getSiteId())){
                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"还车上报参数错误！");
                }
                QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
                List<Integer> statusList = new ArrayList<>();
                statusList.add(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
                statusList.add(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
                wrapper.lambda().eq(MemberRides::getBikeCode, locks.getBikeCode());
                wrapper.lambda().in(MemberRides::getStatus, statusList);
                wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
                //根据车辆编码查询骑行中的骑行记录信息，如果有进行还车操作
                List<MemberRides> list = memberRidesMapper.selectList(wrapper);
//        MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit  1"));
                if(list!=null){
                    //进行
                    for(MemberRides memberRides : list){
                        dealMemberRidesBack(memberRides,bikes);
                    }
                }*/
            }
        }
        return 0;
    }
@@ -620,6 +651,7 @@
                // 大于阈值
                if (between > 2){
                    s.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
                    s.setEditDate(new Date());
                    memberRidesMapper.updateById(s);
                }
            });
@@ -777,9 +809,13 @@
        locks.setStatus(bikes.getStatus());
        //处理锁头数据
         mqttLockInfoEvent(locks);
        //免费骑行时长查询，数据字典配置
        if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
          throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"还车上报参数错误！");
         mqttCloseBikeEventDo(bikes);
        return  0;
    }

    private void mqttCloseBikeEventDo(MemberRides bikes) {
        if(StringUtils.isBlank(bikes.getBikeCode()) || bikes.getBackLockId() == null ||StringUtils.isBlank(bikes.getBackSiteId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"还车上报参数错误！");
        }
        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
        List<Integer> statusList = new ArrayList<>();
@@ -789,12 +825,14 @@
        wrapper.lambda().in(MemberRides::getStatus, statusList);
        wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
        //根据车辆编码查询骑行中的骑行记录信息，如果有进行还车操作
        MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit  1"));
        if(memberRides!=null){
        List<MemberRides> list = memberRidesMapper.selectList(wrapper);
//        MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit  1"));
        if(list!=null){
            //进行
            dealMemberRidesBack(memberRides,bikes);
            for(MemberRides memberRides : list){
                dealMemberRidesBack(memberRides,bikes);
            }
        }
        return  0;
    }

    private void dealMemberRidesBack(MemberRides memberRides,MemberRides param) {