feat : add_staple_food

app/Service/ServiceTrait/Admin/Catering/PrintTrait.php

@@ -104,6 +104,20 @@ trait PrintTrait
         $this->redis->hSet($this->stopOrderKey, $this->logInfo->site_id, CateringCode::REDIS_FINISH_VALUE);
     }
 
+    /**
+     * @param int $siteId
+     * @param int $cycleId
+     * @return bool
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    protected function checkIsStopOrder(int $siteId,int $cycleId): bool
+    {
+        $this->stopOrderKey = AdminRedisKey::optionCateringStopOrder($cycleId);
+
+        return CateringCode::REDIS_FINISH_VALUE == $this->redis->hGet($this->stopOrderKey, $siteId);
+    }
+
     /**
      * @return void
      * @throws ContainerExceptionInterface

app/Service/ServiceTrait/Api/OrderTrait.php

@@ -124,6 +124,18 @@ trait OrderTrait
         }
     }
 
+    /**
+     * @return void
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    protected function checkTodayCutOffTime(): void
+    {
+        $todayCutOffTime = $this->configCache->getConfigValue(ConfigCode::TODAY_CUT_OFF_TIME_KEY);
+
+        if (date('H:i:s') >= $todayCutOffTime) throw new ErrException('平台已全部截止下单哦');
+    }
+
     /**
      * 检测地点
      * @param int $siteId
@@ -139,6 +151,13 @@ trait OrderTrait
         $kitchenId = (int)($siteInfo['kitchen_id'] ?? 0);
         if ($kitchenId <= 0) throw new ErrException('该地点暂时不支持点餐');
 
+        $closeOrderFlag = match ($this->orderType) {
+            OrderCode::ORDER_TYPE_OPTIONAL => $this->checkIsStopOrder($siteId, $this->cycleId),
+            OrderCode::ORDER_TYPE_MEAL => true,
+        };
+
+        if ($closeOrderFlag) throw new ErrException('该点已经截单');
+
         $this->orderRes['site_id'] = $siteId;
         $this->orderRes['site_info'] = $siteInfo;
 

app/Service/ServiceTrait/Common/CycleTrait.php

@@ -39,7 +39,7 @@ trait CycleTrait
      */
     protected function initTodayCycleId(): float|bool|Redis|int
     {
-        $TodayCutOffTime = $this->configCache->getConfigValueByKey(ConfigCode::TODAY_CUT_OFF_TIME_KEY);
+        $TodayCutOffTime = $this->configCache->getConfigValueByKey(ConfigCode::START_OF_THE_NEW_CYCLE);
 
         if (date('H:i:s') >= ($TodayCutOffTime)) {
             $day = date('Y-m-d',strtotime('+1 day'));