|
@@ -1662,17 +1662,19 @@ class SaleReport extends Base
|
|
|
->whereNull('b.id')
|
|
|
->page($param['page'], $param['size'])
|
|
|
->order("a.addtime desc")
|
|
|
- ->cursor();
|
|
|
-
|
|
|
- $list = [];
|
|
|
- foreach ($data as $value) {
|
|
|
-
|
|
|
- $value['order_type'] = isset($this->all_order_type[$value['order_type']]) ? $this->all_order_type[$value['order_type']] : '';
|
|
|
+ ->select()
|
|
|
+ ->toArray();
|
|
|
+// ->cursor();
|
|
|
|
|
|
- $list[] = $value;
|
|
|
- }
|
|
|
+// $list = [];
|
|
|
+// foreach ($data as $value) {
|
|
|
+//
|
|
|
+// $value['order_type'] = isset($this->all_order_type[$value['order_type']]) ? $this->all_order_type[$value['order_type']] : '';
|
|
|
+//
|
|
|
+// $list[] = $value;
|
|
|
+// }
|
|
|
|
|
|
- return app_show(0, '请求成功', ['list' => $list, 'count' => $count]);
|
|
|
+ return app_show(0, '请求成功', ['list' => $data, 'count' => $count]);
|
|
|
|
|
|
}
|
|
|
|