diff --git a/app/Admin/Controllers/DealerWalletToBankLogController.php b/app/Admin/Controllers/DealerWalletToBankLogController.php
index 590878f8..86e11098 100644
--- a/app/Admin/Controllers/DealerWalletToBankLogController.php
+++ b/app/Admin/Controllers/DealerWalletToBankLogController.php
@@ -26,7 +26,7 @@ class DealerWalletToBankLogController extends AdminController
*/
protected function grid()
{
- $builder = DealerWalletToBankLog::with(['user', 'managerUserInfo']);
+ $builder = DealerWalletToBankLog::with(['user', 'manager.userInfo']);
return Grid::make($builder, function (Grid $grid) {
$grid->tools(function (Grid\Tools $tools) {
$tools->append(new DealerWalletWithdraw());
@@ -38,10 +38,10 @@ class DealerWalletToBankLogController extends AdminController
$grid->column('service_amount')->prepend('¥');
$grid->column('account_amount')->prepend('¥');
$grid->column('manager_id')->display(function () {
- if ($this->managerUserInfo) {
- $href = admin_route('dealers.show', ['dealer_user' => $this->manager_id]);
+ if ($this->manager) {
+ $href = admin_route('dealers.show', ['dealer_user' => $this->manager->id]);
- return "{$this->managerUserInfo->nickname}";
+ return "{$this->manager->userInfo->nickname}";
}
});
$grid->column('status')->display(function ($v) {
@@ -83,7 +83,7 @@ class DealerWalletToBankLogController extends AdminController
*/
protected function detail($id)
{
- $builder = DealerWalletToBankLog::with(['user', 'managerUserInfo']);
+ $builder = DealerWalletToBankLog::with(['user', 'manager.userInfo']);
return Show::make($id, $builder, function (Show $show) {
$show->field('id');
$show->field('user.phone');
@@ -92,10 +92,10 @@ class DealerWalletToBankLogController extends AdminController
$show->field('service_amount')->prepend('¥');
$show->field('account_amount')->prepend('¥');
$show->field('manager_id')->unescape()->as(function () {
- if ($this->managerUserInfo) {
- $href = admin_route('dealers.show', ['dealer_user' => $this->manager_id]);
+ if ($this->manager) {
+ $href = admin_route('dealers.show', ['dealer_user' => $this->manager->id]);
- return "{$this->managerUserInfo->nickname}";
+ return "{$this->manager->userInfo->nickname}";
}
});
$show->field('status')->unescape()->as(function ($v) {
diff --git a/app/Models/DealerWalletToBankLog.php b/app/Models/DealerWalletToBankLog.php
index e05e5581..5b434676 100644
--- a/app/Models/DealerWalletToBankLog.php
+++ b/app/Models/DealerWalletToBankLog.php
@@ -60,9 +60,9 @@ class DealerWalletToBankLog extends Model
return $this->belongsTo(Dealer::class, 'user_id', 'user_id');
}
- public function managerUserInfo()
+ public function manager()
{
- return $this->belongsTo(UserInfo::class, 'manager_id', 'user_id');
+ return $this->belongsTo(Dealer::class, 'manager_id', 'user_id');
}
/**