价格配置

jiangping

2023-10-16 e39cf355c8b6c42b4c6983311d5b21cf589e213c

价格配置

 server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java

@@ -19,7 +19,7 @@
            try {
                // host为主机名，clientid即连接MQTT的客户端ID，一般以唯一标识符表示，MemoryPersistence设置clientid的保存形式，默认为以内存保存
//                String clientId =config.getClientid()+ Constants.getUUID();
                String clientId =config.getClientid();
                String clientId =config.getClientid()+"001";
                client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
                // MQTT的连接设置
                MqttConnectOptions   options = new MqttConnectOptions();
@@ -51,7 +51,7 @@
            try {
                // host为主机名，clientid即连接MQTT的客户端ID，一般以唯一标识符表示，MemoryPersistence设置clientid的保存形式，默认为以内存保存
//                String clientId =config.getClientid()+ Constants.getUUID();
                String clientId =config.getSubclientid();
                String clientId =config.getSubclientid()+"001";
                subClient = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
                // MQTT的连接设置
                MqttConnectOptions   options = new MqttConnectOptions();

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

@@ -36,6 +36,7 @@
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -74,10 +75,13 @@
    @Autowired
    private SitesMapper sitesMapper;
    @Autowired
    private BaseParamMapper baseParamMapper;
    @Autowired
    private BikesMapper bikesMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    @Lazy
    private GoodsorderService goodsorderService;


@@ -446,8 +450,6 @@
            memberRidesMapper.insert(memberRides);
            BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
        }


        return memberRidesDetailResponse;
    }

@@ -523,7 +525,6 @@
        MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
        BeanUtils.copyProperties(memberRides,memberRidesDetailResponse);
        return memberRidesDetailResponse;

    }

    /**
@@ -540,7 +541,6 @@
        Locks model = dealLockAndSite(locks);
        //车辆记录
        Bikes bikes = dealBikesByParam(model);

        //状态，0闭合, 1打开，2运行中, 3异常
        if(model.getStatus() == Constants.LockStatus.open){
            //如果是开锁业务，判断是否有开锁中的信息
@@ -588,10 +588,28 @@

    }

    //TODO-----JP------------根据车辆code分析车辆类型，待确认方案-------------------
    /**
     -----------根据车辆code分析车辆类型，待确认方案-------------------
     *
     */
    private String getBileTypeByCode(String bikeCode) {
        int temp=1+(int)(Math.random()*(8));
        return temp+"";
//      int temp=1+(int)(Math.random()*(8));
        if(StringUtils.isBlank(bikeCode)){
            return  null;
        }
        String type = bikeCode.substring(0,1);
        if("1,2,3,4,5,6,7,8".contains(type)){
            return null;
        }
        BaseParam param = new BaseParam();
        param.setIsdeleted(Constants.ZERO);
        param.setType(Constants.THREE);
        param.setSortnum(Integer.parseInt(type));
        param = baseParamMapper.selectOne(new QueryWrapper<>(param).lambda().last("limit 1" ));
        if(param == null){
            return  null;
        }
        return param.getId();
    }

    private Locks dealLockAndSite(Locks locks) {
@@ -610,7 +628,6 @@
            //新增锁头
            sitesMapper.insert(sites);
        }

        if(model == null){
            //如果锁头不存在，判断存储
            model = new Locks();
@@ -632,7 +649,6 @@
            model.setBikeCode(locks.getBikeCode());
            model.setStatus(locks.getStatus());
            locksMapper.update(null, new QueryWrapper<>(model));

        }
        model.setSites(sites);
        return  model;

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

@@ -56,13 +56,13 @@
        insert.setPricePramId(pricingDetail.getPricePramId());
        insert.setBikeTypeId(pricingDetail.getBikeTypeId());
        insert.setBaseTime(pricingDetail.getBaseTime());
        insert.setBasePrice(pricingDetail.getBasePrice());
        insert.setUnitTime(pricingDetail.getUnitTime());
        insert.setUnitPrice(pricingDetail.getUnitPrice());
        insert.setHolidayBaseTime(pricingDetail.getHolidayBaseTime());
        insert.setHolidayBasePrice(pricingDetail.getHolidayBasePrice());
        insert.setHolidayUnitTime(pricingDetail.getHolidayUnitTime());
        insert.setHolidayUnitPrice(pricingDetail.getHolidayUnitPrice());
        insert.setBasePrice(Constants.formatDecimalNum(pricingDetail.getBasePrice()).multiply(new BigDecimal(100)));
        insert.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()).multiply(new BigDecimal(100)));
        insert.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
        insert.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
        insert.setInfo(pricingDetail.getInfo());
        insert.setTitle(pricingDetail.getTitle());
        pricingDetailMapper.insert(pricingDetail);
@@ -134,6 +134,11 @@
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        pricingDetail.setEditDate(new Date());
        pricingDetail.setEditor(principal.getId());
        pricingDetail.setBasePrice(Constants.formatDecimalNum(pricingDetail.getBasePrice()).multiply(new BigDecimal(100)));
        pricingDetail.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()).multiply(new BigDecimal(100)));
        pricingDetail.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
        pricingDetail.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));

        pricingDetailMapper.updateById(pricingDetail);
    }

@@ -149,13 +154,27 @@

    @Override
    public PricingDetail findById(String id) {
        return pricingDetailMapper.selectById(id);
        PricingDetail model =  pricingDetailMapper.selectById(id);
        if(model !=null ){
            model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
            model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
            model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
            model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
        }
        return model;
    }

    @Override
    public PricingDetail findOne(PricingDetail pricingDetail) {
        QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>(pricingDetail);
        return pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
        PricingDetail model =  pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
        if(model !=null ){
            model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
            model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
            model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
            model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
        }
        return model;
    }

    @Override
@@ -165,7 +184,16 @@
                .eq(BaseParam::getType,Constants.THREE);
        wrapper.selectAll(PricingDetail.class)
                .selectAs(BaseParam::getName,PricingDetail::getBikeTypeName);
        return pricingDetailJoinMapper.selectJoinList(PricingDetail.class,wrapper);
        List<PricingDetail> result = pricingDetailJoinMapper.selectJoinList(PricingDetail.class,wrapper);
        if(result!=null){
            for(PricingDetail model :result){
                model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
                model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
                model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
                model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
            }
        }
        return result;
    }

    @Override
@@ -236,7 +264,16 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(pricingDetailMapper.selectPage(page, queryWrapper));
        IPage<PricingDetail> result =pricingDetailMapper.selectPage(page, queryWrapper);
        if(result.getRecords()!= null ){
            for(PricingDetail model : result.getRecords()){
                model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
                model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
                model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
                model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
            }
        }
        return PageData.from(result);
    }

    @Override