|
|
@@ -58,8 +58,10 @@ class Order extends Api
|
|
|
->order('id DESC')
|
|
|
->paginate($this->pageSize);
|
|
|
foreach ($paginator as $k => $v) {
|
|
|
- $status = $v['status'] ==0 ?100: $v['status'];
|
|
|
- $paginator[$k]['status_name'] = (new OrderModel())->getStatusNames($status);
|
|
|
+ $paginator[$k]['status_name'] = (new OrderModel())->getStatusNames($v['status']);
|
|
|
+ if($v['status'] == OrderModel::Default){
|
|
|
+ $paginator[$k]['status'] = OrderModel::Pending;
|
|
|
+ }
|
|
|
}
|
|
|
$res_data = $this->buildResp($paginator->total(), $paginator->currentPage(), $paginator->items());
|
|
|
$res_data['bonus_sum'] = $user['bonus_sum'];
|