From a096885e0c5454a00dda2084878746328382f882 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 16 Sep 2020 19:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=81=E8=BE=BE=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v3/Implementations/AppointmentTimeService.php     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Service/v3/Implementations/AppointmentTimeService.php b/app/Service/v3/Implementations/AppointmentTimeService.php
index 09cc205..a3b546c 100644
--- a/app/Service/v3/Implementations/AppointmentTimeService.php
+++ b/app/Service/v3/Implementations/AppointmentTimeService.php
@@ -77,14 +77,13 @@ class AppointmentTimeService implements AppointmentTimeServiceInterface
 		$res = [];
 		$time1Max = max($time1Arr);
         $time2Min = min($time2Arr);
-        if($time2Min > $nowTime+60*30) {
+        if($time2Min > $nowTime) {
             $res = array_merge($res,$this->calculateTime($time1Max, $time2Min));
         }
 		if(!empty($time3Arr)  && !empty($time4Arr)){
-            var_dump($time3Arr,$time4Arr);
             $time3Max = max($time3Arr);
 		    $time4Min = min($time4Arr);
-            if($time4Min > $nowTime+60*30) {
+            if($time4Min > $nowTime) {
                 $res = array_merge($res,$this->calculateTime($time3Max, $time4Min));
             }
 		}
@@ -102,7 +101,11 @@ class AppointmentTimeService implements AppointmentTimeServiceInterface
         $peakPeriod = strtotime('16:00');
         $peakPeriodEnd = strtotime('18:00');
         //取得订单下所有店铺时间段 交集 并计算时间段横跨单位区间长度
-        $length = ceil(($endTime - $startTime) / (30*60));
+        if($endTime == $startTime){
+            $length = 1;
+        }else{
+            $length = ceil(($endTime - $startTime) / (30*60));
+        }
         for ($i=1;$i<=$length;$i++){
             $addTime = $startTime + (30*60*$i);
             if($addTime >= $peakPeriod && $addTime < $peakPeriodEnd){