|
|
@@ -1687,8 +1687,8 @@ class UserServices extends BaseServices
|
|
|
$award_integral_service = app()->make(UserAwardIntegralServices::class);
|
|
|
$award_lack = $award_integral_service->getLake();
|
|
|
$integral_price = $award_integral_service->getPrice();
|
|
|
- $static_integral = $award_integral_service->getIntegralSum(['status' => 1, 'type' => 0, 'uid' => $user['uid']]);
|
|
|
- $action_integral = $award_integral_service->getIntegralSum(['status' => 1, 'type' => 1, 'uid' => $user['uid']]);
|
|
|
+ $static_integral = $award_integral_service->getIntegralSum(['status' => 0, 'type' => 0, 'uid' => $user['uid']]);
|
|
|
+ $action_integral = $award_integral_service->getIntegralSum(['status' => 0, 'type' => 1, 'uid' => $user['uid']]);
|
|
|
$user['is_default_avatar'] = $user['avatar'] == sys_config('h5_avatar') ? 1 : 0;
|
|
|
return array_merge($user, compact('award_lack', 'integral_price', 'static_integral', 'action_integral'));
|
|
|
}
|