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/OrderEvaluateServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 04166a4..9cdd4e6 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
@@ -58,10 +58,10 @@
      * @throws Exception
      */
     @Override
-    public ResultUtil saveData(Integer orderId, Integer orderType, Integer fraction, String content) throws Exception {
+    public ResultUtil saveData(Integer orderId, Integer orderType, Integer fraction, String content, Integer language) throws Exception {
         if(ToolUtil.isNotEmpty(content)){
             if(null != content && content.length() > 500){
-                return ResultUtil.error("评价内容过长");
+                return ResultUtil.error(language == 1 ? "评价内容过长" : language == 2 ? "The evaluation is too long" : "Contenu trop long de l’évaluation");
             }
             List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
             for(SensitiveWords s : sensitiveWords){
@@ -98,7 +98,7 @@
         orderEvaluate.setUserId(uid);
         this.insert(orderEvaluate);
 
-        systemNoticeService.addSystemNotice(1, "您已成功添加订单评价,谢谢使用!", uid, 1);
+        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);
         return ResultUtil.success(orderEvaluate.getId());
     }
 
@@ -114,4 +114,10 @@
         pageNum = (pageNum - 1) * size;
         return orderEvaluateMapper.queryOrderEvaluate(driverId, pageNum, size);
     }
+
+
+    @Override
+    public Double queryDriverScore(Integer driverId) throws Exception {
+        return this.baseMapper.queryDriverScore(driverId);
+    }
 }

--
Gitblit v1.7.1