修改自动完成服务包订单分成金额计算

2024-05-08 14:17:11 +08:00
parent 6849f1c15b
commit 86cc28ea13
4 changed files with 100 additions and 30 deletions
@@ -172,12 +172,14 @@ class OrderServicePackage extends Model
    /**
     * 获取某一时间段服务包订单-结束时间
     * @param array $params
+     * @param array $order_service_status_params
     * @param array $finish_time_params 结束时间区间
     * @return Collection|array
     */
-    public static function getInquiryWithFinishTime(array $params, array $finish_time_params): Collection|array
+    public static function getInquiryWithFinishTime(array $params, array $order_service_status_params, array $finish_time_params): Collection|array
    {
        return self::where($params)
+            ->whereIn('order_service_status',$order_service_status_params)
            ->whereBetween('finish_time', $finish_time_params)
            ->orderBy('finish_time')
            ->get();