Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike int...

jiangping

2023-10-13 d800ed8f4f9c3a6dbd1b9833afc36a6a768495b9

 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);
@@ -427,21 +442,6 @@
            memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.LOCKING.getKey());
            memberRides.setCloseStatus(Constants.ZERO);

            //临时使用
            Bikes bikes = bikesMapper.selectById(locks.getBikeCode());
            if (Objects.isNull(bikes)) {
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "未查询到自行车信息");
            }
            memberRides.setBikeCode(bikes.getId());
            memberRides.setParamId(bikes.getParamId());
            memberRides.setRentSiteId(locks.getSiteId());
            memberRides.setRentLockId(locks.getId());
            memberRides.setRentDate(new Date());
            memberRides.setBasePrice(new BigDecimal(3990L));
            memberRides.setBaseTime(1800);
            memberRides.setUnitTime(600);
            memberRides.setUnitPrice(new BigDecimal(1000L));

            memberRidesMapper.insert(memberRides);
            BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
        }
@@ -488,6 +488,10 @@
        Holidays holidays = new Holidays();
        holidays.setHoliday(nowDate);
        holidays.setIsdeleted(Constants.ZERO);
        memberRides.setBikeCode(bike.getCode());
        bike.setLastRentDate(new Date());
        bike.setStatus(Constants.ONE);
        bikesMapper.updateById(bike);
        //检查是否节假日
        if(holidaysMapper.selectCount(new QueryWrapper<>(holidays)) >0){
            //如果是节假日
@@ -583,7 +587,8 @@

    //TODO-----JP------------根据车辆code分析车辆类型，待确认方案-------------------
    private String getBileTypeByCode(String bikeCode) {
        return null;
        int temp=1+(int)(Math.random()*(8));
        return temp+"";
    }

    private Locks dealLockAndSite(Locks locks) {
@@ -638,7 +643,7 @@
    @Override
    public  int mqttCloseBikeEvent(MemberRides bikes){
        //免费骑行时长查询，数据字典配置
        if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getRentLockId())){
        if(StringUtils.isBlank(bikes.getBikeCode()) ||StringUtils.isBlank(bikes.getBackLockId())||StringUtils.isBlank(bikes.getBackSiteId())){
          throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"还车上报参数错误！");
        }
        QueryWrapper<MemberRides> wrapper = new QueryWrapper<>();
@@ -651,13 +656,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 +677,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);
    }