diff --git a/app/Service/Admin/Catering/Meal/CateringService.php b/app/Service/Admin/Catering/Meal/CateringService.php index f2605bd..0d5f73c 100644 --- a/app/Service/Admin/Catering/Meal/CateringService.php +++ b/app/Service/Admin/Catering/Meal/CateringService.php @@ -73,6 +73,11 @@ class CateringService extends CateringBaseService // 配餐 $this->catering(); + // todo + // 查询该点所有套餐是否已经配餐 如果是就缓存关闭该点 + + // 关闭线路 + return $this->return->success('success',['num' => $this->resCount]); } diff --git a/app/Service/ServiceTrait/Api/OrderTrait.php b/app/Service/ServiceTrait/Api/OrderTrait.php index e55b5e7..1432eb7 100644 --- a/app/Service/ServiceTrait/Api/OrderTrait.php +++ b/app/Service/ServiceTrait/Api/OrderTrait.php @@ -132,8 +132,9 @@ trait OrderTrait protected function checkTodayCutOffTime(): void { $todayCutOffTime = $this->configCache->getConfigValue(ConfigCode::TODAY_CUT_OFF_TIME_KEY); + $newCycleTime = $this->configCache->getConfigValue(ConfigCode::START_OF_THE_NEW_CYCLE); - if (date('H:i:s') >= $todayCutOffTime) throw new ErrException('平台已全部截止下单哦'); + if (date('H:i:s') >= $todayCutOffTime && date('H:i:s') < $newCycleTime) throw new ErrException('平台已全部截止下单哦'); } /**