Преглед изворни кода

修改获取订单列表方法

dddmo пре 5 месеци
родитељ
комит
56a512d0dc
2 измењених фајлова са 24 додато и 10 уклоњено
  1. 20 9
      app/JsonRpc/OrderService.php
  2. 4 1
      app/JsonRpc/OrderServiceInterface.php

+ 20 - 9
app/JsonRpc/OrderService.php

@@ -584,18 +584,28 @@ class OrderService implements OrderServiceInterface
         if (isset($data['status'])) {
             $where['status'] = $data['status'];
         }
-        $orders = Order::where($where)
-            ->orderBy("id", "asc")
-            ->limit($data['pageSize'])
-            ->offset(($data['page'] - 1) * $data['pageSize'])
-            ->get();
-
-        if (empty($orders)) {
+        $orders = Order::where($where)->get()->all();
+        $order = [];
+        foreach($orders as $key => $val){
+            $adsnum = OrderAd::where('order_id',$val['id'])->count();
+            $order[$key] = [
+                'order_num' => $val['order_num'],
+                'sttime' => $val['sttime'],
+                'edtime' => $val['edtime'],
+                'price' => $val['price'],
+                'num' => $adsnum,
+                'days' => $val['days'],
+                'status' => $val['status'],
+                'ad_status' => $val['ad_status'],
+                'created_at' => $val['created_at']
+            ];
+        }
+        if (empty($order)) {
             return Result::error("您暂时还没有下单");
         } else {
-            $count = count($orders);
+            $count = count($order);
             $data = [
-                'rows' => $orders->toArray(),
+                'rows' => $order,
                 'count' => $count,
             ];
         }
@@ -685,5 +695,6 @@ class OrderService implements OrderServiceInterface
         }
         return Result::success($order);
     }
+    
 
 }

+ 4 - 1
app/JsonRpc/OrderServiceInterface.php

@@ -63,7 +63,10 @@ interface OrderServiceInterface
      *  @return array
      */
     public function delOrderAdmin(array $data): array;
-
+     /**
+     * @param array $data
+     *  @return array
+     */
     public function delOrderAD(array $data): array;
 
 }