From 9ef2e272c6ef99d152c5d6afc95af70a3822c57d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 09 九月 2023 18:12:28 +0800
Subject: [PATCH] 修改bug

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 3bba9fb..78b11d2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -101,8 +101,8 @@
      * @throws Exception
      */
     @Override
-    public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId) throws Exception {
-        return orderPrivateCarMapper.queryOrderList(state, driverId);
+    public List<Map<String, Object>> queryOrderList(Integer state, Integer driverId, Integer language) throws Exception {
+        return orderPrivateCarMapper.queryOrderList(state, driverId, language);
     }
 
     /**
@@ -113,8 +113,8 @@
      * @throws Exception
      */
     @Override
-    public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
-        return orderPrivateCarMapper.queryMyAllOrder(state, uid);
+    public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
+        return orderPrivateCarMapper.queryMyAllOrder(state, uid, language);
     }
 
 
@@ -125,8 +125,8 @@
      * @throws Exception
      */
     @Override
-    public Map<String, Object> queryPushOrder(Integer orderId) throws Exception {
-        return orderPrivateCarMapper.queryPushOrder(orderId);
+    public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
+        return orderPrivateCarMapper.queryPushOrder(orderId, language);
     }
 
 
@@ -221,8 +221,12 @@
             }
         }).start();
 
-        systemNoticeService.addSystemNotice(2, "您已成功抢得专车订单,请及时联系客户!", orderPrivateCar.getDriverId());
-        systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅,请保持电话畅通!", orderPrivateCar.getUserId());
+        systemNoticeService.addSystemNotice(2, language == 1 ? "您已成功抢得打车订单,请及时联系客户!" :
+                language == 2 ? "You have successfully grabbed a taxi order, please contact the customer in time!"
+                        : "Vous avez saisi avec succès une commande de taxi, veuillez contacter le client à temps!", orderPrivateCar.getDriverId());
+        systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅,请保持电话畅通!" :
+                language == 2 ? "Your order has been assigned to " + driver.getFirstName() + " master, please keep the phone open!"
+                        : "Votre commande a été attribuée à " + driver.getFirstName() + " master, veuillez garder le téléphone ouvert!", orderPrivateCar.getUserId());
         return ResultUtil.success();
     }
 

--
Gitblit v1.7.1