Merge branch 'api_score_meger'

935090232@qq.com

2022-02-20 c253b555c7905c5136d47cd615ef545fa50cc6ad

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysWorktimeServiceImpl.java

@@ -97,7 +97,9 @@

   @Override
   public boolean isInWorkTime(Long shopId, Date beginTime, Date endTime) {
      if(beginTime!=null){
      Date minTime = findMinTime(shopId);
         if(minTime!=null){
      Date maxTime = findMaxTime(shopId);
      minTime.setYear(beginTime.getYear());
      minTime.setMonth(beginTime.getMonth());
@@ -108,5 +110,12 @@
      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;
      }
   }
}