update

app/Http/Controllers/Api/V1/OrderController.php

@@ -441,7 +441,8 @@ class OrderController extends AuthController
             'list_type' => 'required|in:0,1,2',
             'product_type' => 'integer',
             'order_status' => 'integer',
-            'time_sort' => 'in:0,1'
+            'time_sort' => 'in:0,1',
+            'is_pack_expire' => 'in:0,1,2',
         ]);
         $user = $this->user;
 
@@ -462,6 +463,17 @@ class OrderController extends AuthController
         if (!empty($req['order_status'])) {
             $builder->where('order_status', $req['order_status']);
         }
+        if (!empty($req['is_pack_expire'])) {
+            $tmpBuilder  = OrderPack::join('orders as o', 'o.id', '=', 'order_packs.order_id')->where('o.user_id', $user['id']);
+            if ($req['is_pack_expire'] == 1) {
+                $tmpBuilder->where('order_packs.end_time', '<', time());
+            }
+            else {
+                $tmpBuilder->where('order_packs.end_time', '>=', time());
+            }
+            $order_ids = $tmpBuilder->pluck('o.id')->toArray();
+            $builder->whereIn('id', $order_ids);
+        }
         if (!empty($req['time_sort'])) {
             $builder->orderBy('id', 'desc');
         }