From 31929207a91ad4d215f11401b17446cf09eefd2c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 17 三月 2025 17:36:21 +0800
Subject: [PATCH] 添加用户手机号码的校验
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 32 +------
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java | 6 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 16 ---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ComplaintServiceImpl.java | 16 ---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java | 16 ---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java | 13 +++
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 7 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java | 16 ---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java | 16 ---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java | 19 +---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 16 ---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java | 16 ---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 16 ---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/FeedbackController.java | 6 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 10 ++
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 16 ---
16 files changed, 77 insertions(+), 160 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
index 95611a9..c7bdd02 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
@@ -37,23 +37,12 @@
if(content.length() > 200){
return ResultUtil.error(language == 1 ? "反馈内容过长" : language == 2 ? "Feedback-content is overlong." : "Le contenu de l’avis est trop long.");
}
+ content = content.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(content.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ content = content.replaceAll(s.getContent().toLowerCase(), "***");
}
- content = list.stream().collect(Collectors.joining(" "));
}
-
Feedback feedback = new Feedback();
feedback.setContent(content);
feedback.setFlag(1);
@@ -64,4 +53,6 @@
this.insert(feedback);
return ResultUtil.success();
}
+
+
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index 8956c3a..b8a7f3d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -141,21 +141,11 @@
public ResultUtil saveData(Reassign reassign, Integer uid, Integer type, Integer language) throws Exception {
String content = reassign.getRemark();
if(ToolUtil.isNotEmpty(content)){
+ content = content.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(content.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ content = content.replaceAll(s.getContent().toLowerCase(), "***");
}
- content = list.stream().collect(Collectors.joining(" "));
}
reassign.setRemark(content);
ResultUtil resultUtil = ResultUtil.success();
@@ -755,21 +745,11 @@
type = null == type ? 2 : type;//现目前微信只支持小程序支付
String content = reassign.getRemark();
if(ToolUtil.isNotEmpty(content)){
+ content = content.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(content.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ content = content.replaceAll(s.getContent().toLowerCase(), "***");
}
- content = list.stream().collect(Collectors.joining(" "));
}
reassign.setRemark(content);
ResultUtil resultUtil = ResultUtil.success();
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
index f87ad95..5e8dad0 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
@@ -112,21 +112,11 @@
public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
+ remark = remark.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(remark.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ remark = remark.replaceAll(s.getContent().toLowerCase(), "***");
}
- remark = list.stream().collect(Collectors.joining(" "));
}
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/FeedbackController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/FeedbackController.java
index d8bbd61..c94292f 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/FeedbackController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/FeedbackController.java
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.api;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.IFeedbackService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -50,6 +52,10 @@
if(uid == null){
return ResultUtil.tokenErr();
}
+ UserInfo userInfo = userInfoService.selectById(uid);
+ if(ToolUtil.isEmpty(userInfo.getPhone())){
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
+ }
return feedbackService.feedback(content, uid, language);
}catch (Exception e){
e.printStackTrace();
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java
index 0018ab9..c1cb0ae 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ProblemController.java
@@ -1,5 +1,7 @@
package com.stylefeng.guns.modular.api;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.IProblemService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -53,6 +55,10 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ UserInfo userInfo = userInfoService.selectById(uid);
+ if(ToolUtil.isEmpty(userInfo.getPhone())){
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
+ }
return problemService.leaveMessage(content, uid, language);
}catch (Exception e){
e.printStackTrace();
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
index 3c211b4..b668c36 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -798,11 +798,15 @@
@ApiImplicitParam(value = "电话号码，没有传空字符串", name = "phone", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil setUrgentUser(String name, String phone, HttpServletRequest request){
+ public ResultUtil setUrgentUser(String name, String phone, Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
+ }
+ UserInfo userInfo = userInfoService.selectById(uid);
+ if(ToolUtil.isEmpty(userInfo.getPhone())){
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
}
String substring = phone.substring(0, 1);
if("0".equals(substring)){
@@ -1238,6 +1242,10 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ UserInfo userInfo = userInfoService.selectById(uid);
+ if(ToolUtil.isEmpty(userInfo.getPhone())){
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
+ }
BigDecimal bigDecimal = new BigDecimal(code);
long max = Long.MAX_VALUE;
if(bigDecimal.compareTo(new BigDecimal(max)) >= 0){
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 4f9cd6c..2e133fd 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1198,21 +1198,11 @@
public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid) throws Exception {
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
+ remark = remark.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(remark.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ remark = remark.replaceAll(s.getContent().toLowerCase(), "***");
}
- remark = list.stream().collect(Collectors.joining(" "));
}
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index fb532b8..5a6fac3 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -3197,21 +3197,11 @@
public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Double lon, Double lat, String address, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
+ remark = remark.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(remark.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ remark = remark.replaceAll(s.getContent().toLowerCase(), "***");
}
- remark = list.stream().collect(Collectors.joining(" "));
}
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 9101d5e..5c162c7 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -789,21 +789,11 @@
public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Double lon, Double lat, String address, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
+ remark = remark.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(remark.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ remark = remark.replaceAll(s.getContent().toLowerCase(), "***");
}
- remark = list.stream().collect(Collectors.joining(" "));
}
}
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 daed891..fa0a672 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
@@ -61,21 +61,11 @@
@Override
public void saveData(Integer orderId, Integer orderType, Integer driverId, String reason, String description, Integer uid, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(description)){
+ description = description.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(description.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ description = description.replaceAll(s.getContent().toLowerCase(), "***");
}
- description = list.stream().collect(Collectors.joining(" "));
}
Complaint complaint = new Complaint();
complaint.setInsertTime(new Date());
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
index 91b6c5f..055d0c8 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/FeedbackServiceImpl.java
@@ -68,21 +68,11 @@
language = userInfoService.queryLanguage(uid, language);
return ResultUtil.error(language == 1 ? "反馈内容过长" : language == 2 ? "Feedback-content is overlong." : "Le contenu de l’avis est trop long.");
}
+ content = content.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(content.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ content = content.replaceAll(s.getContent().toLowerCase(), "***");
}
- content = list.stream().collect(Collectors.joining(" "));
}
Feedback feedback = new Feedback();
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
index 4b042ef..953d539 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
@@ -68,21 +68,11 @@
if(null != content && content.length() > 500){
return ResultUtil.error(language == 1 ? "评价内容过长" : language == 2 ? "Rating-content is overlong." : "Le contenu de l’évaluation est trop long.");
}
+ content = content.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(content.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ content = content.replaceAll(s.getContent().toLowerCase(), "***");
}
- content = list.stream().collect(Collectors.joining(" "));
}
OrderEvaluate orderEvaluate = new OrderEvaluate();
Integer driverId = null;
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java
index bbacb35..96e8b50 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java
@@ -46,21 +46,11 @@
language = userInfoService.queryLanguage(uid, language);
return ResultUtil.error(language == 1 ? "留言内容过长" : language == 2 ? "Message-content is overlong." : "Le contenu du message est trop long.");
}
+ content = content.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(content.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ content = content.replaceAll(s.getContent().toLowerCase(), "***");
}
- content = list.stream().collect(Collectors.joining(" "));
}
Problem problem = new Problem();
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
index c1fb2af..5757313 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
@@ -3,10 +3,12 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.ServerCarModelMapper;
import com.stylefeng.guns.modular.system.dao.SystemPriceMapper;
import com.stylefeng.guns.modular.system.model.Company;
import com.stylefeng.guns.modular.system.model.ServerCarModel;
+import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.ICompanyCityService;
import com.stylefeng.guns.modular.system.service.IServerCarModelService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
@@ -66,6 +68,17 @@
*/
@Override
public ResultUtil<List<ServerCarModelWarpper>> queryServerCarModel(Integer uid, String startLonLat, String endLonLat, Integer type, Integer language) throws Exception {
+ UserInfo userInfo = userInfoService.selectById(uid);
+ if(null != userInfo && ToolUtil.isEmpty(userInfo.getPhone())){
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
+ }
+ String[] split = startLonLat.split(",");
+ Company company = companyCityService.query1(uid, split[0], split[1]);
+ if(null != userInfo && null != company){
+ userInfo.setCompanyId(company.getId());
+ userInfoService.updateById(userInfo);
+ }
+
String tripId = redisUtil.getValue("trip" + uid);
//查找与起点匹配的企业（经营范围）
ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(Double.valueOf(startLonLat.split(",")[1]), Double.valueOf(startLonLat.split(",")[0]), tripId);
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 5c9c59e..ba8d672 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -1581,8 +1581,8 @@
userInfo1.setSex(userInfo.getSex());
userInfo1.setNickName(userInfo.getNickName());
this.updateById(userInfo1);
-
- this.deleteById(userInfo.getId());//删除原有数据
+ userInfo.setFlag(3);
+ this.updateById(userInfo);//删除原有数据
//还原之前账号领取的注册优惠券
List<UserCouponRecord> list = userCouponRecordService.selectList(new EntityWrapper<UserCouponRecord>().eq("userId", userInfo.getId()));
for(UserCouponRecord ucr : list){
@@ -1732,6 +1732,9 @@
@Override
public ResultUtil depositBalance(Integer payType, String bankCardId, Double money, Integer uid, Integer type, Integer language) throws Exception {
UserInfo userInfo = userInfoMapper.selectById(uid);
+ if(ToolUtil.isEmpty(userInfo.getPhone())){
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind your mobile phone number first." : "Veuillez d’abord vous inscrire en liant votre numéro de téléphone portable.");
+ }
if(money.compareTo(0D) <= 0){
return ResultUtil.error(language == 1 ? "支付金额必须大于0元" : language == 2 ? "Payment amount must be greater than zero." : "Le montant du paiement doit être supérieur à zéro.", "");
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 5d49b66..9885fca 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -402,21 +402,11 @@
public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid) throws Exception {
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
+ remark = remark.toLowerCase();
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
- List<String> list = Arrays.asList(remark.split(" "));
- for(SensitiveWords s : sensitiveWords){
- List<String> str = new ArrayList<>();
- String lowerCase = s.getContent().toLowerCase();
- for (String s1 : list) {
- if(lowerCase.equals(s1.toLowerCase())){
- str.add("***");
- }else{
- str.add(s1);
- }
- }
- list = str;
+ for(SensitiveWords s : sensitiveWords) {
+ remark = remark.replaceAll(s.getContent().toLowerCase(), "***");
}
- remark = list.stream().collect(Collectors.joining(" "));
}
}
--
Gitblit v1.7.1