java/QianYunTong.git

			@@ -75,6 +75,9 @@

			@Autowired
			private TDriverPromotionActivityService driverPromotionActivityService;

			@Resource
			private IOpenCityService openCityService;



			@@ -146,7 +149,7 @@
			return ResultUtil.error("订单已被抢了");
			}
			OrderTaxi orderTaxi = null;
			if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() == 1&& orderPrivateCar1.getState() == 11){
			if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1\|\| orderPrivateCar1.getState() == 11)){
			orderPrivateCarService.deleteById(orderId);
			OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1);
			this.insert(orderTaxi1);
			@@ -222,6 +225,8 @@
			orderTaxi.setPromotionUser(driver1.getName());
			orderTaxi.setPromotionPhone(driver1.getPhone());
			orderTaxi.setPromotionDriverId(promotion);
			}else{
			orderTaxi.setPromotion(1);
			}

			if(null == oldDriverId){
			@@ -405,7 +410,7 @@
			orderTaxi.setStartServiceTime(date);
			orderTaxi.setBoardingTime(date);

			String value = (String) redisTemplate.opsForValue().get("DRIVER" + uid);
			String value = (String) redisTemplate.opsForValue().get("dache:DRIVER" + uid);
			if (ToolUtil.isNotEmpty(value)) {
			String[] split = value.split(",");
			Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(split[0], split[1]);
			@@ -471,7 +476,9 @@
			*/
			@Override
			public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
			return orderTaxiMapper.queryOrderInfo(orderId);
			OrderTaxi orderTaxi = this.selectById(orderId);
			OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
			return orderTaxiMapper.queryOrderInfo(orderId, openCity.getId());
			}