Merge branch 'phoenix' of ssh://120.24.33.109:11022/hyzjshwo/lanzu_api_hyperf into phoenix

app/Service/v3/Implementations/AppointmentTimeService.php

@@ -2,6 +2,8 @@
 
 namespace App\Service\v3\Implementations;
 
+use App\Constants\v3\ErrorCode;
+use App\Exception\ErrorCodeException;
 use App\Model\v3\ShoppingCart;
 use App\Model\v3\Store;
 use App\Service\v3\Interfaces\AppointmentTimeServiceInterface;
@@ -40,17 +42,17 @@ class AppointmentTimeService implements AppointmentTimeServiceInterface
 		$time3Arr = [];
 		$time4Arr = [];
 		$nowTime = time();
+		//服务站最晚营业时间
+        $closedTime = strtotime('19:30');
 		//取得所有店铺营业时间交集
 		foreach($stores as $store){
-		    //店铺手动 点击歇业
-			if($store['is_rest'] == 1){
-				return $store['name'].'店铺已打烊';
-			}
-			//当前时间小于 开始营业时间
+			//获取店铺开始营业时间
 			$time1 = strtotime(($store['time1']));
-			if($nowTime < ($time1+60*30)){
-				return $store['name'].'店铺已打烊';
+			//店铺是否在营业时间   店铺手动点击休息 || 小于店铺开始营业时间 || 当前时间大于服务站休业时间
+			if($store['is_rest'] == 1 || $nowTime < $time1 || $nowTime > $closedTime){
+                throw new ErrorCodeException(ErrorCode::STORE_REST);
 			}
+
             $time2 = strtotime(($store['time2']));
 			if(!empty($store['time3'])  && !empty($store['time4'])){
 				$time3 = strtotime(($store['time3']));
@@ -62,7 +64,7 @@ class AppointmentTimeService implements AppointmentTimeServiceInterface
 				$endTime = $time2;
 			}
 			if(($nowTime+60*30) > $endTime){
-				return $store['name'].'店铺已打烊';
+                throw new ErrorCodeException(ErrorCode::STORE_REST);
 			}
 			array_push($time1Arr,$time1);
 			array_push($time2Arr,$time2);			
@@ -71,16 +73,16 @@ class AppointmentTimeService implements AppointmentTimeServiceInterface
 		$time1Max = max($time1Arr);
         $time2Min = min($time2Arr);
         if($time2Min > $nowTime) {
-            $res[] = $this->calculateTime($time1Max, $time2Min);
+            $res = array_merge($res,$this->calculateTime($time1Max, $time2Min));
         }
 		if(!empty($time3Arr)  && !empty($time4Arr)){
             $time3Max = max($time3Arr);
 		    $time4Min = min($time4Arr);
             if($time4Min > $nowTime) {
-                $res[] = $this->calculateTime($time3Max, $time4Min);
+                $res = array_merge($res,$this->calculateTime($time3Max, $time4Min));
             }
 		}
-        return array_shift($res);
+        return $res;
     }
 
     function calculateTime($startTime,$endTime)
@@ -93,18 +95,19 @@ class AppointmentTimeService implements AppointmentTimeServiceInterface
         //高峰段 区间
         $peakPeriod = strtotime('16:00');
         $peakPeriodEnd = strtotime('18:00');
-        $span = ($peakPeriodEnd -  $peakPeriod)/(30*60);
         //取得订单下所有店铺时间段 交集 并计算时间段横跨单位区间长度
         $length = ceil(($endTime - $startTime) / (30*60));
+        print_r($length);
         for ($i=1;$i<=$length;$i++){
             $addTime = $startTime + (30*60*$i);
             if($addTime >= $peakPeriod && $addTime < $peakPeriodEnd){
+                $span = ($peakPeriodEnd - $addTime)/(30*60);
                 $i+=$span;
                 $addTime = $startTime + (30*60*$i);
             }
-            $date['title'] = date('H:i',$addTime) . ' - ' . date('H:i',$addTime + (30*60));
-            $date['value'] = date('H:i',$addTime) . ' - ' . date('H:i',$addTime + (30*60));
-            $res[] = $date;
+            $data['title'] = date('H:i',$addTime) . ' - ' . date('H:i',$addTime + (30*60));
+            $data['value'] = date('H:i',$addTime) . ' - ' . date('H:i',$addTime + (30*60));
+            $res[] = $data;
         }
         return $res;
     }