From 870960399814cff73d1e6ef93fccb11bede8d464 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 09:04:39 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
index 77ccadb..793ae96 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java
@@ -99,16 +99,21 @@
public boolean isInWorkTime(Long shopId, Date beginTime, Date endTime) {
if(beginTime!=null){
Date minTime = findMinTime(shopId);
- Date maxTime = findMaxTime(shopId);
- minTime.setYear(beginTime.getYear());
- minTime.setMonth(beginTime.getMonth());
- minTime.setDate(beginTime.getDate());
- maxTime.setYear(beginTime.getYear());
- maxTime.setMonth(beginTime.getMonth());
- maxTime.setDate(beginTime.getDate());
- return (
- (DateUtil.isDuringDate(minTime, maxTime, beginTime) || minTime.getTime()==beginTime.getTime() )
- && DateUtil.isDuringDate(minTime, maxTime, endTime) || maxTime.getTime()==endTime.getTime() );
+ if(minTime!=null){
+ Date maxTime = findMaxTime(shopId);
+ minTime.setYear(beginTime.getYear());
+ minTime.setMonth(beginTime.getMonth());
+ minTime.setDate(beginTime.getDate());
+ maxTime.setYear(beginTime.getYear());
+ maxTime.setMonth(beginTime.getMonth());
+ maxTime.setDate(beginTime.getDate());
+ return (
+ (DateUtil.isDuringDate(minTime, maxTime, beginTime) || minTime.getTime()==beginTime.getTime() )
+ && DateUtil.isDuringDate(minTime, maxTime, endTime) || maxTime.getTime()==endTime.getTime() );
+ }else {
+ return false;
+ }
+
}else{
return false;
}
--
Gitblit v1.9.1