From b701b92c8af86026b2536c65ec9161037e88a8d9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 12 三月 2025 18:26:41 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
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 41a6dbd..4b042ef 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
@@ -4,6 +4,8 @@
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
+import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
+import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.OrderEvaluateMapper;
@@ -20,9 +22,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
@@ -45,6 +46,9 @@
@Autowired
private IOrderCrossCityService orderCrossCityService;
+
+ @Autowired
+ private IOrderLogisticsService orderLogisticsService;
@@ -65,9 +69,20 @@
return ResultUtil.error(language == 1 ? "评价内容过长" : language == 2 ? "Rating-content is overlong." : "Le contenu de l’évaluation est trop long.");
}
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
+ List<String> list = Arrays.asList(content.split(" "));
for(SensitiveWords s : sensitiveWords){
- content = content.replaceAll(s.getContent(), "***");
+ 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;
}
+ content = list.stream().collect(Collectors.joining(" "));
}
OrderEvaluate orderEvaluate = new OrderEvaluate();
Integer driverId = null;
@@ -88,6 +103,11 @@
driverId = orderCrossCity.getDriverId();
uid = orderCrossCity.getUserId();
break;
+ case 4:
+ OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
+ driverId = orderLogistics.getDriverId();
+ uid = orderLogistics.getUserId();
+ break;
}
orderEvaluate.setOrderId(orderId);
@@ -99,7 +119,7 @@
orderEvaluate.setUserId(uid);
this.insert(orderEvaluate);
- systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功添加订单评价，谢谢使用！" : language == 2 ? "You have successfully added the order evaluation, thank you for using!" : "Vous avez ajouté une évaluation de commande avec succès. Merci d’utiliser!", uid, 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功添加订单评价，谢谢使用！" : language == 2 ? "You've added the rating successfully, thank you for using I-GO" : "Vous avez ajouté l’évaluation avec succès, merci d’utiliser I-GO", uid, 1);
return ResultUtil.success(orderEvaluate.getId());
}
--
Gitblit v1.7.1