java/QianYunTong.git

			@@ -1263,7 +1263,6 @@
			orderCrossCity.setPassengers(userInfo.getNickName());
			orderCrossCity.setPassengersPhone(userInfo.getPhone());
			orderCrossCity.setPeopleNumber(orderCrossCityWarpper.getPeopleNumber());
			orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
			List<OrderCrossCity> orderCrossCities = this.selectList(new EntityWrapper<OrderCrossCity>().eq("orderNum", orderCrossCity.getOrderNum()).eq("isDelete", 1));
			orderCrossCity.setSort(orderCrossCities.size() + 1);
			orderCrossCity.setState(7);//待支付
			@@ -1275,6 +1274,11 @@
			orderCrossCity.setIsDelete(1);
			orderCrossCity.setRemark(orderCrossCityWarpper.getRemark());
			orderCrossCity.setIsReassign(1);
			if(1 == orderCrossCity.getTravelMode()){
			orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
			}else{
			orderCrossCity.setSeatNumber(lineShiftDriver.getLaveSeatNumber());
			}
			// //调用高德创建轨迹
			// String s = gdFalconUtil.selectTerminal(driver.getPhone());
			// String track = gdFalconUtil.createTrack(s);
			@@ -1445,7 +1449,12 @@
			if(map.get("abnormalIntro")!=null){
			map.put("appealStatus", 1);
			}

			if(map.get("travelMode")!=null &&map.get("travelMode").toString().equals("2") ){
			map.put("zwNum", 1);
			}else {
			map.put("zwNum", 2);
			}

			Map<String, String> geocode = gdMapGeocodingUtil.geocode(map.get("startLon").toString(), map.get("startLat").toString());
			map.put("startCity", geocode.get("city"));
			geocode = gdMapGeocodingUtil.geocode(map.get("endLon").toString(), map.get("endLat").toString());
			@@ -2463,7 +2472,7 @@
			for (Map<String, Integer> map : datas) {
			Integer orderType = map.get("orderType");
			Integer orderId = map.get("orderId");
			if (orderType == 1 && orderId != orderPrivateCar.getId()) {
			if (orderType == 1 && !orderId.equals(orderPrivateCar.getId())) {
			orderPrivateCarMapper.deleteById(orderId);
			}
			if (orderType == 2) {
			@@ -2536,7 +2545,7 @@
			if (orderType == 1) {
			orderPrivateCarMapper.deleteById(orderId);
			}
			if (orderType == 2 && orderId != orderTaxi.getId()) {
			if (orderType == 2 && !orderId.equals(orderTaxi.getId())) {
			orderTaxiMapper.deleteById(orderId);
			}
			}
			@@ -2563,8 +2572,6 @@
			if (bo) {
			continue;
			}


			pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime());
			}
			}