java/IgoTravel.git

			@@ -299,8 +299,8 @@

			//添加消息
			systemNoticeService.addSystemNotice(1, language == 1 ? "您的市内包裹订单已下单成功，我们正在为您指派司机，请稍后！" :
			language == 2 ? "Your parcel order has been successfully placed, we are assigning a driver for you, please wait!"
			: "Votre commande de colis a bien été passée, nous vous assignons un chauffeur, veuillez patienter!", orderLogistics.getUserId(), 1);
			language == 2 ? "You've placed the package order successfully, we are assigning you a driver, please wait."
			: "Vous avez passé la commande de colis avec succès, nous vous attribuons un chauffeur, veuillez patienter.", orderLogistics.getUserId(), 1);

			BaseWarpper baseWarpper = new BaseWarpper();
			baseWarpper.setId(orderLogistics.getId());
			@@ -431,6 +431,7 @@
			PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
			//获取空闲司机
			List<Driver> list = driverService.queryIdleDriver(orderLogistics.getType(), null, orderLogistics.getStartLon(), orderLogistics.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
			System.err.println("【" + orderLogistics.getId() + "】空闲司机：" + JSON.toJSONString(list));
			if(list.size() > 0){
			double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
			int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
			@@ -569,175 +570,9 @@
			}
			}).start();

			if(ToolUtil.isNotEmpty(userInfo.getEmail())){
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			String path = templatePath + "user/receiptLogistics.html";
			Document document = Jsoup.parse(new File(path), "UTF-8");
			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
			SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
			Element xcf_chinese = document.getElementById("xcf_chinese");
			xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text("现金");
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
			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");
			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");
			// Element track_chinese = document.getElementById("track_chinese");
			// track_chinese.attr("href", "http://182.160.16.251:81/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");
			for (int i = 0; i < driver_chinese.size(); i++) {
			Element element = driver_chinese.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			}
			Element start_address_chinese = document.getElementById("start_address_chinese");
			start_address_chinese.text(orderLogistics.getStartAddress());
			Element end_address_chinese = document.getElementById("end_address_chinese");
			end_address_chinese.text(orderLogistics.getEndAddress());
			Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
			Element server_tel_chinese = document.getElementById("server_tel_chinese");
			server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			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 xcf_english = document.getElementById("xcf_english");
			xcf_english.text("GHS " + orderLogistics.getOrderMoney());
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + orderLogistics.getOrderMoney());
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text("cash");
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + orderLogistics.getPayMoney());
			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");
			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");
			// Element track_english = document.getElementById("track_english");
			// track_english.attr("href", "http://182.160.16.251:81/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");
			for (int i = 0; i < driver_english.size(); i++) {
			Element element = driver_english.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			}
			Element start_address_english = document.getElementById("start_address_english");
			start_address_english.text(orderLogistics.getStartAddress());
			Element end_address_english = document.getElementById("end_address_english");
			end_address_english.text(orderLogistics.getEndAddress());
			Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
			Element server_tel_english = document.getElementById("server_tel_english");
			server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			Element title_french = document.getElementById("title_french");
			title_french.text("Le " + DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + ", vous avez dépensé GHS " + orderLogistics.getPayMoney() + " sur le voyage");
			Element xcf_french = document.getElementById("xcf_french");
			xcf_french.text("GHS " + orderLogistics.getOrderMoney());
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + orderLogistics.getOrderMoney());
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text("espèces");
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + orderLogistics.getPayMoney());
			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");
			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");
			// Element track_french = document.getElementById("track_french");
			// track_french.attr("href", "http://182.160.16.251:81/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");
			for (int i = 0; i < driver_french.size(); i++) {
			Element element = driver_french.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			}
			Element start_address_french = document.getElementById("start_address_french");
			start_address_french.text(orderLogistics.getStartAddress());
			Element end_address_french = document.getElementById("end_address_french");
			end_address_french.text(orderLogistics.getEndAddress());
			Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
			Element server_tel_french = document.getElementById("server_tel_french");
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", document.html());

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			FileWriter fileWriter = new FileWriter(file);
			fileWriter.write(document.html());
			fileWriter.flush();
			fileWriter.close();
			FileInputStream fileInputStream = new FileInputStream(file);
			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			}
			file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			if(!file1.exists()){
			file1.createNewFile();
			}
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);

			String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(uid);
			tEmail.setType(1);
			tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis");
			tEmail.setOrderId(orderId);
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
			}
			emailService.insert(tEmail);

			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}).start();
			}

			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付，谢谢使用！" : language == 2
			? "You have successfully completed the parcel order payment, thank you for using!" :
			"Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", uid, 1);
			? "You've paid for the package order successfully, thank you for using I-GO" :
			"Vous avez payé la commande de colis avec succès, merci d’utiliser I-GO", uid, 1);
			this.pushOrder(orderLogistics);//推单
			}

			@@ -754,173 +589,6 @@
			orderLogistics.setPayType(4);
			orderLogistics.setPayMoney(orderMoney);

			if(ToolUtil.isNotEmpty(userInfo.getEmail())){
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			String path = templatePath + "user/receiptLogistics.html";
			Document document = Jsoup.parse(new File(path), "UTF-8");
			SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
			SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
			Driver driver = driverService.selectById(orderLogistics.getDriverId());
			if(1 == language){
			document.getElementById("english").remove();
			document.getElementById("french").remove();
			Element title_chinese = document.getElementById("title_chinese");
			title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
			Element xcf_chinese = document.getElementById("xcf_chinese");
			xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
			Element xj_chinese = document.getElementById("xj_chinese");
			xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
			Element pay_type_chinese = document.getElementById("pay_type_chinese");
			pay_type_chinese.text("现金");
			Element pay_money_chinese = document.getElementById("pay_money_chinese");
			pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
			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");
			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");
			// Element track_chinese = document.getElementById("track_chinese");
			// track_chinese.attr("href", "http://182.160.16.251:81/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");
			for (int i = 0; i < driver_chinese.size(); i++) {
			Element element = driver_chinese.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			}
			Element start_address_chinese = document.getElementById("start_address_chinese");
			start_address_chinese.text(orderLogistics.getStartAddress());
			Element end_address_chinese = document.getElementById("end_address_chinese");
			end_address_chinese.text(orderLogistics.getEndAddress());
			Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
			Element server_tel_chinese = document.getElementById("server_tel_chinese");
			server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}
			if(2 == language){
			document.getElementById("chinese").remove();
			document.getElementById("french").remove();
			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 xcf_english = document.getElementById("xcf_english");
			xcf_english.text("GHS " + orderLogistics.getOrderMoney());
			Element xj_english = document.getElementById("xj_english");
			xj_english.text("GHS " + orderLogistics.getOrderMoney());
			Element pay_type_english = document.getElementById("pay_type_english");
			pay_type_english.text("cash");
			Element pay_money_english = document.getElementById("pay_money_english");
			pay_money_english.text("GHS " + orderLogistics.getPayMoney());
			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");
			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");
			// Element track_english = document.getElementById("track_english");
			// track_english.attr("href", "http://182.160.16.251:81/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");
			for (int i = 0; i < driver_english.size(); i++) {
			Element element = driver_english.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			}
			Element start_address_english = document.getElementById("start_address_english");
			start_address_english.text(orderLogistics.getStartAddress());
			Element end_address_english = document.getElementById("end_address_english");
			end_address_english.text(orderLogistics.getEndAddress());
			Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
			Element server_tel_english = document.getElementById("server_tel_english");
			server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}
			if(3 == language){
			document.getElementById("chinese").remove();
			document.getElementById("english").remove();
			Element title_french = document.getElementById("title_french");
			title_french.text("Le " + DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + ", vous avez dépensé GHS " + orderLogistics.getPayMoney() + " sur le voyage" );
			Element xcf_french = document.getElementById("xcf_french");
			xcf_french.text("GHS " + orderLogistics.getOrderMoney());
			Element xj_french = document.getElementById("xj_french");
			xj_french.text("GHS " + orderLogistics.getOrderMoney());
			Element pay_type_french = document.getElementById("pay_type_french");
			pay_type_french.text("espèces");
			Element pay_money_french = document.getElementById("pay_money_french");
			pay_money_french.text("GHS " + orderLogistics.getPayMoney());
			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");
			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");
			// Element track_french = document.getElementById("track_french");
			// track_french.attr("href", "http://182.160.16.251:81/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");
			for (int i = 0; i < driver_french.size(); i++) {
			Element element = driver_french.get(i);
			element.text(driver.getFirstName() + "." + driver.getLastName());
			}
			Element start_address_french = document.getElementById("start_address_french");
			start_address_french.text(orderLogistics.getStartAddress());
			Element end_address_french = document.getElementById("end_address_french");
			end_address_french.text(orderLogistics.getEndAddress());
			Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
			Element server_tel_french = document.getElementById("server_tel_french");
			server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
			}

			EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", document.html());

			//开始生成pdf收据和html收据
			File file = new File("/usr/local/nginx/html/files/html/");
			if(!file.exists()){
			file.mkdirs();
			}
			file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
			if(!file.exists()){
			file.createNewFile();
			}
			FileWriter fileWriter = new FileWriter(file);
			fileWriter.write(document.html());
			fileWriter.flush();
			fileWriter.close();
			FileInputStream fileInputStream = new FileInputStream(file);
			File file1 = new File("/usr/local/nginx/html/files/pdf/");
			if(!file1.exists()){
			file1.mkdirs();
			}
			file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
			if(!file1.exists()){
			file1.createNewFile();
			}
			FileOutputStream fileOutputStream = new FileOutputStream(file1);
			HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);

			String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
			TEmail tEmail = new TEmail();
			tEmail.setLink(link);
			tEmail.setUserId(uid);
			tEmail.setType(1);
			tEmail.setName(language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis");
			tEmail.setOrderId(orderId);
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			String week = EmailUtil.getWeek(language, i);
			tEmail.setWeek(week);
			boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
			if(am){
			tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
			}else {
			tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
			}
			emailService.insert(tEmail);

			}catch (Exception e){
			e.printStackTrace();
			}
			}
			}).start();
			}


			// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
			new Thread(new Runnable() {
			@Override
			@@ -931,8 +599,8 @@
			}).start();

			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付，谢谢使用！" : language == 2
			? "You have successfully completed the parcel order payment, thank you for using!" :
			"Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", uid, 1);
			? "You've paid for the package order successfully, thank you for using I-GO" :
			"Vous avez payé la commande de colis avec succès, merci d’utiliser I-GO", uid, 1);

			this.pushOrder(orderLogistics);//推单
			}
			@@ -1056,8 +724,8 @@
			}).start();

			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付，谢谢使用！" : language == 2
			? "You have successfully completed the difference payment of parcel order, thank you for using!"
			: "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", uid, 1);
			? "You've paid for the difference of package order successfully, thank you for using I-GO"
			: "Vous avez payé la différence de commande de colis avec succès, merci d’utiliser I-GO", uid, 1);
			}

			if(payType == 4){//现金支付
			@@ -1113,8 +781,8 @@
			}).start();

			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付，谢谢使用！" : language == 2
			? "You have successfully completed the difference payment of parcel order, thank you for using!"
			: "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", uid, 1);
			? "You've paid for the difference of package order successfully, thank you for using I-GO"
			: "Vous avez payé la différence de commande de colis avec succès, merci d’utiliser I-GO", uid, 1);
			}


			@@ -1155,8 +823,8 @@


			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付，谢谢使用！" : language == 2
			? "You have successfully completed the parcel order payment, thank you for using!" :
			"Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1);
			? "You've paid for the package order successfully, thank you for using I-GO" :
			"Vous avez payé la commande de colis avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);

			this.pushOrder(orderLogistics);//推单
			}else{
			@@ -1230,8 +898,8 @@
			}).start();

			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付，谢谢使用！" : language == 2
			? "You have successfully completed the difference payment of parcel order, thank you for using!"
			: "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1);
			? "You've paid for the difference of package order successfully, thank you for using I-GO"
			: "Vous avez payé la différence de commande de colis avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);
			}else{
			System.err.println("预支付数据异常（orderId = " + id + ")");
			}
			@@ -1447,8 +1115,8 @@
			}

			//添加消息
			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You have successfully cancelled your parcel order, thank you for using!"
			: "Vous avez annulé avec succès votre commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1);
			systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单，谢谢使用！" : language == 2 ? "You've cancelled the package order successfully, thank you for using I-GO "
			: "Vous avez annulé la commande de colis avec succès, merci d’utiliser I-GO", orderLogistics.getUserId(), 1);
			Map<String, Object> map = new HashMap<>();
			map.put("id", integer);
			return ResultUtil.success(map);