java/IgoTravel.git

			@@ -284,12 +284,12 @@
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			}
			}).start();

			Integer language1 = userInfoMapper.selectById(orderLogistics.getUserId()).getLanguage();
			systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得包裹订单，请及时联系客户！" :
			language == 2 ? "You have grabbed the delivery order, please contact the client timely."
			: "Vous avez saisi la commande du livraison. Veuillez contacter le client en temps opportun.", orderLogistics.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."
			systemNoticeService.addSystemNotice(1, language1 == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
			language1 == 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.", orderLogistics.getUserId());
			return ResultUtil.success();
			}
			@@ -326,6 +326,7 @@
			long timeOutCancel = orderLogistics.getEstimateArriveTime().getTime() + driverTimeout;
			map.put("timeOutCancel", timeOutCancel);
			}
			map.put("isDispute", orderLogistics.getIsDispute());
			return map;
			}

			@@ -366,21 +367,21 @@
			}

			List<OrderLogisticsSpread> orderLogisticsId = spreadService.selectList(new EntityWrapper<OrderLogisticsSpread>().eq("orderLogisticsId", orderLogistics.getId()).eq("payType",4));

			Integer language1 = userInfoMapper.selectById(orderLogistics.getUserId()).getLanguage();

			String tripStatus = "UNKNOWN_TRIP_STATUS";
			switch (state){
			case 3://出发前往预约点
			orderLogistics.setState(3);
			orderLogistics.setSetOutTime(new Date());
			systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderLogistics.getUserId());
			systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已出发，请耐心等待" : language1 == 2 ? "The driver is on the way, please wait." : "Le chauffeur est en route. Veuillez patienter.", orderLogistics.getUserId());
			pushUtil.pushDriverPosition(orderId, 4);
			tripStatus = "ENROUTE_TO_PICKUP";
			break;
			case 4://到达预约点，等待客户上车
			orderLogistics.setState(4);
			orderLogistics.setArriveTime(new Date());
			systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点。" : language == 2 ? "The driver has arrived at the reserved location." : "Le chauffeur est arrivé à l'endroit prévu.", orderLogistics.getUserId());
			systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已到达您设置的预约地点。" : language1 == 2 ? "The driver has arrived at the reserved location." : "Le chauffeur est arrivé à l'endroit prévu.", orderLogistics.getUserId());
			tripStatus = "ARRIVED_AT_PICKUP";
			break;
			case 5://开始服务
			@@ -560,12 +561,12 @@
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			}
			}).start();

			Integer language1 = userInfoMapper.selectById(orderLogistics.getUserId()).getLanguage();
			systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得包裹订单，请及时联系客户！" :
			language == 2 ? "You have grabbed the delivery order, please contact the client timely."
			: "Vous avez saisi la commande du livraison. Veuillez contacter le client en temps opportun.", orderLogistics.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."
			systemNoticeService.addSystemNotice(1, language1 == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
			language1 == 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.", orderLogistics.getUserId());

			return ResultUtil.success();
			@@ -651,7 +652,7 @@
			Element email2_user = document.getElementById("email2_user");
			email2_user.text("Bonjour " + userInfo.getFirstName() + " " + userInfo.getLastName());
			Element email2_content = document.getElementById("email2_content");
			email2_content.text("Le code de ramassage de votre colis est " + random + ", veuillez effectuer la verification dans les 5minutes.");
			email2_content.text("Le code de ramassage de votre colis est " + random + ", veuillez effectuer la verification dans les 5 minutes.");
			}
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "取件码邮件" : language == 2 ? "Pickup code" : "Code de ramassage", document.html());
			//开始生成pdf收据和html收据
			@@ -772,6 +773,7 @@
			map.put("discountMoney", orderLogistics.getDiscountMoney());//折扣抵扣金额
			map.put("discount", orderLogistics.getDiscount());//折扣
			map.put("priceDifference", orderLogistics.getPriceDifference());//补差价
			map.put("isDispute", orderLogistics.getIsDispute());
			return map;
			}