From d6ad5bd0c95b6ebe6361d74ff297d1a9f4b759fa Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 20:19:56 +0800
Subject: [PATCH] 修改bug
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 5e4db32..9e470c0 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -932,14 +932,20 @@
if(driver.getState() == 3){
return ResultUtil.error("还在服务中，不能更换");
}
-// boolean idle = carService.idle(carId);
// 修改是否别司机在使用
boolean idle = carService.useState(carId,uid);
- if(!idle){
+ if(idle){
return ResultUtil.error("当前车辆已经有其他司机在使用，请更换车辆");
}
- // 将所有绑定他的车 =null
- carService.updateUseState(carId,uid);
+ List<Driver> drivers = this.selectList(new EntityWrapper<Driver>().eq("carId", carId)
+ .eq("authState", 2).ne("flag", 3));
+ drivers.forEach(d->{
+ d.setCarId(null);
+ });
+ if(drivers.size() > 0){
+ this.updateAllColumnBatchById(drivers);
+ }
+
Car car = carService.selectById(carId);
car.setUseDriverId(uid);
carService.updateById( car);
@@ -1638,10 +1644,15 @@
driverIndexVo.setTodayOrderNum(orderPrivateCars.size() + orderCrossCities.size() + orderTaxis.size());
- double sum = orderPrivateCars.stream().mapToDouble(OrderPrivateCar::getOrderMoney).sum();
- double sum1 = orderCrossCities.stream().mapToDouble(OrderCrossCity::getOrderMoney).sum();
- double sum2 = orderTaxis.stream().filter(e->e.getOrderMoney()!=null).mapToDouble(OrderTaxi::getOrderMoney).sum();
- driverIndexVo.setTodayOrderMoney(new BigDecimal(sum +sum1+sum2));
+//
+// double sum1 = orderCrossCities.stream().mapToDouble(OrderCrossCity::getOrderMoney).sum();
+// double sum2 = orderTaxis.stream().filter(e->e.getOrderMoney()!=null).mapToDouble(OrderTaxi::getOrderMoney).sum();
+//
+
+ List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid).eq("userType", 2).eq("type", 2).like("insertTime", LocalDate.now().toString()));
+ double sum = incomes.stream().mapToDouble(Income::getMoney).sum();
+
+ driverIndexVo.setTodayOrderMoney(new BigDecimal(sum));
BigDecimal reduce = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("promotionDriverId", uid).like("insertTime", LocalDate.now().toString())).stream().map(OrderPrivateCar::getPromotionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -1704,7 +1715,7 @@
// List<OrderTaxi> orderTaxis = orderTaxiMapper.selectList(new EntityWrapper<OrderTaxi>().in("state",Arrays.asList(8,9)).eq("driverId", uid));
- List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid).eq("objectType", 2).eq("type", 2));
+ List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid).eq("userType", 2).eq("type", 2));
// double sum = orderPrivateCars.stream().mapToDouble(OrderPrivateCar::getOrderMoney).sum();
--
Gitblit v1.7.1