java/IgoTravel.git

			@@ -41,12 +41,15 @@
			import org.jsoup.nodes.Element;
			import org.jsoup.nodes.FormElement;
			import org.jsoup.select.Elements;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.http.HttpEntity;
			import org.springframework.http.HttpHeaders;
			import org.springframework.http.MediaType;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.LinkedMultiValueMap;
			import org.springframework.util.MultiValueMap;
			import org.springframework.util.StringUtils;
			@@ -63,6 +66,8 @@

			@Service
			public class OrderLogisticsServiceImpl extends ServiceImpl<OrderLogisticsMapper, OrderLogistics> implements IOrderLogisticsService {

			private Logger log = LoggerFactory.getLogger(OrderLogisticsServiceImpl.class);

			@Resource
			private SystemPriceMapper systemPriceMapper;
			@@ -254,7 +259,7 @@
			String[] split = endLonLat.split(",");
			Double lng = Double.valueOf(split[0]);
			Double lat = Double.valueOf(split[1]);
			ResultUtil<Map<String, Object>> price = this.getPrice1(type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
			ResultUtil<Map<String, Object>> price = this.getPrice1(uid, type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
			if(price.getCode() != 200){
			return price;
			}
			@@ -273,11 +278,11 @@
			* @return
			* @throws Exception
			*/
			public ResultUtil queryPayMoney(Integer number, Integer type, String startLonLat, String endLonLat, String endAddress, Integer language) throws Exception{
			public ResultUtil queryPayMoney(Integer uid, Integer number, Integer type, String startLonLat, String endLonLat, String endAddress, Integer language) throws Exception{
			String[] split = endLonLat.split(",");
			Double lng = Double.valueOf(split[0]);
			Double lat = Double.valueOf(split[1]);
			ResultUtil<Map<String, Object>> price = this.getPrice1(type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
			ResultUtil<Map<String, Object>> price = this.getPrice1(uid, type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
			if(price.getCode() == 200 && type == 5){
			Map<String, Object> data = price.getData();
			Double ordinary = Double.valueOf(data.get("ordinary").toString());
			@@ -327,7 +332,7 @@
			endAddress = endAddress.replaceAll("& #40;", "(");
			endAddress = endAddress.replaceAll("& #41;", ")");
			OrderLogistics orderLogistics = new OrderLogistics();
			Company query = companyCityService.query1(placementLon, placementLat);
			Company query = companyCityService.query1(uid, placementLon, placementLat);
			if(null == query){
			return ResultUtil.error(language == 1 ? "该地点暂无企业服务" : language == 2 ? "No service yet at this area" : "Pas encore de service dans cette zone");
			}
			@@ -340,7 +345,8 @@
			orderLogistics.setRemark(remark);
			orderLogistics.setPlacementLon(Double.valueOf(placementLon));
			orderLogistics.setPlacementLat(Double.valueOf(placementLat));
			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon));
			String tripId = redisUtil.getValue("trip" + uid);
			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon), tripId);
			if(null == reverseGeocode){
			return ResultUtil.error(language == 1 ? "解析地址出错" : language == 2 ? "Address resolution error" : "Erreur de résolution d’adresse");
			}
			@@ -363,7 +369,7 @@
			orderLogistics.setMileage(0D);
			orderLogistics.setIsReassign(1);
			orderLogistics.setReassignNotice(0);
			ResultUtil<Map<String, Object>> price = this.getPrice1(type, String.valueOf(startLon), String.valueOf(startLat), lng.toString(), lat.toString(), language);
			ResultUtil<Map<String, Object>> price = this.getPrice1(uid, type, String.valueOf(startLon), String.valueOf(startLat), lng.toString(), lat.toString(), language);
			if(price.getCode() != 200){
			return price;
			}
			@@ -412,8 +418,8 @@
			* @return
			* @throws Exception
			*/
			public ResultUtil<Map<String, Double>> getPrice(Integer type, String startLon, String startLat, String endLon, String endLat) throws Exception{
			Company query = companyCityService.query1(startLon, startLat);
			public ResultUtil<Map<String, Double>> getPrice(Integer uid, Integer type, String startLon, String startLat, String endLon, String endLat) throws Exception{
			Company query = companyCityService.query1(uid, startLon, startLat);
			if(null == query){
			return ResultUtil.error("预约取货点暂无企业服务");
			}
			@@ -456,8 +462,8 @@



			public ResultUtil<Map<String, Object>> getPrice1(Integer type, String startLon, String startLat, String endLon, String endLat, Integer language) throws Exception{
			Company query = companyCityService.query1(startLon, startLat);
			public ResultUtil<Map<String, Object>> getPrice1(Integer uid, Integer type, String startLon, String startLat, String endLon, String endLat, Integer language) throws Exception{
			Company query = companyCityService.query1(uid, startLon, startLat);
			if(null == query){
			return ResultUtil.error(language == 1 ? "预约取货点暂无企业服务" : language == 2 ?
			"No service yet at the reserved pickup point." : "Les points de ramassage prévus ne sont pas disponibles pour le moment.");
			@@ -469,7 +475,8 @@
			Integer activityId = null;
			if(type == 4){//同城
			Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null);
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(startLat), Double.valueOf(startLon), Double.valueOf(endLat), Double.valueOf(endLon));
			String tripId = redisUtil.getValue("trip" + uid);
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(startLat), Double.valueOf(startLon), Double.valueOf(endLat), Double.valueOf(endLon), tripId);
			if(null == distancematrix){
			return ResultUtil.error(language == 1 ? "计算距离出错" : language == 2 ? "Errors in computing distance" : "Erreurs dans le calcul de la distance");
			}
			@@ -540,12 +547,12 @@
			if(ToolUtil.isNotEmpty(vehicle)){
			integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
			}
			Company query = companyCityService.query1(String.valueOf(orderLogistics.getStartLon()), String.valueOf(orderLogistics.getStartLat()));//获取起点所属分公司
			Company query = companyCityService.query1(orderLogistics.getUserId(), String.valueOf(orderLogistics.getStartLon()), String.valueOf(orderLogistics.getStartLat()));//获取起点所属分公司
			List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//用专车的推单配置
			for(int i = 1; i <= querys.size(); i++){
			PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
			//获取空闲司机
			List<Driver> list = driverService.queryIdleDriver(orderLogistics.getType(), orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			List<Driver> list = driverService.queryIdleDriver(orderLogistics.getUserId(), orderLogistics.getType(), orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			System.err.println("【" + orderLogistics.getId() + "】空闲司机：" + JSON.toJSONString(list));
			if(list.size() > 0){
			double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
			@@ -594,14 +601,21 @@
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			Process process = null;
			try {
			process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
			} catch (IOException e) {
			throw new RuntimeException(e);
			}
			if (process != null) {
			process.destroy();
			// 使用Runtime执行命令
			Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
			// 读取命令的输出
			BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
			String line;
			while ((line = reader.readLine()) != null) {
			System.out.println(line);
			}
			// 等待命令执行完成
			process.waitFor();
			// 关闭流
			reader.close();
			} catch (IOException \| InterruptedException e) {
			e.printStackTrace();
			}
			}
			}, 30000);
			@@ -682,7 +696,8 @@
			orderLogistics.setUrgent(1);
			orderLogistics.setCargoNumber(1);

			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon));
			String tripId = redisUtil.getValue("trip" + uid);
			ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(placementLat), Double.valueOf(placementLon), tripId);
			orderLogistics.setPlacementAddress(reverseGeocode.getAddress());
			orderLogistics.setStartLon(Double.valueOf(startLon));
			orderLogistics.setStartLat(Double.valueOf(startLat));
			@@ -737,7 +752,7 @@
			String value = redisUtil.getValue("DRIVER" + driver.getId());
			if(ToolUtil.isNotEmpty(value)) {
			String[] split = value.split(",");
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
			//超时时间
			long timeOut = System.currentTimeMillis() + (distancematrix.getDuration() * 1000);
			orderLogistics.setEstimateArriveTime(new Date(timeOut));
			@@ -749,8 +764,8 @@

			orderLogistics.setIsReassign(1);
			orderLogistics.setIsDelete(1);
			orderLogistics.setTripId(UUIDUtil.getRandomCode());
			DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), orderLogistics.getEndLat(), orderLogistics.getEndLon());
			orderLogistics.setTripId(tripId);
			DistancematrixVo distancematrix1 = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), orderLogistics.getEndLat(), orderLogistics.getEndLon(), tripId);
			Long distance1 = distancematrix1.getDistance();
			orderLogistics.setEstimatedMileage(new BigDecimal(distance1).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
			this.insert(orderLogistics);
			@@ -773,14 +788,42 @@
			String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
			if(ToolUtil.isEmpty(vehicles)){
			CarModel carModel = carModelMapper.selectById(car.getCarModelId());
			fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!createVehicles){
			for (int i = 0; i < 5; i++) {
			createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(createVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			boolean updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("ONLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			}

			}
			//创建行程数据
			fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
			boolean createTrip = fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
			orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
			if(!createTrip){
			for (int i = 0; i < 5; i++) {
			createTrip = fleetEngineUtil.createTrip(vehicleId, 1, orderLogistics.getTripId(),
			orderLogistics.getStartLat().toString(), orderLogistics.getStartLon().toString(), orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
			if(createTrip){
			break;
			}
			Thread.sleep(5000L);
			}
			}

			}catch (Exception e){
			e.printStackTrace();
			@@ -814,14 +857,21 @@
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			Process process = null;
			try {
			process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
			} catch (IOException e) {
			throw new RuntimeException(e);
			}
			if (process != null) {
			process.destroy();
			// 使用Runtime执行命令
			Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
			// 读取命令的输出
			BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
			String line;
			while ((line = reader.readLine()) != null) {
			System.out.println(line);
			}
			// 等待命令执行完成
			process.waitFor();
			// 关闭流
			reader.close();
			} catch (IOException \| InterruptedException e) {
			e.printStackTrace();
			}
			}
			}, 30000);
			@@ -838,14 +888,14 @@

			// TODO: 2021/5/11 修改，根据后台设定的派单范围查询范围内有无司机，将单子指派给距离最近的司机（距离相同随机取），范围内没有司机再进行推单流程
			if(orderLogistics.getState() == 1){
			Company query = companyCityService.query1(orderLogistics.getStartLon().toString(), orderLogistics.getStartLat().toString());
			Company query = companyCityService.query1(uid, orderLogistics.getStartLon().toString(), orderLogistics.getStartLat().toString());
			if(null == query){
			return ResultUtil.error(language == 1 ? "起点暂未企业提供服务" : language == 2 ? "Starting point no enterprise to provide services" : "Point de départ pas encore disponible pour les entreprises");
			}
			AssignOrder assignOrder = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", query.getId()).eq("type", 1));
			if(null != assignOrder && assignOrder.getPeople() > 0){//配置了指派规则才处理
			//获取空闲司机
			List<Driver> drivers = driverService.queryIdleDriver(4, orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
			List<Driver> drivers = driverService.queryIdleDriver(uid, 4, orderLogistics.getServerCarModelId(), orderLogistics.getStartLon(), orderLogistics.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
			if(drivers.size() > 0){//有司机，直接指派给司机
			Driver dr = null;
			if(drivers.size() > 1){
			@@ -858,7 +908,7 @@
			String value = redisUtil.getValue("DRIVER" + drivers.get(j).getId());
			if(null != value){
			String[] split = value.split(",");
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
			Long distance = distancematrix.getDistance();
			if((0 == m && null == driver) \|\| (distance < m)){
			driver = drivers.get(j);
			@@ -877,7 +927,7 @@
			String value = redisUtil.getValue("DRIVER" + driver.getId());
			if(null != value){
			String[] split = value.split(",");
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]));
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(split[1]), Double.valueOf(split[0]), tripId);
			Long d = distancematrix.getDistance();
			if((0 == m && null == dr) \|\| (d.intValue() < m.intValue())){
			dr = driver;
			@@ -931,14 +981,21 @@
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			Process process = null;
			try {
			process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName);
			} catch (IOException e) {
			throw new RuntimeException(e);
			}
			if (process != null) {
			process.destroy();
			// 使用Runtime执行命令
			Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
			// 读取命令的输出
			BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
			String line;
			while ((line = reader.readLine()) != null) {
			System.out.println(line);
			}
			// 等待命令执行完成
			process.waitFor();
			// 关闭流
			reader.close();
			} catch (IOException \| InterruptedException e) {
			e.printStackTrace();
			}
			}
			}, 30000);
			@@ -983,10 +1040,14 @@
			* @throws Exception
			*/
			@Override
			@Transactional
			public ResultUtil payLogisticsOrder(Integer payType, Integer bankCardId, Integer orderId,Integer couponId, Integer redDeduction, Integer type, Integer language) throws Exception {
			OrderLogistics orderLogistics = this.selectById(orderId);
			if(orderLogistics.getState() != 7){
			if(orderLogistics.getState() == 8 \|\| orderLogistics.getState() == 9){
			return ResultUtil.error(language == 1 ? "订单已完成支付，不允许重复支付" : language == 2 ? "The order has been paid, recurring payments is not allowed." : "La commande a été payée, les paiements récurrents ne sont pas autorisés.", "");
			}
			if(orderLogistics.getState() != 7){
			return ResultUtil.error(language == 1 ? "订单不在待支付状态，不允许支付" : language == 2 ? "The order is no longer with Pending Payment, making payments is not allowed." : "La commande n’est plus en attente de paiement, il n’est pas permis d’effectuer des paiements.", "");
			}
			Integer uid = orderLogistics.getUserId();
			BigDecimal orderMoney = new BigDecimal(orderLogistics.getOrderMoney());
			@@ -1016,7 +1077,6 @@
			//计算优惠券
			UserCouponRecord userCouponRecord = null;
			if(null != couponId){
			//TODO 待翻译
			if(null != redDeduction && 1 == redDeduction){
			return ResultUtil.error(language == 1 ? "优惠券和红包不能同时使用" : language == 2 ? "Coupons and lucky-promo cannot be used at the same time." : "Les coupons et les bonus ne peuvent pas être utilisés en même temps", "");
			}
			@@ -1042,13 +1102,13 @@
			}

			//计算红包
			if(null != redDeduction && 1 == redDeduction){
			if(null != redDeduction && 1 == redDeduction && null == orderLogistics.getRedPacketId()){
			RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings();
			if(null != redEnvelopePaymentSettings){
			Double total = userRedPacketRecordService.queryRemainingAmount(uid);
			List<UserRedPacketRecord> userRedPacketRecords = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>().eq("userId", uid)
			.eq("state", 1).eq("companyId", orderLogistics.getCompanyId()).gt("remainingAmount", 0).orderBy("insertTime", false));


			BigDecimal deductionRatio = redEnvelopePaymentSettings.getDeductionRatio();
			BigDecimal multiply1 = orderMoney.multiply(deductionRatio.divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_EVEN);
			if(total > 0 && multiply1.doubleValue() > 0 && total.compareTo(multiply1.doubleValue()) >= 0){
			@@ -1058,12 +1118,12 @@
			//获取红包id
			JSONArray jsonArray = new JSONArray();
			for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("id", userRedPacketRecord.getId());
			BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
			if(multiply1.compareTo(BigDecimal.ZERO) == 0){
			break;
			}
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("id", userRedPacketRecord.getId());
			BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
			if(multiply1.compareTo(remainingAmount) >= 0){
			userRedPacketRecord.setRemainingAmount(0D);
			userRedPacketRecord.setEndTime(new Date());
			@@ -1071,14 +1131,15 @@
			multiply1 = multiply1.subtract(remainingAmount).setScale(2, RoundingMode.HALF_EVEN);
			jsonObject.put("money", remainingAmount);
			jsonArray.add(jsonObject);
			userRedPacketRecordService.updateById(userRedPacketRecord);
			}else if(remainingAmount.compareTo(multiply1) > 0){
			userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply1).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
			jsonObject.put("money", multiply1);
			jsonArray.add(jsonObject);
			userRedPacketRecordService.updateById(userRedPacketRecord);
			multiply1 = BigDecimal.ZERO;
			}
			}
			if(userRedPacketRecords.size() > 0){
			userRedPacketRecordService.updateBatchById(userRedPacketRecords);
			}
			orderLogistics.setRedPacketId(jsonArray.toJSONString());
			}
			@@ -1087,29 +1148,18 @@
			orderMoney = orderMoney.subtract(new BigDecimal(total)).setScale(2, RoundingMode.HALF_EVEN);
			//获取红包id
			JSONArray jsonArray = new JSONArray();
			BigDecimal multiply = new BigDecimal(total);
			for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("id", userRedPacketRecord.getId());
			BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
			if(multiply.compareTo(BigDecimal.ZERO) == 0){
			break;
			}
			if(multiply.compareTo(remainingAmount) >= 0){
			userRedPacketRecord.setRemainingAmount(0D);
			userRedPacketRecord.setEndTime(new Date());
			userRedPacketRecord.setState(2);
			multiply = multiply.subtract(remainingAmount).setScale(2, RoundingMode.HALF_EVEN);
			jsonObject.put("money", remainingAmount);
			jsonArray.add(jsonObject);
			userRedPacketRecordService.updateById(userRedPacketRecord);
			}else if(remainingAmount.compareTo(multiply) > 0){
			userRedPacketRecord.setRemainingAmount(remainingAmount.subtract(multiply).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
			jsonObject.put("money", multiply);
			jsonArray.add(jsonObject);
			userRedPacketRecordService.updateById(userRedPacketRecord);
			multiply = BigDecimal.ZERO;
			}
			jsonObject.put("money", userRedPacketRecord.getRemainingAmount());
			jsonArray.add(jsonObject);

			userRedPacketRecord.setRemainingAmount(0D);
			userRedPacketRecord.setEndTime(new Date());
			userRedPacketRecord.setState(2);
			}
			if(userRedPacketRecords.size() > 0){
			userRedPacketRecordService.updateBatchById(userRedPacketRecords);
			}
			orderLogistics.setRedPacketId(jsonArray.toJSONString());
			}
			@@ -1130,8 +1180,8 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, orderId, 4, 1,
			@@ -1157,8 +1207,8 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);

			if(resultUtil.getCode()==200){
			@@ -1258,14 +1308,6 @@


			language = userInfo.getLanguage();
			String payTypeChinese = "";
			String payTypeEnglish = "";
			String payTypeFrench = "";
			if(orderLogistics.getPayType() == 3){
			payTypeChinese = "余额支付";
			payTypeEnglish = "I-GO Wallet";
			payTypeFrench = "Portefeuille I-GO";
			}

			if(ToolUtil.isNotEmpty(userInfo.getEmail())){
			String path = templatePath + "user/receiptLogistics.html";
			@@ -1281,7 +1323,7 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("I-GO电子收据");
			document.getElementsByTag("title").get(0).text("包裹收据");
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
			Element qbj_chinese = document.getElementById("qbj_chinese");
			@@ -1352,7 +1394,7 @@
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text(payTypeChinese);
			pay_type_chinese.text("余额支付");
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_chinese = document.getElementById("dispute_chinese");
			@@ -1362,11 +1404,11 @@
			dispute_chinese.remove();
			}
			Element pdf_chinese = document.getElementById("pdf_chinese");
			pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_chinese = document.getElementById("lost_item_chinese");
			lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_chinese = document.getElementById("track_chinese");
			// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_chinese = document.getElementById("pay_time_chinese");
			pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_chinese = document.getElementsByClass("driver_chinese");
			@@ -1389,7 +1431,7 @@
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Receipt");
			document.getElementsByTag("title").get(0).text("Delivery receipt");
			Element title_english = document.getElementById("title_english");
			title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
			Element qbj_english = document.getElementById("qbj_english");
			@@ -1460,7 +1502,7 @@
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text(payTypeEnglish);
			pay_type_english.text("I-GO Wallet");
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_english = document.getElementById("dispute_english");
			@@ -1470,11 +1512,11 @@
			dispute_english.remove();
			}
			Element pdf_english = document.getElementById("pdf_english");
			pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_english = document.getElementById("lost_item_english");
			lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_english = document.getElementById("track_english");
			// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_english = document.getElementById("pay_time_english");
			pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_english = document.getElementsByClass("driver_english");
			@@ -1497,7 +1539,7 @@
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Reçu");
			document.getElementsByTag("title").get(0).text("Reçu de livraison");
			Element title_french = document.getElementById("title_french");
			title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
			Element qbj_french = document.getElementById("qbj_french");
			@@ -1568,7 +1610,7 @@
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text(payTypeFrench);
			pay_type_french.text("Portefeuille I-GO");
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_french = document.getElementById("dispute_french");
			@@ -1578,11 +1620,11 @@
			dispute_french.remove();
			}
			Element pdf_french = document.getElementById("pdf_french");
			pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_french = document.getElementById("lost_item_french");
			lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_french = document.getElementById("track_french");
			// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_french = document.getElementById("pay_time_french");
			pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_french = document.getElementsByClass("driver_french");
			@@ -1603,14 +1645,14 @@
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			@@ -1619,28 +1661,28 @@
			fileWriter.flush();
			fileWriter.close();

			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			}
			file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			if(!file1.exists()){
			file1.createNewFile();
			}
			try{
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
			HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
			}catch (Exception e){
			e.printStackTrace();
			System.out.println("html转pdf异常");
			}

			String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
			String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(userInfo.getId());
			tEmail.setType(1);
			tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
			tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
			tEmail.setOrderId(orderId);
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			@@ -1743,6 +1785,7 @@
			if(null != settlementAllocation){
			JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
			Double maxPrice = jsonObject.getDouble("maxPrice");
			Integer type1 = jsonObject.getInteger("type");
			if(null != maxPrice){
			List<SettlementDetail> settlementDetailList = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>().eq("driverId", driver.getId())
			.isNull("settlementRecordId").last(" and DATE_FORMAT(now(), '%Y-%m-%d') = DATE_FORMAT(createTime, '%Y-%m-%d')"));
			@@ -1753,12 +1796,12 @@
			//日结算
			if(maxPrice.compareTo(total.doubleValue()) <= 0){
			SettlementRecord settlementRecord = settlementRecordService.selectOne(new EntityWrapper<SettlementRecord>().eq("driverId", orderLogistics.getDriverId())
			.eq("type", 1).eq("paymentStatus", 1).last(" and day = DATE_FORMAT(now(), '%Y-%m-%d')"));
			.eq("type", type1).eq("paymentStatus", 1).last(" and day = DATE_FORMAT(now(), '%Y-%m-%d')"));
			if(null == settlementRecord){
			settlementRecord = new SettlementRecord();
			settlementRecord.setDay(new Date());
			settlementRecord.setDriverId(orderLogistics.getDriverId());
			settlementRecord.setType(1);
			settlementRecord.setType(type1);
			settlementRecord.setPaymentStatus(1);
			settlementRecord.setPayMoney(total.doubleValue());
			settlementRecord.setInsertTime(new Date());
			@@ -1770,6 +1813,64 @@
			for (SettlementDetail detail : settlementDetailList) {
			detail.setSettlementRecordId(settlementRecord.getId());
			settlementDetailService.updateById(detail);
			}
			//强制司机下班
			DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>()
			.eq("driverId", orderLogistics.getDriverId()).eq("state", 1));
			if(null != driverWork){
			driverWork.setEndTime(new Date());
			driverWork.setState(2);
			driverWorkService.updateById(driverWork);
			driver.setState(1);
			driverService.updateById(driver);
			Car car = carService.selectById(driver.getCarId());
			if(!org.apache.shiro.util.StringUtils.hasLength(car.getVehicleId())){
			car.setVehicleId(UUIDUtil.getRandomCode());
			carService.updateById(car);
			}

			//司机下班，修改谷歌上的车辆信息
			new Thread(()->{
			try {
			CarModel carModel = carModelMapper.selectById(car.getCarModelId());
			String vehicles = fleetEngineUtil.getVehicles(car.getVehicleId());
			if(ToolUtil.isEmpty(vehicles)){
			boolean createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!createVehicles){
			for (int i = 0; i < 5; i++) {
			createVehicles = fleetEngineUtil.createVehicles(carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(createVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			}else{
			boolean updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(!updateVehicles){
			for (int i = 0; i < 5; i++) {
			updateVehicles = fleetEngineUtil.updateVehicles("OFFLINE", carModel.getSeat() - 1, car.getCarLicensePlate(), car.getVehicleId());
			if(updateVehicles){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			}
			}catch (Exception e){
			e.printStackTrace();
			}
			}).start();
			}
			}
			}
			@@ -1786,7 +1887,50 @@
			public void run() {
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			pushUtil.pushOrderState(2, orderLogistics.getDriverId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0, "");
			pushUtil.pushOfflinePayment(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getPayMoney());
			Integer language1 = driver.getLanguage();
			String text = "";
			switch (language1){
			case 1:
			text = "客户已选择支付现金，因此您必须收款。确定您已收到此订单费用：现金GHS " + orderLogistics.getPayMoney();
			break;
			case 2:
			text = "The client chose to pay in cash, so you must collect the payment.Confirm if you received the charge for this order: Cash GHS " + orderLogistics.getPayMoney();
			break;
			case 3:
			text = "Le client a choisi de payer en espèces, vous devez donc encaisser le paiement.Confirmez si vous avez reçu les frais pour cette commande : Espèces GHS " + orderLogistics.getPayMoney();
			break;

			}
			String audioUrl = "";
			String fileName = "offlinePayment" + orderLogistics.getDriverId() + UUIDUtil.getRandomCode(5) + ".mp3";
			try {
			audioUrl = TextToSpeechUtil.create(language1 == 1 ? "cmn-CN" : language1 == 2 ? "en-US" : "fr-FR", text, fileName);
			} catch (Exception e) {
			throw new RuntimeException(e);
			}
			//定时任务删除语音文件
			new Timer().schedule(new TimerTask() {
			@Override
			public void run() {
			try {
			// 使用Runtime执行命令
			Process process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName);
			// 读取命令的输出
			BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
			String line;
			while ((line = reader.readLine()) != null) {
			System.out.println(line);
			}
			// 等待命令执行完成
			process.waitFor();
			// 关闭流
			reader.close();
			} catch (IOException \| InterruptedException e) {
			e.printStackTrace();
			}
			}
			}, 30000);
			pushUtil.pushOfflinePayment(2, orderLogistics.getDriverId(), orderLogistics.getId(), 4, orderLogistics.getPayMoney(), audioUrl);
			}
			}).start();

			@@ -1795,15 +1939,6 @@
			"Vous avez payé la commande de livraison avec succès, merci d’utiliser I-GO", uid, 1);

			language = userInfo.getLanguage();
			String payTypeChinese = "";
			String payTypeEnglish = "";
			String payTypeFrench = "";
			if(orderLogistics.getPayType() == 3){
			payTypeChinese = "现金";
			payTypeEnglish = "Cash";
			payTypeFrench = "En espèces";
			}

			if(ToolUtil.isNotEmpty(userInfo.getEmail())){
			String path = templatePath + "user/receiptLogistics.html";
			Document document = Jsoup.parse(new File(path), "UTF-8");
			@@ -1817,7 +1952,7 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("I-GO电子收据");
			document.getElementsByTag("title").get(0).text("包裹收据");
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
			Element qbj_chinese = document.getElementById("qbj_chinese");
			@@ -1888,7 +2023,7 @@
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text(payTypeChinese);
			pay_type_chinese.text("现金");
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_chinese = document.getElementById("dispute_chinese");
			@@ -1898,11 +2033,11 @@
			dispute_chinese.remove();
			}
			Element pdf_chinese = document.getElementById("pdf_chinese");
			pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_chinese = document.getElementById("lost_item_chinese");
			lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_chinese = document.getElementById("track_chinese");
			// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_chinese = document.getElementById("pay_time_chinese");
			pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_chinese = document.getElementsByClass("driver_chinese");
			@@ -1925,7 +2060,7 @@
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Receipt");
			document.getElementsByTag("title").get(0).text("Delivery receipt");
			Element title_english = document.getElementById("title_english");
			title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
			Element qbj_english = document.getElementById("qbj_english");
			@@ -1996,7 +2131,7 @@
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text(payTypeEnglish);
			pay_type_english.text("Cash");
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_english = document.getElementById("dispute_english");
			@@ -2006,11 +2141,11 @@
			dispute_english.remove();
			}
			Element pdf_english = document.getElementById("pdf_english");
			pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_english = document.getElementById("lost_item_english");
			lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_english = document.getElementById("track_english");
			// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_english = document.getElementById("pay_time_english");
			pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_english = document.getElementsByClass("driver_english");
			@@ -2033,7 +2168,7 @@
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Reçu");
			document.getElementsByTag("title").get(0).text("Reçu de livraison");
			Element title_french = document.getElementById("title_french");
			title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
			Element qbj_french = document.getElementById("qbj_french");
			@@ -2104,7 +2239,7 @@
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text(payTypeFrench);
			pay_type_french.text("En espèces");
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_french = document.getElementById("dispute_french");
			@@ -2114,11 +2249,11 @@
			dispute_french.remove();
			}
			Element pdf_french = document.getElementById("pdf_french");
			pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
			Element lost_item_french = document.getElementById("lost_item_french");
			lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
			// Element track_french = document.getElementById("track_french");
			// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_french = document.getElementById("pay_time_french");
			pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_french = document.getElementsByClass("driver_french");
			@@ -2139,14 +2274,14 @@
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			@@ -2155,28 +2290,28 @@
			fileWriter.flush();
			fileWriter.close();

			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			}
			file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			if(!file1.exists()){
			file1.createNewFile();
			}
			try{
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
			HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + orderId + ".html", "I-GO", fileOutputStream);
			}catch (Exception e){
			e.printStackTrace();
			System.out.println("html转pdf异常");
			}

			String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
			String link ="https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(userInfo.getId());
			tEmail.setType(1);
			tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
			tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
			tEmail.setOrderId(orderId);
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			@@ -2229,8 +2364,8 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			return TinggPayUtil.checkoutRequest(checkoutRequest);
			}
			if(payType == 2){//银行卡支付
			@@ -2248,8 +2383,8 @@
			checkoutRequest.setRequestDescription("Travel completion payment");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderLogisticsSpread");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			return TinggPayUtil.checkoutRequest(checkoutRequest);
			}

			@@ -2408,6 +2543,29 @@
			query.setState(2);
			query.setCode(order_id);
			paymentRecordService.updateById(query);
			if(orderLogistics.getIsplatPay()==1){
			//添加已收入明细
			Company company = companyService.selectById(orderLogistics.getCompanyId());
			Double speMoney = company.getSpeMoney();
			BigDecimal d = null;//企业收入
			BigDecimal c = null;//司机收入
			if(company.getIsSpeFixedOrProportional() == 2){//固定
			d = new BigDecimal(speMoney);
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
			}
			if(company.getIsSpeFixedOrProportional() == 1){//比例
			Double price = orderLogistics.getStartMoney() + orderLogistics.getMileageMoney() + orderLogistics.getWaitMoney() + orderLogistics.getDurationMoney() + orderLogistics.getLongDistanceMoney();
			d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
			c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
			}
			incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), 4, d.doubleValue());
			incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), 4, c.doubleValue());
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
			driverService.updateById(driver);
			}

			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
			new Thread(new Runnable() {
			@@ -2424,20 +2582,6 @@
			"Vous avez payé la commande de livraison avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);

			language = userInfo.getLanguage();
			String payTypeChinese = "";
			String payTypeEnglish = "";
			String payTypeFrench = "";
			if(orderLogistics.getPayType() == 1){
			payTypeChinese = "手机支付";
			payTypeEnglish = "Mobile money";
			payTypeFrench = "Argent mobile";
			}
			if(orderLogistics.getPayType() == 2){
			payTypeChinese = "银行卡支付";
			payTypeEnglish = "Bank card";
			payTypeFrench = "Carte bancaire";
			}

			if(ToolUtil.isNotEmpty(userInfo.getEmail())){
			String path = templatePath + "user/receiptLogistics.html";
			Document document = Jsoup.parse(new File(path), "UTF-8");
			@@ -2452,7 +2596,7 @@
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("I-GO电子收据");
			document.getElementsByTag("title").get(0).text("包裹收据");
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
			Element qbj_chinese = document.getElementById("qbj_chinese");
			@@ -2523,7 +2667,7 @@
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text(payTypeChinese);
			pay_type_chinese.text(orderLogistics.getPayType() == 1 ? "手机支付" : (orderLogistics.getPayType() == 2?"银行卡支付":(orderLogistics.getPayType() == 3?"余额支付":"现金支付")));
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_chinese = document.getElementById("dispute_chinese");
			@@ -2533,11 +2677,11 @@
			dispute_chinese.remove();
			}
			Element pdf_chinese = document.getElementById("pdf_chinese");
			pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			pdf_chinese.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			Element lost_item_chinese = document.getElementById("lost_item_chinese");
			lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			lost_item_chinese.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			// Element track_chinese = document.getElementById("track_chinese");
			// track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_chinese.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_chinese = document.getElementById("pay_time_chinese");
			pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_chinese = document.getElementsByClass("driver_chinese");
			@@ -2560,7 +2704,7 @@
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			document.getElementsByTag("title").get(0).text("Receipt");
			document.getElementsByTag("title").get(0).text("Delivery receipt");
			Element title_english = document.getElementById("title_english");
			title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
			Element qbj_english = document.getElementById("qbj_english");
			@@ -2631,7 +2775,7 @@
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text(payTypeEnglish);
			pay_type_english.text(orderLogistics.getPayType() == 1 ? "Mobile money" :(orderLogistics.getPayType() == 2?"Bank card":(orderLogistics.getPayType() == 3?"I-GO Wallet":"Cash")));
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_english = document.getElementById("dispute_english");
			@@ -2641,11 +2785,11 @@
			dispute_english.remove();
			}
			Element pdf_english = document.getElementById("pdf_english");
			pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			pdf_english.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			Element lost_item_english = document.getElementById("lost_item_english");
			lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			lost_item_english.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			// Element track_english = document.getElementById("track_english");
			// track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_english.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_english = document.getElementById("pay_time_english");
			pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_english = document.getElementsByClass("driver_english");
			@@ -2668,7 +2812,7 @@
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			document.getElementsByTag("title").get(0).text("Reçu");
			document.getElementsByTag("title").get(0).text("Reçu de livraison");
			Element title_french = document.getElementById("title_french");
			title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande I-GO ");
			Element qbj_french = document.getElementById("qbj_french");
			@@ -2739,7 +2883,7 @@
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text(payTypeFrench);
			pay_type_french.text(orderLogistics.getPayType() == 1 ? "Argent mobile" : (orderLogistics.getPayType() == 2?"Carte bancaire":(orderLogistics.getPayType() == 3?"Portefeuille I-GO":"En espèces")));
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + new BigDecimal(orderLogistics.getPayMoney()).setScale(2, RoundingMode.HALF_EVEN));
			Element dispute_french = document.getElementById("dispute_french");
			@@ -2749,11 +2893,11 @@
			dispute_french.remove();
			}
			Element pdf_french = document.getElementById("pdf_french");
			pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			pdf_french.attr("href", "https://igo.i-go.group/user/base/order/uploadReceiptPdf?orderId=" + id + "&orderType=4");
			Element lost_item_french = document.getElementById("lost_item_french");
			lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			lost_item_french.attr("href", "https://igo.i-go.group/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + id + "&orderType=4");
			// Element track_french = document.getElementById("track_french");
			// track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
			// track_french.attr("href", "https://igo.i-go.group/mailbox/user/location.html");
			Element pay_time_french = document.getElementById("pay_time_french");
			pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
			Elements driver_french = document.getElementsByClass("driver_french");
			@@ -2774,14 +2918,14 @@
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu", document.html());
			EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison", document.html());

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + id + ".html");
			file = new File("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + id + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			@@ -2790,28 +2934,28 @@
			fileWriter.flush();
			fileWriter.close();

			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			File file1 = new File("/home/igotechgh/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			}
			file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + id + ".pdf");
			file1 = new File("/home/igotechgh/nginx/html/files/pdf/parcel_receipt_" + id + ".pdf");
			if(!file1.exists()){
			file1.createNewFile();
			}
			try{
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf("/usr/local/nginx/html/files/html/parcel_receipt_" + id + ".html", "I-GO", fileOutputStream);
			HtmlToPdfUtils.convertToPdf("/home/igotechgh/nginx/html/files/html/parcel_receipt_" + id + ".html", "I-GO", fileOutputStream);
			}catch (Exception e){
			e.printStackTrace();
			System.out.println("html转pdf异常");
			}

			String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + id + ".html";
			String link ="https://igo.i-go.group/files/html/parcel_receipt_" + id + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(userInfo.getId());
			tEmail.setType(1);
			tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
			tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Delivery receipt" : "Reçu de livraison");
			tEmail.setOrderId(id);
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			@@ -2943,7 +3087,7 @@
			Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId")));
			Integer state = Integer.valueOf(String.valueOf(map.get("state")));
			if(state == 6){
			map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html");
			map.put("receipt", "https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html");
			}else{
			map.put("receipt", "");
			}
			@@ -3090,13 +3234,13 @@
			String audioUrl = "";
			switch (language1){
			case 1:
			audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-CN.mp3";
			audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-CN.mp3";
			break;
			case 2:
			audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-EN.mp3";
			audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-EN.mp3";
			break;
			case 3:
			audioUrl = "http://182.160.16.251:81/files/audio/system/UserCancelledOrder-FR.mp3";
			audioUrl = "https://igo.i-go.group/files/audio/system/UserCancelledOrder-FR.mp3";
			break;
			}
			pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), 4, orderLogistics.getState(), 0, "");
			@@ -3109,9 +3253,18 @@

			if((orderLogistics.getState() == 10 \|\| orderLogistics.getState() == 12) && null != orderLogistics.getDriverId()){
			//修改行程信息
			fleetEngineUtil.updateTrip("CANCELED", null, null, orderLogistics.getTripId(), null, null, null, null);
			boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, orderLogistics.getTripId(), null, null, null, null);
			if(!updateTrip){
			for (int i = 0; i < 5; i++) {
			updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, orderLogistics.getTripId(), null, null, null, null);
			if(updateTrip){
			break;
			}
			Thread.sleep(5000L);
			}
			}
			}

			log.warn("取消订单：{} {}", System.currentTimeMillis(), orderLogistics.getTripId());
			//添加消息
			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You've cancelled the delivery order successfully, thank you for using I-GO "
			: "Vous avez annulé la commande de livraison avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);
			@@ -3234,7 +3387,7 @@
			map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
			map.put("orderType", orderLogistics.getType());
			if(state == 8 \|\| state == 9){
			map.put("receipt", "http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html");
			map.put("receipt", "https://igo.i-go.group/files/html/parcel_receipt_" + orderId + ".html");
			}else{
			map.put("receipt", "");
			}
			@@ -3304,7 +3457,7 @@
			BaseWarpper baseWarpper = new BaseWarpper();
			double amount = 0;
			CancleOrder query = cancleOrderService.query(orderLogistics.getCompanyId());
			if(null == query \|\| null == orderLogistics.getDriverId()){
			if(null == query \|\| null == orderLogistics.getDriverId() \|\| orderLogistics.getState() == 11){
			baseWarpper.setAmount(amount);
			return ResultUtil.success(baseWarpper);
			}
			@@ -3405,8 +3558,8 @@
			checkoutRequest.setRequestDescription("Cancel a trip");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, id, 4, 1, amount, null, 1);//添加预支付数据
			@@ -3430,8 +3583,8 @@
			checkoutRequest.setRequestDescription("Cancel a trip");
			checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
			checkoutRequest.setPendingRedirectUrl("");
			checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
			checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
			checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
			resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
			if(resultUtil.getCode()==200){
			paymentRecordService.saveData(1, null, null, id, 4, 2, amount, null, 1);//添加预支付数据
			@@ -3609,13 +3762,13 @@
			String audioUrl = "";
			switch (language1){
			case 1:
			audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-CN.mp3";
			audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-CN.mp3";
			break;
			case 2:
			audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-EN.mp3";
			audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-EN.mp3";
			break;
			case 3:
			audioUrl = "http://182.160.16.251:81/files/audio/system/ChangeAddress-FR.mp3";
			audioUrl = "https://igo.i-go.group/files/audio/system/ChangeAddress-FR.mp3";
			break;
			}
			pushUtil.pushModifyAddress(2, orderLogistics.getDriverId(), orderId, 4, 1, audioUrl);
			@@ -3735,11 +3888,11 @@

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Lucky-promo activities" : "Activités bonus", document.html());
			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/redpacket_" + orderId + ".html");
			file = new File("/home/igotechgh/nginx/html/files/html/redpacket_" + orderId + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			@@ -3748,7 +3901,7 @@
			fileWriter.flush();
			fileWriter.close();

			String link ="http://182.160.16.251:81/files/html/redpacket_" + orderId + ".html";
			String link ="https://igo.i-go.group/files/html/redpacket_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(userInfo.getId());
			@@ -3828,13 +3981,14 @@
			}
			}
			}


			String tripId = redisUtil.getValue("trip" + uid);
			String lnt = "0";
			String lat = "0";
			if(ToolUtil.isNotEmpty(value)){
			lnt = value.split(",")[0];
			lat = value.split(",")[1];
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt));
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderLogistics.getStartLat(), orderLogistics.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt), tripId);

			if(null == distancematrix){
			System.err.println("查询距离出错了");
			@@ -3862,7 +4016,7 @@
			orderServerWarpper.setLaveTime("0");
			}
			if(orderLogistics.getState() == 5 \|\| orderLogistics.getState() == 6){//服务中
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderLogistics.getEndLat(), orderLogistics.getEndLon());
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderLogistics.getEndLat(), orderLogistics.getEndLon(), tripId);
			if(null == distancematrix){
			System.err.println("查询距离出错了");
			}else if(distancematrix.getDistance() == 0){