ztt 11 months ago
parent 08c305a296
commit 8d2edbbbeb
  1. 4
      app/store/controller/Recovery.php
  2. 2
      app/store/controller/Store.php

@ -214,7 +214,9 @@ class Recovery extends Controller
$model = new RecoveryOrder(); $model = new RecoveryOrder();
$list = $model->where($filter) $list = $model->where($filter)
->where('store_id', $this->storeId) ->alias('a')
->join('user b', 'b.user_id = a.user_id')
->field('a.*,b.mobile as user_mobile,b.nick_name as user_nick_name')
->order('create_time', 'desc') ->order('create_time', 'desc')
->paginate(10); ->paginate(10);
return $this->renderSuccess(compact('list')); return $this->renderSuccess(compact('list'));

@ -54,7 +54,7 @@ class Store extends Controller
*/ */
public function settleList(): Json { public function settleList(): Json {
$list = StoreSettle::where('store_id', '=', $this->storeId) $list = StoreSettle::where('store_id', '=', $this->storeId)
->select(); ->paginate(10);
return $this->renderSuccess($list->toArray()); return $this->renderSuccess($list->toArray());
} }

Loading…
Cancel
Save