diff --git a/app/Admin/Controllers/Store/UserController.php b/app/Admin/Controllers/Store/UserController.php index 1c2bcf0b..9d7979fc 100644 --- a/app/Admin/Controllers/Store/UserController.php +++ b/app/Admin/Controllers/Store/UserController.php @@ -12,8 +12,8 @@ class UserController extends AdminController protected function grid() { $query = UserInfo::with(['user']) - ->withCount(['inviteOrders', 'inviteUserInfos']) - ->withSum('inviteOrders', 'total_amount'); + ->withCount(['inviteCompleteOrders','inviteUserInfos']) + ->withSum('inviteCompleteOrders', 'total_amount'); $grid = Grid::make($query); $grid->model() @@ -22,8 +22,8 @@ class UserController extends AdminController $grid->column('user.id'); $grid->column('user.phone', '手机号')->copyable(); - $grid->column('invite_orders_count', '帮下单数'); - $grid->column('invite_orders_sum_total_amount', '帮下单总额')->display(function ($value) { + $grid->column('invite_complete_orders_count', '帮下单数'); + $grid->column('invite_complete_orders_sum_total_amount', '帮下单总额')->display(function ($value) { return bcdiv($value, 100, 2); }); $grid->column('invite_user_infos_count', '邀请人数'); diff --git a/app/Models/UserInfo.php b/app/Models/UserInfo.php index f11e60bb..06f4be91 100644 --- a/app/Models/UserInfo.php +++ b/app/Models/UserInfo.php @@ -108,7 +108,11 @@ class UserInfo extends Model { return $this->hasMany(Order::class, 'inviter_id', 'user_id'); } - + public function inviteCompleteOrders() + { + return $this->hasMany(Order::class, 'inviter_id', 'user_id')->where('status', Order::STATUS_COMPLETED); + } + public function inviteUserInfos() { return $this->hasMany(UserInfo::class, 'inviter_id', 'user_id');