|
@@ -110,14 +110,18 @@ class OrderModel extends BaseModel
|
|
|
}
|
|
}
|
|
|
return $query->order('update_time', 'desc')
|
|
return $query->order('update_time', 'desc')
|
|
|
->page($params['page'] ?? 1)
|
|
->page($params['page'] ?? 1)
|
|
|
- ->paginate($params['size'] ?? 10)->toArray();
|
|
|
|
|
|
|
+ ->paginate($params['size'] ?? 10)
|
|
|
|
|
+ ->toArray();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function fetchOrderByCustomerId($c_id) {
|
|
public function fetchOrderByCustomerId($c_id) {
|
|
|
return $this->where([
|
|
return $this->where([
|
|
|
['is_delete', '=', 0],
|
|
['is_delete', '=', 0],
|
|
|
['customer_id', '=', $c_id]
|
|
['customer_id', '=', $c_id]
|
|
|
- ])->select()->toArray();
|
|
|
|
|
|
|
+ ])
|
|
|
|
|
+ ->order('create_time','desc')
|
|
|
|
|
+ ->select()
|
|
|
|
|
+ ->toArray();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -131,7 +135,12 @@ class OrderModel extends BaseModel
|
|
|
return $this->where([
|
|
return $this->where([
|
|
|
['is_delete', '=', 0],
|
|
['is_delete', '=', 0],
|
|
|
['customer_id', '=', $customer_id]
|
|
['customer_id', '=', $customer_id]
|
|
|
- ])->with(['products'])->order('update_time', 'desc')->page($page)->paginate($size)->toArray();
|
|
|
|
|
|
|
+ ])
|
|
|
|
|
+ ->with(['products'])
|
|
|
|
|
+ ->order('update_time', 'desc')
|
|
|
|
|
+ ->page($page)
|
|
|
|
|
+ ->paginate($size)
|
|
|
|
|
+ ->toArray();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|