java/IgoTravel.git

			@@ -830,10 +830,10 @@
			public ResultUtil payPrivateCarOrder(Integer payType, Integer bankCardId, Integer orderId, Integer couponId, Integer type, Integer language) throws Exception {
			OrderPrivateCar orderPrivateCar = this.selectById(orderId);
			if(orderPrivateCar.getState() == 8 \|\| orderPrivateCar.getState() == 9){
			return ResultUtil.error("订单已完成支付，不允许重复支付", "");
			return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, no double payment is allowed" : "La commande a été payée, aucun paiement en double n’est autorisé", "");
			}
			if(orderPrivateCar.getState() != 7){
			return ResultUtil.error("订单不在待支付状态，不允许支付", "");
			return ResultUtil.error(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is not pending payment and cannot be paid" : "La commande n’est pas en attente de paiement et ne permet pas le paiement", "");
			}
			Integer uid = orderPrivateCar.getUserId();
			Double orderMoney = orderPrivateCar.getOrderMoney();
			@@ -847,19 +847,19 @@
			if(null != couponId){
			userCouponRecord = userCouponRecordService.selectById(couponId);
			if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
			return ResultUtil.error("优惠券不能用于此订单", "");
			return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupons cannot be used for this order" : "Le coupon ne peut pas être utilisé pour cette commande", "");
			}
			if(userCouponRecord.getState() == 2){
			return ResultUtil.error("优惠券已使用", "");
			return ResultUtil.error(language == 1 ? "优惠券已使用" : language == 2 ? "Coupon used" : "Coupon a été utilisé", "");
			}
			if(userCouponRecord.getState() == 3){
			return ResultUtil.error("优惠券已过期", "");
			return ResultUtil.error(language == 1 ? "优惠券已过期" : language == 2 ? "Coupon has expired" : "Le coupon a expiré", "");
			}
			if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 1){
			return ResultUtil.error("优惠券不能用于此类型订单", "");
			return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupons cannot be used for this order" : "Le coupon ne peut pas être utilisé pour cette commande", "");
			}
			if(userCouponRecord.getCouponType() == 2 && orderMoney.compareTo(userCouponRecord.getFullMoney()) < 0){
			return ResultUtil.error("优惠券不能用于此订单", "");
			return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupons cannot be used for this order" : "Le coupon ne peut pas être utilisé pour cette commande", "");
			}
			orderMoney = orderMoney - userCouponRecord.getMoney();
			orderPrivateCar.setCouponMoney(userCouponRecord.getMoney());
			@@ -912,7 +912,7 @@
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney, null, 1);//添加预支付数据
			}else{
			resultUtil = ResultUtil.error("支付失败", "");
			resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
			}

			}
			@@ -938,7 +938,7 @@
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney, null, 1);//添加预支付数据
			}else{
			resultUtil = ResultUtil.error("支付失败", "");
			resultUtil = ResultUtil.error(language == 1 ? "支付失败" : language == 2 ? "Payment failure" : "Paiement échoué", "");
			}
			}
			if(payType == 3){//余额支付
			@@ -1736,30 +1736,47 @@
			OrderPrivateCar orderPrivateCar = this.selectById(orderId);
			//计算预计距离和剩余时间
			String value = redisUtil.getValue("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
			String d = "0";
			String t = "0";
			if(null == value \|\| "".equals(value)){
			System.err.println("司机没有上传位置信息");

			//调用获取轨迹中的数据
			List<Map<String, Object>> list = orderPositionService.queryTrack(orderId, 2);
			if(list.size() > 0){
			Map<String, Object> map = list.get(list.size() - 1);
			value = map.get("lon") + "," + map.get("lat");
			File file = new File(filePath + orderId + "_1.txt");
			if(file.exists()){
			//读取文件(字符流)
			BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
			//循环取出数据
			String str = null;
			StringBuffer sb = new StringBuffer();
			while ((str = in.readLine()) != null) {
			sb.append(str);
			}
			List<OrderPosition> list = JSONArray.parseArray(sb.toString(), OrderPosition.class);
			if(list.size() > 0){
			OrderPosition orderPosition = list.get(list.size() - 1);
			value = orderPosition.getLon() + "," + orderPosition.getLat();
			}
			}
			}

			String lnt = "0";
			String lat = "0";
			if(ToolUtil.isNotEmpty(value)){
			lnt = value.split(",")[0];
			lat = value.split(",")[1];
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt));

			if(null == distancematrix){
			System.err.println("查询距离出错了");
			}else if(distancematrix.getDistance() == 0){
			System.err.println("未获取到有效的距离");
			}else{
			d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
			t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
			}
			}
			String lnt = (null != value ? value.split(",")[0] : "0.0");
			String lat = (null != value ? value.split(",")[1] : "0.0");
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt));
			String d = "0";
			String t = "0";
			if(null == distancematrix){
			System.err.println("查询距离出错了");
			}else if(distancematrix.getDistance() == 0){
			System.err.println("未获取到有效的距离");
			}else{
			d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
			t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
			}

			OrderServerWarpper orderServerWarpper = new OrderServerWarpper();
			orderServerWarpper.setOrderId(orderPrivateCar.getId());
			orderServerWarpper.setOrderType(1);
			@@ -1776,7 +1793,7 @@
			orderServerWarpper.setLaveTime("0");
			}
			if(orderPrivateCar.getState() == 5 \|\| orderPrivateCar.getState() == 6){//服务中
			distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon());
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon());
			if(null == distancematrix){
			System.err.println("查询距离出错了");
			}else if(distancematrix.getDistance() == 0){