修改扫码下单

xuhy

5 天以前 b4835ff468ab4a51aa05c4fdc290a667f8802b71

修改扫码下单

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -342,7 +342,25 @@
        // 查询预估价格
        ResultUtil<List<ServerCarModelWarpper>> listResultUtil = serverCarModelService.queryServerCarModel(startLon + "," + startLat, endLon + "," + endLat, 1);
        List<ServerCarModelWarpper> data = listResultUtil.getData();
        data = data.stream().filter(e -> serverCarModelId.equals(e.getId())).sorted(Comparator.comparing(ServerCarModelWarpper::getAmount)).collect(Collectors.toList());
        System.out.println("预估价格++++++++++："+data);
        System.out.println("服务车型id++++++++++："+serverCarModelId);
        if(Objects.isNull(serverCarModelId)){
            // 查询司机
            Driver driver2 = driverService.selectById(driverId);
            //获取经营业务
            CarService query = new CarService();
            query.setCarId(driver2.getCarId());
            CarService service = carServiceMapper.selectOne(query);
            System.out.println("服务车型========："+service);
            if(Objects.nonNull(service)){
                serverCarModelId = service.getServerCarModelId();
                System.out.println("服务车型id++++++++++："+serverCarModelId);
            }
        }
        Integer finalServerCarModelId = serverCarModelId;
        System.out.println("服务车型id++++++++++："+finalServerCarModelId);
        data = data.stream().filter(e -> finalServerCarModelId.equals(e.getId())).sorted(Comparator.comparing(ServerCarModelWarpper::getAmount)).collect(Collectors.toList());
        System.out.println("匹配出来的车型++++++++++："+finalServerCarModelId);
        if(Objects.nonNull(openCity) && !CollectionUtils.isEmpty(data) && BigDecimal.valueOf(data.get(0).getAmount()).compareTo(openCity.getOrderMagnitude()) > 0){
            orderPrivateCar.setIsReassign(1);
            orderPrivateCar.setIsDelete(1);
@@ -364,7 +382,9 @@
            return ResultUtil.success(baseWarpper);
        }else {
            if(orderSource == 2){
                if(!CollectionUtils.isEmpty(data)){
                orderPrivateCar.setEstimatedPrice(data.get(0).getAmount());
                }
            }else {
                orderPrivateCar.setEstimatedPrice(data.get(carIndex).getAmount());
            }