bug

jiangping

2023-10-18 2a66035fa192e200ef7eb8b1cbd317e414cf6cf1

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

@@ -220,7 +220,11 @@
        queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
        queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
        queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
        queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
        queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
//        queryWrapper.eq(MemberRides::getBackType, Constants.ZERO);
        queryWrapper.in(MemberRides::getStatus,
                Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
        queryWrapper
                .selectAs(MemberRides::getId,MemberRidesDTO::getId)
                .selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
@@ -232,12 +236,14 @@
                .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
                .selectAs(MemberRides::getRentLockId,MemberRidesDTO::getRentLockId)
                .selectAs(MemberRides::getRentSiteId,MemberRidesDTO::getRentSiteId)
                .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
                .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate)
                .selectAs(MemberRides::getBackSiteId,MemberRidesDTO::getBackSiteId)
                .selectAs(MemberRides::getBackLockId,MemberRidesDTO::getBackLockId);
        return queryWrapper;
    }

    @Override
    public String getOnlineBike(String memberId){
    public MemberRides getOnlineBike(String memberId){
        MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
                .eq("isdeleted", Constants.ZERO)
                .eq("member_id",memberId)
@@ -247,7 +253,7 @@
        if(Objects.isNull(memberRides)){
            return null;
        }
        return memberRides.getBikeCode();
        return memberRides;
    }

    /**
@@ -332,7 +338,7 @@
        }
        QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
                .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
        List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
        Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));

@@ -397,6 +403,9 @@

    @Override
    public MemberRidesDetailResponse openLock(String code,String memberId) {
        if(StringUtils.isBlank(code) ||  code.split("/").length != 2){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，该站点编号不存在，请尝试更换车辆！");
        }
        //判断当前是否已支付押金
        Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
                .eq("isdeleted", Constants.ZERO)
@@ -417,12 +426,17 @@
        if (memberRidesMapper.selectCount(new QueryWrapper<MemberRides>().eq("member_id", memberId).in("status", 0, 1)) > Constants.ZERO) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "存在骑行中车辆，无法扫码");
        }
        Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>().eq("code", code).eq("isdeleted", Constants.ZERO).last("limit 1"));
        String[] codes = code.split("/");
        Locks locks = locksMapper.selectOne(new QueryWrapper<Locks>()
                .lambda().eq(Locks::getCode, codes[1])
                .eq(Locks::getSiteId, codes[0])
                .eq(Locks::getIsdeleted, Constants.ZERO)
                .last("limit 1"));
        if (Objects.isNull(locks)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "扫码无效，未查询到锁头信息");
        }
        //查询锁头是否存在车辆 以及是否正常
        if (!locks.getStatus().equals(Constants.ZERO)) {
        if (Constants.formatIntegerNum(locks.getStatus())!=Constants.ZERO) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "当前扫码锁头状态错误，无法进行开锁");
        }
        if (StringUtils.isBlank(locks.getBikeCode())) {
@@ -440,7 +454,7 @@
            memberRides.setMemberId(memberId);
            memberRides.setCreateDate(new Date());
            memberRides.setRentSiteId(locks.getSiteId());
            memberRides.setRentLockId(locks.getId());
            memberRides.setRentLockId(locks.getCode());
            memberRides.setOrdreId(goodsorder.getId());
            memberRides.setRentDate(new Date());
            memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
@@ -455,7 +469,7 @@

    private boolean isValidePricingType(Locks locks,MemberRides memberRides ) {
        Bikes bike= new Bikes();
        bike.setLockId(locks.getId());
        bike.setLockId(locks.getCode());
        bike.setSiteId(locks.getSiteId());
        //查询车辆信息
        bike = bikesMapper.selectOne(new QueryWrapper<>(bike).last("limit 1"));
@@ -464,7 +478,6 @@
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 该车型暂时不能借车操作哦，请更换其他车型重试！");
        }
        Date date =new Date();

        QueryWrapper<PricingParam> param = new QueryWrapper<>();
        param.lambda().eq(PricingParam::getStatus,Constants.ZERO);
        param.lambda().eq(PricingParam::getIsdeleted,Constants.ZERO);
@@ -533,8 +546,9 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public  int mqttLockInfoEvent(Locks locks){
        if(StringUtils.isBlank(locks.getId()) ||StringUtils.isBlank(locks.getSiteId())){
        if(StringUtils.isBlank(locks.getCode()) ||StringUtils.isBlank(locks.getSiteId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"锁头信息上报参数错误！");
        }
        //判断检查处理站点锁头信息
@@ -546,40 +560,56 @@
            //如果是开锁业务，判断是否有开锁中的信息
            MemberRides memberRides = new MemberRides();
            memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
            memberRides.setRentLockId(model.getId());
            memberRides.setRentLockId(model.getCode());
            memberRides.setRentSiteId(model.getSiteId());
            memberRides.setIsdeleted(Constants.ZERO);
            memberRides = findOne(memberRides);
            if(memberRides == null){
                return 0;
            }
            MemberRides  update = new MemberRides();
            update.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
            update.setEditDate(new Date());
            update.setId(memberRides.getId());
            //（更新请求开锁中的锁头关联的骑行记录）
            memberRidesMapper.updateById( memberRides);
            memberRidesMapper.updateById( update);
        }
        return 0;
    }

    private Bikes dealBikesByParam(Locks model) {
        if(StringUtils.isNotBlank(model.getBikeCode())){
            UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
            updateWrapper.lambda().set(Bikes::getCode, null );
            updateWrapper.lambda().set(Bikes::getParamId, null );
            updateWrapper.lambda().set(Bikes::getEditDate, new Date() );
            updateWrapper.lambda().eq(Bikes::getCode, model.getBikeCode() );
            //清空原来的自行车绑定关系
            bikesMapper.update(null, updateWrapper);
        }

        QueryWrapper<Bikes> wrapper = new QueryWrapper<>();
        wrapper.lambda().eq(Bikes::getLockId, model.getId());
        wrapper.lambda().eq(Bikes::getLockId, model.getCode());
        wrapper.lambda().eq(Bikes::getSiteId, model.getSiteId());
        Bikes bikes = bikesMapper.selectOne(wrapper.last("last 1"));
        Bikes bikes = bikesMapper.selectOne(wrapper.last("limit 1"));
        if(bikes != null ) {
            if (  StringUtils.equals(model.getBikeCode(), bikes.getCode())){
            if ( !StringUtils.equals(model.getBikeCode(), bikes.getCode())){
                //如果绑定车辆信息发生编号，更换绑定关系
                UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
                updateWrapper.lambda().set(Bikes::getId, bikes.getId());
                updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
                updateWrapper.lambda().set(Bikes::getCode,model.getBikeCode());
                updateWrapper.lambda().set(Bikes::getParamId,getBileTypeByCode(model.getBikeCode()));
                //更新自行站点锁头绑定自行车信息
                bikesMapper.updateById(bikes);
                bikesMapper.update(null,updateWrapper);
            }
        }else{
            bikes = new Bikes();
            bikes.setId(Constants.getUUID());
            bikes.setIsdeleted(Constants.ZERO);
            bikes.setCreateDate(new Date());
            bikes.setEditDate(bikes.getCreateDate());
            bikes.setSiteId(model.getSiteId());
            bikes.setLockId(model.getId());
            bikes.setLockId(model.getCode());
            bikes.setCode(model.getBikeCode());
            bikes.setParamId(getBileTypeByCode(model.getBikeCode()));
            bikesMapper.insert(bikes);
@@ -598,7 +628,7 @@
            return  null;
        }
        String type = bikeCode.substring(0,1);
        if("1,2,3,4,5,6,7,8".contains(type)){
        if(!Constants.BIKE_TYPE.contains(type)){
            return null;
        }
        BaseParam param = new BaseParam();
@@ -607,13 +637,16 @@
        param.setSortnum(Integer.parseInt(type));
        param = baseParamMapper.selectOne(new QueryWrapper<>(param).lambda().last("limit 1" ));
        if(param == null){
            return  null;
            return  type;
        }
        return param.getId();
    }

    private Locks dealLockAndSite(Locks locks) {
        Locks model =   locksMapper.selectById(locks.getId());
        Locks model = new Locks();
        model.setSiteId(locks.getSiteId());
        model.setCode(locks.getCode());
        model = locksMapper.selectOne(new QueryWrapper<>(model).last("limit 1"));
        Date date =new Date();
        //检查站点信息，不存在则新增
        Sites sites = sitesMapper.selectById(locks.getSiteId());
@@ -623,7 +656,9 @@
            sites.setCode(locks.getSiteId());
            sites.setId(locks.getSiteId());
            sites.setCreateDate(date);
            sites.setEditDate(date);
            sites.setStatus(Constants.ZERO);
            sites.setEditDate(date);
            sites.setLockNum(1);
            //新增锁头
            sitesMapper.insert(sites);
@@ -631,7 +666,7 @@
        if(model == null){
            //如果锁头不存在，判断存储
            model = new Locks();
            model.setId(locks.getId());
            model.setId(Constants.getUUID());
            model.setSiteId(locks.getSiteId());
            model.setIsdeleted(Constants.ZERO);
            model.setCode(locks.getCode());
@@ -641,14 +676,14 @@
            model.setStatus(locks.getStatus());
            locksMapper.insert(model);
        }else{
            model.setSiteId(locks.getSiteId());
            model.setIsdeleted(Constants.ZERO);
            model.setCode(locks.getCode());
            model.setId(locks.getSiteId());
            model.setEditDate(date);
            model.setBikeCode(locks.getBikeCode());
            model.setStatus(locks.getStatus());
            locksMapper.update(null, new QueryWrapper<>(model));
            UpdateWrapper<Locks> updateWrapper = new UpdateWrapper<Locks>();
            updateWrapper.lambda().eq(Locks::getCode, locks.getCode() );
            updateWrapper.lambda().eq(Locks::getSiteId, locks.getSiteId() );
            updateWrapper.lambda().set(Locks::getBikeCode, locks.getBikeCode() );
            updateWrapper.lambda().set(Locks::getStatus, locks.getStatus() );
            updateWrapper.lambda().set(Locks::getEditDate, new Date() );
            updateWrapper.lambda().set(Locks::getIsdeleted, Constants.ZERO);
            locksMapper.update(null,updateWrapper);
        }
        model.setSites(sites);
        return  model;
@@ -660,6 +695,7 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public  int mqttCloseBikeEvent(MemberRides bikes){
        //免费骑行时长查询，数据字典配置
        if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
@@ -670,7 +706,7 @@
        wrapper.lambda().eq(MemberRides::getStatus, Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
        wrapper.lambda().eq(MemberRides::getIsdeleted, Constants.ZERO);
        //根据车辆编码查询骑行中的骑行记录信息，如果有进行还车操作
        MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("last 1"));
        MemberRides memberRides = memberRidesMapper.selectOne(wrapper.last("limit  1"));
        if(memberRides!=null){
            //进行
            dealMemberRidesBack(memberRides,bikes);
@@ -692,23 +728,26 @@
        update.setBackLockId(param.getBackLockId());
        update.setBackSiteId(param.getBackSiteId());
        update.setBackCommondId(param.getBackCommondId());
        int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
//        int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
        int min = DateUtil.betweenMin(memberRides.getRentDate(),date);//实际骑行时间
        int duration = min>freeTime?min:0;
        update.setDuration(duration>0?duration:0);
        update.setBackType(Constants.ONE);
        update.setBackInfo("用户正常还车");
        update.setId(memberRides.getId());

        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"));
        bikes = bikesMapper.selectOne(new QueryWrapper<>(bikes).last("limit 1"));
        if(bikes != null ) {
            UpdateWrapper<Bikes> updateWrapper = new UpdateWrapper<>();
            updateWrapper.lambda().set(Bikes::getId, bikes.getId());
            updateWrapper.lambda().eq(Bikes::getId, bikes.getId());
            updateWrapper.lambda().set(Bikes::getEditDate,new Date());
            updateWrapper.lambda().set(Bikes::getLastBackDate,new Date());
            //更新自行车最后还车时间
            bikesMapper.updateById(bikes);
            bikesMapper.update(null,updateWrapper);
        }
        //更新还车记录为已还车
        memberRidesMapper.updateById(update);