修改bug

Pu Zhibing

4 天以前 0a8d28436b2f7229ecdf40c6b003902002c8947f

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

@@ -167,6 +167,7 @@

   @Autowired
   private TDriverPromotionActivityService driverPromotionActivityService;
   private CarMapper carMapper;
   
   /**
    * 专车下单操作
@@ -246,7 +247,15 @@
                  return ResultUtil.error("有未完成的订单");
               }
            }
				
            String serverCarModel = "";
            if(2 == orderSource){
               Driver driver = driverService.selectById(driverId);
               CarService carService = new CarService();
               carService.setType(1);
               carService.setCarId(driver.getCarId());
               CarService carService1 = carServiceMapper.selectOne(carService);
               serverCarModel = "{\"serverCarModelId\":" + carService1.getServerCarModelId() + ",\"rideType\":1}";
            }
            
            startAddress = startAddress.replaceAll("& #40;", "(");
            startAddress = startAddress.replaceAll("& #41;", ")");
@@ -262,6 +271,7 @@
            orderPrivateCar.setType(type);
            orderPrivateCar.setUserId(uid);
            orderPrivateCar.setServerCarModelId(serverCarModelId);
            orderPrivateCar.setServerCarModel(serverCarModel);
            orderPrivateCar.setOrderNum(this.getOrderNum());
            orderPrivateCar.setPlacementLon(Double.valueOf(placementLon));
            orderPrivateCar.setPlacementLat(Double.valueOf(placementLat));
@@ -556,6 +566,15 @@
               }
            }
            
            if(2 == orderSource){
               Driver driver = driverService.selectById(driverId);
               CarService carService = new CarService();
               carService.setType(1);
               carService.setCarId(driver.getCarId());
               CarService carService1 = carServiceMapper.selectOne(carService);
               serverCarModel = "{\"serverCarModelId\":" + carService1.getServerCarModelId() + ",\"rideType\":1}";
            }
				
            startAddress = startAddress.replaceAll("& #40;", "(");
            startAddress = startAddress.replaceAll("& #41;", ")");
            endAddress = endAddress.replaceAll("& #40;", "(");