jiaosong
2023-10-16 c49f540e8d63958c37cde739b874d6fa0a5b92d4
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -438,24 +438,10 @@
            memberRides.setRentSiteId(locks.getSiteId());
            memberRides.setRentLockId(locks.getId());
            memberRides.setOrdreId(goodsorder.getId());
            memberRides.setRentDate(new Date());
            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);
            //临时使用
            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);
@@ -491,7 +477,8 @@
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 该车型暂时不能借车操作哦,请更换其他车型重试哦!");
        }
        QueryWrapper<PricingDetail> detail = new QueryWrapper<>();
        detail.lambda().eq(PricingDetail::getPricePramId,bike.getParamId());
        detail.lambda().eq(PricingDetail::getBikeTypeId,bike.getParamId());
        detail.lambda().eq(PricingDetail::getPricePramId,pp.getId());
        detail.lambda().eq(PricingDetail::getIsdeleted,Constants.ZERO);
        detail.lambda().last(" limit 1" ) ;
        //查询优先级最高(排序码最小的)可用配价方案
@@ -503,6 +490,11 @@
        Holidays holidays = new Holidays();
        holidays.setHoliday(nowDate);
        holidays.setIsdeleted(Constants.ZERO);
        memberRides.setBikeCode(bike.getCode());
        memberRides.setParamId(bike.getParamId());
        bike.setLastRentDate(new Date());
        bike.setStatus(Constants.ONE);
        bikesMapper.updateById(bike);
        //检查是否节假日
        if(holidaysMapper.selectCount(new QueryWrapper<>(holidays)) >0){
            //如果是节假日
@@ -598,7 +590,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) {
@@ -653,7 +646,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<>();