From c2a1f5f286b8a7372811b61acf2f31303b68db61 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 二月 2023 18:46:00 +0800
Subject: [PATCH] 司机管理新增，修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index 9d0bbb6..65a23b0 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -47,6 +47,8 @@
private TDriverMapper tDriverMapper;
@Autowired
private TAppUserMapper tAppUserMapper;
+ @Autowired
+ private TOrderRefusalMapper tOrderRefusalMapper;
@Override
public EntityWrapper<TDriver> getPageList(String createTime, String phone, Integer status) {
@@ -104,10 +106,9 @@
&& order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())
&& new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());
tDriverResp.setMonthOrderCount(monthOrderCount.size());
- // TODO 拒单次数
- List<TOrder> refusalCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
- && order.getState().equals(OrderStateEnum.CANCELED.getCode())).collect(Collectors.toList());
- tDriverResp.setRefusalCount(refusalCount.size());
+ // 拒单次数
+ List<TOrderRefusal> driverRefusalList = tOrderRefusalMapper.selectList(new EntityWrapper<TOrderRefusal>().eq("driver_id", tDriver.getId()));
+ tDriverResp.setRefusalCount(driverRefusalList.size());
tDriverRespList.add(tDriverResp);
}
@@ -137,11 +138,15 @@
model.addAttribute("createTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tDriver.getCreateTime()));
// 计算驾龄
- ZoneId zoneId = ZoneId.systemDefault();
- LocalDate firstTime = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
- LocalDate now = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
- Period period = Period.between(firstTime, now);
- model.addAttribute("drivingExperience",period.getYears());
+ if(Objects.nonNull(tDriver.getFirstCertificateTime())){
+ ZoneId zoneId = ZoneId.systemDefault();
+ LocalDate firstTime = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
+ LocalDate now = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
+ Period period = Period.between(firstTime, now);
+ model.addAttribute("drivingExperience",period.getYears());
+ }else {
+ model.addAttribute("drivingExperience",0);
+ }
List<TOrder> tOrders = tOrderMapper.selectList(new EntityWrapper<TOrder>());
@@ -166,11 +171,11 @@
}
// 查询邀请人
- if(1 == tDriver.getInviterType()){
+ if(Objects.nonNull(tDriver.getInviterType()) && 1 == tDriver.getInviterType()){
TAppUser tAppUser = tAppUserMapper.selectById(tDriver.getInviterId());
model.addAttribute("inviterName",tAppUser.getNickname());
model.addAttribute("inviterPhone",tAppUser.getPhone());
- }else if(2 == tDriver.getInviterType()){
+ }else if(Objects.nonNull(tDriver.getInviterType()) && 2 == tDriver.getInviterType()){
TDriver tDriver1 = tDriverMapper.selectById(tDriver.getInviterId());
model.addAttribute("inviterName",tDriver1.getName());
model.addAttribute("inviterPhone",tDriver1.getPhone());
@@ -189,10 +194,9 @@
&& order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())
&& new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());
model.addAttribute("monthOrderCount",monthOrderCount.size());
- // TODO 拒单次数
- List<TOrder> refusalCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
- && order.getState().equals(OrderStateEnum.CANCELED.getCode())).collect(Collectors.toList());
- model.addAttribute("refusalCount",refusalCount.size());
+ // 拒单次数
+ List<TOrderRefusal> driverRefusalList = tOrderRefusalMapper.selectList(new EntityWrapper<TOrderRefusal>().eq("driver_id", tDriver.getId()));
+ model.addAttribute("refusalCount",driverRefusalList.size());
}else {
model.addAttribute("cumulativeOrderCount","");
model.addAttribute("monthOrderCount","");
--
Gitblit v1.7.1