From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 2cfbb94..68f009a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -346,7 +346,7 @@
driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverMapper.updateById(driver);
- if(ToolUtil.isNotEmpty(driver.getEmail())){
+ if(list.size() > 0 && ToolUtil.isNotEmpty(driver.getEmail())){
String path = templatePath + "driver/index.html";
Document document = Jsoup.parse(new File(path), "UTF-8");
if(1 == language){
@@ -536,7 +536,7 @@
driver.setBalance(bigDecimal.add(new BigDecimal(driver.getBalance())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverMapper.updateById(driver);
- if(ToolUtil.isNotEmpty(driver.getEmail())){
+ if(list.size() > 0 && ToolUtil.isNotEmpty(driver.getEmail())){
Driver finalDriver = driver;
BigDecimal finalBigDecimal = bigDecimal;
new Thread(new Runnable() {
@@ -1196,7 +1196,7 @@
//检测是否有未完成的订单
List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
if(list.size() > 0){
- return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
+ return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "Outstanding orders ! So you can't get off work" : "Commandes en suspens ! Vous ne pouvez pas quitter le travail");
}
driverWork.setEndTime(new Date());
driverWork.setState(2);
@@ -1410,7 +1410,7 @@
//检测是否有未完成的订单
List<Map<String, Object>> list = orderService.queryOrderList(1, 1, 10, uid, language);
if(list.size() > 0){
- return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "There are still outstanding orders, can not be off-duty operation" : "Il y a encore des commandes en suspens qui ne peuvent pas être exécutées");
+ return ResultUtil.error(language == 1 ? "还有未完成的订单，不能进行下班操作" : language == 2 ? "Outstanding orders ! So you can't get off work" : "Commandes en suspens ! Vous ne pouvez pas quitter le travail");
}
driverWork.setEndTime(new Date());
driverWork.setState(2);
@@ -3287,6 +3287,7 @@
@Override
public List<Driver> queryIdleDriver(Integer userId, Integer type, Integer serverCarModelId, Double lon, Double lat, Double distance, Integer companyId) throws Exception {
List<Driver> drivers = driverMapper.queryIdleDriver_(type, serverCarModelId, companyId);
+ System.err.println("派单查询的司机：" + JSON.toJSONString(drivers));
String tripId = redisUtil.getValue("trip" + userId);
List<Driver> list = new ArrayList<>();
for(Driver driver : drivers){
--
Gitblit v1.7.1