~chenkun/IgoTravel.git

			@@ -102,7 +102,14 @@
			*/
			@Override
			public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId, Integer language) throws Exception {
			return orderPrivateCarMapper.queryOrderList(state, driverId, language);
			List<Map<String, Object>> list = orderPrivateCarMapper.queryOrderList(state, driverId, language);
			for (Map<String, Object> map : list) {
			if(null != map.get("time")){
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat(language, time));
			}
			}
			return list;
			}

			/**
			@@ -114,7 +121,14 @@
			*/
			@Override
			public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
			return orderPrivateCarMapper.queryMyAllOrder(state, uid, language);
			List<Map<String, Object>> list = orderPrivateCarMapper.queryMyAllOrder(state, uid, language);
			for (Map<String, Object> map : list) {
			if(null != map.get("time")){
			String time = map.get("time").toString();
			map.put("time", DateUtil.conversionFormat(language, time));
			}
			}
			return list;
			}


			@@ -126,7 +140,12 @@
			*/
			@Override
			public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
			return orderPrivateCarMapper.queryPushOrder(orderId, language);
			Map<String, Object> map = orderPrivateCarMapper.queryPushOrder(orderId, language);
			if(null != map.get("travelTime")){
			String travelTime = map.get("travelTime").toString();
			map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
			}
			return map;
			}


			@@ -161,7 +180,7 @@
			.eq("place", orderPrivateCar.getPlace())
			);
			if(list.size() > 0 \|\| list1.size() > 0){
			return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "A little slow. The order's been taken" : "La main est un peu lente oh l’ordre a été volé");
			return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
			}
			}

			@@ -169,7 +188,7 @@
			return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
			}
			if(orderPrivateCar.getState() != 1){
			return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "A little slow. The order's been taken" : "La main est un peu lente oh l’ordre a été volé");
			return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
			}
			Driver driver = driverService.selectById(uid);
			orderPrivateCar.setDriverId(uid);
			@@ -221,8 +240,12 @@
			}
			}).start();

			systemNoticeService.addSystemNotice(2, "您已成功抢得专车订单，请及时联系客户！", orderPrivateCar.getDriverId());
			systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderPrivateCar.getUserId());
			systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得打车订单，请及时联系客户！" :
			language == 2 ? "You have grabbed the ride order, please contact the client timely."
			: "Vous avez saisi la commande de course, veuillez contacter le client en temps opportun.", orderPrivateCar.getDriverId());
			systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
			language == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
			: "Votre commande a été attribuée au chauffeur- " + driver.getFirstName() + ", S'il vous plaît, restez en ligne.", orderPrivateCar.getUserId());
			return ResultUtil.success();
			}

			@@ -235,8 +258,13 @@
			* @throws Exception
			*/
			@Override
			public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
			return orderPrivateCarMapper.queryOrderInfo(orderId);
			public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
			Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
			if(null != map.get("travelTime_")){
			String travelTime_ = map.get("travelTime_").toString();
			map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
			}
			return map;
			}


			@@ -270,12 +298,14 @@
			case 3://出发前往预约点
			orderPrivateCar.setState(3);
			orderPrivateCar.setSetOutTime(new Date());
			systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "he driver has left, please wait patiently" : "Le chauffeur est parti, soyez patient", orderPrivateCar.getUserId());
			systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderPrivateCar.getUserId());
			break;
			case 4://到达预约点，等待客户上车
			orderPrivateCar.setState(4);
			orderPrivateCar.setArriveTime(new Date());
			systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点，请及时上车" : language == 2 ? "The driver has arrived at the reservation place you set, please get on the bus in time" : "Le chauffeur est arrivé au lieu de rendez-vous que vous avez fixé, s’il vous plaît embarquez à temps", orderPrivateCar.getUserId());
			systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点，请及时上车" : language == 2 ?
			"The driver has arrived at the reserved location, please get in timely." :
			"Le chauffeur est arrivé à l'endroit prévu, veuillez monter dans la voiture à temps.", orderPrivateCar.getUserId());
			break;
			case 5://开始服务
			orderPrivateCar.setBoardingLon(lon);
			@@ -345,7 +375,7 @@
			* @throws Exception
			*/
			@Override
			public ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
			public ResultUtil confirmFees(Integer language, Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
			OrderPrivateCar orderPrivateCar = this.selectById(orderId);
			if(orderPrivateCar.getArriveTime()==null){
			orderPrivateCar.setArriveTime(orderPrivateCar.getStartServiceTime());
			@@ -410,7 +440,8 @@


			pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据
			systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId());
			systemNoticeService.addSystemNotice(1, language == 1 ? "司机已结束本次行程，谢谢使用" : language == 2 ?
			"The driver has finished the trip,thank you for using I-GO" : "Le chauffeur a terminé le trajet, merci d'utiliser I-GO", orderPrivateCar.getUserId());

			//回滚司机状态为空闲
			Driver driver = driverService.selectById(orderPrivateCar.getDriverId());