@@ -37,7 +37,7 @@ class Operation extends Controller
}
$count = $query->count();
- $list = $query->join('wallets', 'users.user_id', '=', 'wallets.user_id')
+ $list = $query->join('wallets', 'users.member_id', '=', 'wallets.member_id')
->select(['users.id', 'users.user_id','users.member_id', 'users.first_name', 'wallets.available_balance as money'])
->forPage($page, $limit)
->orderByDesc("users.created_at")
@@ -60,7 +60,7 @@ class User extends BaseModel
public function wallet()
{
- return $this->belongsTo(Wallet::class, 'user_id', 'user_id');
+ return $this->belongsTo(Wallet::class, 'member_id', 'member_id');
public function level()