java/QianYunTong.git

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

			@Autowired
			private TDriverPromotionActivityService driverPromotionActivityService;

			@Resource
			private IOpenCityService openCityService;



			@@ -222,6 +225,8 @@
			orderTaxi.setPromotionUser(driver1.getName());
			orderTaxi.setPromotionPhone(driver1.getPhone());
			orderTaxi.setPromotionDriverId(promotion);
			}else{
			orderTaxi.setPromotion(1);
			}

			if(null == oldDriverId){
			@@ -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());
			}