From 50415be2199eaf547384e1c22242912e9917d1f2 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Thu, 17 Sep 2020 20:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E7=9A=84=E8=90=A5=E4=B8=9A?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Forms/v3/StoreSetTimeForm.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Forms/v3/StoreSetTimeForm.php b/app/Admin/Forms/v3/StoreSetTimeForm.php
index 862e623..c161d34 100644
--- a/app/Admin/Forms/v3/StoreSetTimeForm.php
+++ b/app/Admin/Forms/v3/StoreSetTimeForm.php
@@ -26,6 +26,19 @@ class StoreSetTimeForm extends Form
         $store->time2 = $input['time2'];
         $store->time3 = $input['time3'];
         $store->time4 = $input['time4'];
+
+        if(!empty($store->time1) && !empty($store->time2) && (!empty($store->time3) || !empty($store->time4))){
+            if($store->time3 && empty($store->time4)){
+                return $this->error('请选择时间段二的结束时间！');
+            }else if($store->time4 && empty($store->time3)){
+                return $this->error('请选择时间段二的开始时间！');
+            }else if(str_replace(':', '', $store->time3) <= str_replace(':', '', $store->time2)){
+                return $this->error('时间段二的开始时间 必须大于 时间段一的结束时间！');
+            }else if(str_replace(':', '', $store->time4) <= str_replace(':', '', $store->time3)){
+                return $this->error('时间段二的结束时间 必须大于 时间段二的开始时间！');
+            }
+        }
+
         if($store->save()){
             return $this->success('修改成功', '/store');
         }
@@ -48,8 +61,8 @@ class StoreSetTimeForm extends Form
         $this->display('name','店铺名称')->value($name);
         $this->time('time1','时间段一开始')->format('HH:mm')->value($time1);
         $this->time('time2','时间段一结束')->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚'])->value($time2);
-        $this->time('time3','时间段二开始')->format('HH:mm')->rules('after:time2',['after'=>'选择的时间必须比时间段一结束时间晚'])->value($time3);
-        $this->time('time4','时间段二结束')->format('HH:mm')->rules('after:time3',['after'=>'选择的时间必须比时间段二开始时间晚'])->value($time4);
+        $this->time('time3','时间段二开始')->format('HH:mm')->value($time3);
+        $this->time('time4','时间段二结束')->format('HH:mm')->value($time4);
     }
 
     /**