From 566c44cc5712ab9c997424ee5a5438e0a81a016e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 17 五月 2023 18:49:38 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index 414ffe2..62e7a81 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -75,9 +75,15 @@
TOrder tOrder = orderService.selectOne(new EntityWrapper<TOrder>()
.eq("userId", tAppUser.getId())
.last("LIMIT 1"));
- // 客户一个月未下单，状态异常
- Period period = Period.between(DateUtil.dateToLocalDate(tOrder.getCreateTime()), LocalDate.now());
- int day = Math.abs(period.getDays());
+ int day;
+ if(Objects.nonNull(tOrder)){
+ // 客户一个月未下单，状态异常
+ Period period = Period.between(DateUtil.dateToLocalDate(tOrder.getCreateTime()), LocalDate.now());
+ day = Math.abs(period.getDays());
+ }else {
+ Period period = Period.between(DateUtil.dateToLocalDate(tAppUser.getCreateTime()), LocalDate.now());
+ day = Math.abs(period.getDays());
+ }
if(day > 29){
tAppUser.setIsException(2);
}
@@ -100,6 +106,8 @@
Integer count = orderService.getValidOrderCount(driver.getId(),new BigDecimal(14),new SimpleDateFormat("yyyy-MM").format(new Date()));
if(count < 30){
driver.setIsException(2);
+ }else {
+ driver.setIsException(1);
}
TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
.eq("driverId", driver.getId())
@@ -115,11 +123,13 @@
}
}
}else {
- // 没有上班记录，计算审核时间
- Period period = Period.between(DateUtil.dateToLocalDate(driver.getApprovalTime()), LocalDate.now());
- int day = Math.abs(period.getDays());
- if(day>14){
- driver.setIsException(2);
+ if(Objects.nonNull(driver.getApprovalTime())){
+ // 没有上班记录，计算审核时间
+ Period period = Period.between(DateUtil.dateToLocalDate(driver.getApprovalTime()), LocalDate.now());
+ int day = Math.abs(period.getDays());
+ if(day>14){
+ driver.setIsException(2);
+ }
}
}
}
--
Gitblit v1.7.1