修改bug

Pu Zhibing

5 天以前 5d43619275aec081d878602813fa42255c17e5ff

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java

@@ -97,7 +97,9 @@
        first = baseWarppers.stream().filter(s->s.getId() == 2).findFirst();
        if(first.isPresent()){
            serverCarModelWarpper = this.getTextPrice(query.getId(), distance1_, duration_, 0, 2, geocode);
            price.add(serverCarModelWarpper);
            if(serverCarModelWarpper!=null){
                price.add(serverCarModelWarpper);
            }
        }
        return ResultUtil.success(price);
    }
@@ -127,15 +129,19 @@
     * @throws Exception
     */
    public List<ServerCarModelWarpper> getPrice(Integer companyId, double distance, long duration, long wait, Integer type, Map<String, String> geocode) throws Exception {
        System.err.println("预估里程：" + distance);
        System.err.println("预估时间：" + duration);
        String provinceCode = geocode.get("provinceCode");
        String cityCode = geocode.get("cityCode");
        String districtCode = geocode.get("districtCode");
        //获取匹配的城市价格配置
        SystemPriceCity systemPriceCity = systemPriceCityService.queryOne(provinceCode, cityCode, districtCode);
        System.err.println("获取匹配的城市价格配置：" + systemPriceCity);
        if (null == systemPriceCity) {
            return new ArrayList<>();
        }
        List<Map<String, Object>> list = serverCarModelMapper.queryServerCarModel(type);
        System.err.println("获取匹配的城市价格配置111：" + list);
        List<ServerCarModelWarpper> data = new ArrayList<>();
        for (Map<String, Object> map : list) {
            Map<String, Object> query1 = systemPriceMapper.query(companyId, type, Integer.valueOf(map.get("id").toString()), systemPriceCity.getId());