新增了添加快结束服务包订单至服务包结束队列命令行。

app/Model/OrderServicePackage.php

@@ -34,12 +34,16 @@ use Hyperf\Snowflake\Concern\Snowflake;
  * @property string $finish_time 结束服务时间
  * @property string $cancel_time 订单取消时间
  * @property string $cancel_remarks 取消订单备注
+ * @property int $add_finish_status 添加完成订单延迟队列状态（0:未添加 1:已添加 2:添加失败）
+ * @property string $add_finish_time 添加完成订单延迟队列时间
+ * @property string $add_finish_fail_reason 添加完成订单延迟队列失败原因
  * @property string $patient_name 患者姓名-就诊人
  * @property string $patient_name_mask 患者姓名-就诊人(掩码)
  * @property int $patient_sex 患者性别-就诊人（0:未知 1:男 2:女）
  * @property int $patient_age 患者年龄-就诊人
- * @property Carbon $created_at 创建时间
- * @property Carbon $updated_at 修改时间
+ * @property \Carbon\Carbon $created_at 创建时间
+ * @property \Carbon\Carbon $updated_at 修改时间
+ * @property-read OrderServicePackageCase|null $OrderServicePackageCase 
  */
 class OrderServicePackage extends Model
 {
@@ -53,7 +57,7 @@ class OrderServicePackage extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['order_service_id', 'order_id', 'user_id', 'patient_id', 'doctor_id', 'family_id', 'order_service_type', 'order_service_status', 'is_delete', 'refund_status', 'pay_channel', 'pay_status', 'order_service_no', 'escrow_trade_no', 'amount_total', 'coupon_amount_total', 'payment_amount_total', 'pay_time', 'start_time', 'finish_time', 'cancel_time', 'cancel_remarks', 'patient_name', 'patient_name_mask', 'patient_sex', 'patient_age', 'created_at', 'updated_at'];
+    protected array $fillable = ['order_service_id', 'order_id', 'user_id', 'patient_id', 'doctor_id', 'family_id', 'order_service_type', 'order_service_status', 'is_delete', 'refund_status', 'pay_channel', 'pay_status', 'order_service_no', 'escrow_trade_no', 'amount_total', 'coupon_amount_total', 'payment_amount_total', 'pay_time', 'start_time', 'finish_time', 'cancel_time', 'cancel_remarks', 'add_finish_status', 'add_finish_time', 'add_finish_fail_reason', 'patient_name', 'patient_name_mask', 'patient_sex', 'patient_age', 'created_at', 'updated_at'];
 
     protected string $primaryKey = "order_service_id";
 
@@ -136,7 +140,7 @@ class OrderServicePackage extends Model
     /**
      * 获取服务包订单-分页
      * @param array $params
-     * @param array $order_service_status
+     * @param array $order_service_status_params
      * @param array $fields
      * @param int|null $page
      * @param int|null $per_page
@@ -163,4 +167,18 @@ class OrderServicePackage extends Model
 
         return $data;
     }
+
+    /**
+     * 获取某一时间段服务包订单-结束时间
+     * @param array $params
+     * @param array $finish_time_params 接诊时间区间
+     * @return Collection|array
+     */
+    public static function getInquiryWithFinishTime(array $params, array $finish_time_params): Collection|array
+    {
+        return self::where($params)
+            ->whereBetween('finish_time', $finish_time_params)
+            ->orderBy('finish_time')
+            ->get();
+    }
 }