diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index 0edff508f..53384f8c5 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -67,7 +67,10 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt $item['nickname'] = '游客'; } else { $id = $item['user_id']; - $item['nickname'] = User::where('id', $item['user_id'])->value('nickname') . "|$id"; + $user=User::where('id', $item['user_id'])->field('real_name,nickname')->find(); + if($user){ + $item['nickname'] =$user['real_name']!=''?$user['real_name']:$user['nickname'].'|'.$id; + } } if (!empty($this->request->adminInfo['store_id'])) { $item['financial_pm'] = $item['financial_pm'] == 0 ? 1 : 0; diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php index 5b2e2d84f..f0e3e979f 100644 --- a/app/admin/lists/store_order/StoreOrderLists.php +++ b/app/admin/lists/store_order/StoreOrderLists.php @@ -10,6 +10,7 @@ use app\common\model\store_order\StoreOrder; use app\common\lists\ListsSearchInterface; use app\common\model\store_branch_product\StoreBranchProduct; use app\common\model\store_order_cart_info\StoreOrderCartInfo; +use app\common\model\user\User; /** * 订单列表列表 @@ -46,7 +47,7 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface */ public function lists(): array { - return StoreOrder::with(['user', 'staff'])->where($this->searchWhere) + return StoreOrder::with(['staff'])->where($this->searchWhere) ->when(!empty($this->request->adminInfo['store_id']), function ($query) { $query->where('store_id', $this->request->adminInfo['store_id']); }) @@ -64,6 +65,15 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface ->select()->each(function ($item) { $item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : ''; $item['status_name'] = OrderEnum::getOrderType($item['status']) ?? ''; + if ($item['uid'] <= 0) { + $item['nickname'] = '游客'; + } else { + $id = $item['uid']; + $user=User::where('id', $item['uid'])->field('real_name,nickname')->find(); + if($user){ + $item['nickname'] =$user['real_name']!=''?$user['real_name'].'|'.$id:$user['nickname'].'|'.$id; + } + } if ($item['paid'] == 0) { $item['status_name'] = '待支付'; }