活动行事历优化3

app/Services/EventCalendarService.php

@@ -105,6 +105,10 @@ class EventCalendarService extends BaseService
     {
         try {
             DB::beginTransaction();
+            if (isset($data['status']) && $data['status'] == 0
+                && isset($data['start_time'])
+            ) {
+                $start_time = $data['start_time'];
                 $existsWhere = [
                     ['pattern_id', '=', $data['pattern_id']],
                     ['id', '<>', $id]
@@ -112,12 +116,18 @@ class EventCalendarService extends BaseService
                 if (EventCalendar::query()->where($existsWhere)->whereIn(
                     'status',
                     [0, 1]
-            )->exists()
+                )
+                    ->where(function ($query) use ($start_time) {
+                        $query->whereRaw(
+                            "'{$start_time}' BETWEEN start_time AND end_time"
+                        );
+                    })->exists()
                 ) {
                     throw new Exception(
                         __('service.event_calendar.pattern_exists')
                     );
                 }
+            }
             $model = EventCalendar::query()->findOrFail($id);
             $oldValues = $model->toArray();