From 71a68f675e319967c3078f3f2b86ee971b47b50b Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 02 九月 2024 13:34:26 +0800
Subject: [PATCH] 修改bug和翻译
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java
index c7ef5de..3a269c8 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java
@@ -60,18 +60,19 @@
* @throws Exception
*/
@Override
- public void saveData(Integer driverId, String reason, String description, Integer uid, Integer language) throws Exception {
+ public void saveData(Integer orderId, Integer orderType, Integer driverId, String reason, String description, Integer uid, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(description)){
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
for(SensitiveWords s : sensitiveWords){
description = description.replaceAll(s.getContent(), "***");
}
}
- language = userInfoService.queryLanguage(uid, language);
Complaint complaint = new Complaint();
complaint.setInsertTime(new Date());
complaint.setDriverId(driverId);
complaint.setReason(reason);
+ complaint.setOrderId(orderId);
+ complaint.setOrderType(orderType);
complaint.setDescription(description);
complaint.setUserId(uid);
complaint.setIsHandle(0);
@@ -84,29 +85,32 @@
if(language == 1){
document.getElementById("english").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("投诉司机");
Element chinese_user = document.getElementById("chinese_user");
chinese_user.text("您好 " + userInfo.getNickName() + "，");
}
if(language == 2){
document.getElementById("chinese").remove();
document.getElementById("french").remove();
+ document.getElementsByTag("title").get(0).text("Complain against driver");
Element english_user = document.getElementById("english_user");
english_user.text("Hello " + userInfo.getNickName() + "，");
}
if(language == 3){
document.getElementById("chinese").remove();
document.getElementById("english").remove();
+ document.getElementsByTag("title").get(0).text("Porter plainte contre le chauffeur");
Element french_user = document.getElementById("french_user");
french_user.text("Bonjour " + userInfo.getNickName() + "，");
}
- EmailUtil.send(userInfo.getEmail(), language == 1 ? "投诉司机" : language == 2 ? "Complain Driver" : "Se plaindre du conducteur", document.html());
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "投诉司机" : language == 2 ? "Complain against driver" : "Porter plainte contre le chauffeur", 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();
}
String randomString = ToolUtil.getRandomString(10);
- file = new File("/usr/local/nginx/html/files/html/complain_" + randomString + ".html");
+ file = new File("/home/igotechgh/nginx/html/files/html/complain_" + randomString + ".html");
if(!file.exists()){
file.createNewFile();
}
@@ -114,36 +118,25 @@
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/complain_" + randomString + ".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/complain_" + randomString + ".html";
+ String link ="https://igo.i-go.group/files/html/complain_" + randomString + ".html";
TEmail tEmail = new TEmail();
tEmail.setLink(link);
tEmail.setUserId(uid);
tEmail.setType(1);
- tEmail.setName(language == 1 ? "投诉司机" : language == 2 ? "Complain Driver" : "Se plaindre du conducteur");
+ tEmail.setName(language == 1 ? "投诉司机" : language == 2 ? "Complain against driver" : "Porter plainte contre le chauffeur");
tEmail.setCreateTime(new Date());
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
tEmail.setWeek(EmailUtil.getWeek(language,i));
boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
if(am){
- tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
+ tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
}else {
- tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
+ tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
}
emailService.insert(tEmail);
}
- systemNoticeService.addSystemNotice(1, language == 1 ? "您的投诉已提交成功，我们会尽快处理！" : language == 2 ? "Your complaint has been submitted successfully and we will deal with it as soon as possible" : "Votre plainte a été soumise avec succès et nous la traiterons dès que possible", uid, 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您的投诉已提交成功，我们会尽快处理！" : language == 2 ? "Your complaints were submitted successfully, we shall handle it as soon as possible." : "Vos réclamations ont été déposées avec succès, nous les traiterons dans les plus brefs délais.", uid, 1);
}
}
--
Gitblit v1.7.1