feat : catering

app/Service/ServiceTrait/Api/GoodOrderTrait.php

@@ -44,17 +44,6 @@ trait GoodOrderTrait
     #[Inject]
     protected OrderGood $orderGoodModel;
 
-    /**
-     * @var OrderOptionCateringLog
-     */
-    #[Inject]
-    protected OrderOptionCateringLog $orderOptionCateringLogModel;
-
-    /**
-     * @var OrderMealCateringLog
-     */
-    #[Inject]
-    protected OrderMealCateringLog $orderMealCateringLogModel;
 
     /**
      * @return void

app/Service/ServiceTrait/CateringTrait.php

@@ -5,12 +5,23 @@ namespace App\Service\ServiceTrait;
 use App\Constants\Common\OrderCode;
 use App\Model\OrderMealCateringLog;
 use App\Model\OrderOptionCateringLog;
+use Hyperf\Di\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 trait CateringTrait
 {
+    /**
+     * @var OrderOptionCateringLog
+     */
+    #[Inject]
+    protected OrderOptionCateringLog $orderOptionCateringLogModel;
 
+    /**
+     * @var OrderMealCateringLog
+     */
+    #[Inject]
+    protected OrderMealCateringLog $orderMealCateringLogModel;
 
     /**
      * @return bool 添加失败需要退款
@@ -49,6 +60,7 @@ trait CateringTrait
 //        todo 减少可以不减少根据订单 cycle_id 获取加一碗米饭 的数量 减少查询压力
 //        $addStapleFoodNum = 0;
 
+        //todo 需要绑定一个 kitchen_id
         $logInfo = $this->orderOptionCateringLogModel->getInfoBySiteIdAndCycleId($this->orderInfo->site_id, $this->orderInfo->cycle_id);
 
         if (empty($logInfo)) {
@@ -108,6 +120,7 @@ trait CateringTrait
         //todo 根据订单 cycle_id 获取加一碗米饭 的数量
         $addStapleFoodNum = 0;
 
+        //todo 需要绑定一个 kitchen_id
         $logInfo = $this->orderOptionCateringLogModel->getInfoBySiteIdAndCycleId($this->orderInfo->site_id, $this->orderInfo->cycle_id);
 
         if (empty($logInfo)) {