java/IgoTravel.git

			@@ -575,13 +575,13 @@
			String address = reverseGeocode.getAddress();
			switch (orderType){
			case 1://专车
			return orderPrivateCarService.process(orderId, state, lon, lat, address, phone, language);
			return orderPrivateCarService.process(orderId, state, lon, lat, address, phone, language, uid);
			case 2://出租
			// return orderTaxiService.process(orderId, state, lon, lat, address);
			case 3://城际
			// return orderCrossCityService.process(orderId, state, lon, lat, address);
			case 4://同城小件
			return orderLogisticsService.process(orderId, state, lon, lat, address, pickUpCode, language);
			return orderLogisticsService.process(orderId, state, lon, lat, address, pickUpCode, language, uid);
			case 5://跨城小件
			// return orderLogisticsService.process(orderId, state, lon, lat, address);
			case 6:
			@@ -603,16 +603,17 @@
			* @throws Exception
			*/
			@Override
			public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception {
			public ResultUtil confirmFees(Integer language, Integer orderId, Integer orderType, Integer type, Double travelFee,
			Double parkingFee, Double crossingFee, Integer uid) throws Exception {
			switch (orderType){
			case 1://专车
			return orderPrivateCarService.confirmFees(language, orderId, type, parkingFee, crossingFee);
			return orderPrivateCarService.confirmFees(language, orderId, type, parkingFee, crossingFee, uid);
			case 2://出租
			return orderTaxiService.confirmFees(orderId, type, travelFee, parkingFee, crossingFee);
			case 3://城际（没有此流程）
			break;
			case 4://
			return orderLogisticsService.confirmFees(language, orderId, type, parkingFee, crossingFee);
			return orderLogisticsService.confirmFees(language, orderId, type, parkingFee, crossingFee, uid);
			case 5:
			break;
			case 6: