|
|
@@ -22,15 +22,15 @@ class ActivityReward extends BaseController
|
|
|
'status' => ActivityRewardModel::STATUS_UP
|
|
|
]));
|
|
|
if (!empty($memberId)) {
|
|
|
- $query->with(['userActivities' => function ($query1) use ($memberId) {
|
|
|
- $query1->where('user_id', $memberId);
|
|
|
+ $query->with(['activityUser' => function ($query1) use ($memberId) {
|
|
|
+ $query1->where('member_id', $memberId);
|
|
|
}]);
|
|
|
}
|
|
|
$list = $query->orderByDesc('id')->get();
|
|
|
|
|
|
$list->transform(function ($activity) use ($memberId) {
|
|
|
if (!empty($memberId)) {
|
|
|
- $activity->is_claimed = $activity->userActivities->isNotEmpty();
|
|
|
+ $activity->is_claimed = $activity->activityUser->isNotEmpty();
|
|
|
} else {
|
|
|
$activity->is_claimed = false;
|
|
|
}
|