From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 2e3495c..7941a98 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
@@ -6,12 +6,20 @@
import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper;
import com.stylefeng.guns.modular.system.model.Complaint;
import com.stylefeng.guns.modular.system.model.SensitiveWords;
+import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.IComplaintService;
import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
+import com.stylefeng.guns.modular.system.service.IUserInfoService;
+import com.stylefeng.guns.modular.system.util.EmailUtil;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.io.File;
import java.util.Date;
import java.util.List;
@@ -25,6 +33,12 @@
@Autowired
private ISystemNoticeService systemNoticeService;
+ @Autowired
+ private IUserInfoService userInfoService;
+
+ @Value("${spring.mail.template-path}")
+ private String templatePath;
+
/**
@@ -36,13 +50,14 @@
* @throws Exception
*/
@Override
- public void saveData(Integer driverId, String reason, String description, Integer uid) throws Exception {
+ public void saveData(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);
@@ -52,6 +67,30 @@
complaint.setIsHandle(0);
this.insert(complaint);
- systemNoticeService.addSystemNotice(1, "您的投诉已提交成功，我们会尽快处理！", uid, 1);
+ UserInfo userInfo = userInfoService.selectById(uid);
+ if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ String path = templatePath + "user/complaint.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ if(language == 1){
+ document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element chinese_user = document.getElementById("chinese_user");
+ chinese_user.text("您好 " + userInfo.getNickName() + "，");
+ }
+ if(language == 2){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element english_user = document.getElementById("english_user");
+ english_user.text("Hello " + userInfo.getNickName() + "，");
+ }
+ if(language == 3){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("english").attr("style", "display: none;");
+ 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());
+ }
+ 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);
}
}
--
Gitblit v1.7.1