Kirin 2 anni fa
parent
commit
2e6282aa7a
1 ha cambiato i file con 5 aggiunte e 5 eliminazioni
  1. 5 5
      app/services/agent/AgentLevelServices.php

+ 5 - 5
app/services/agent/AgentLevelServices.php

@@ -159,14 +159,14 @@ class AgentLevelServices extends BaseServices
         $user['extract_price'] = $extractService->sum(['uid' => $uid, 'status' => 1], 'extract_price');
 
         $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' => 0, 'type' => 0, 'uid' => $user['uid']]);
-        $action_integral = $award_integral_service->getIntegralSum(['status' => 0, 'type' => 1, 'uid' => $user['uid']]);
+        $user['award_lack'] = $award_integral_service->getLake();
+        $user['integral_price'] = $award_integral_service->getPrice();
+        $user['static_integral'] = $award_integral_service->getIntegralSum(['status' => 0, 'type' => 0, 'uid' => $user['uid']]);
+        $user['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;
         $user['achievement'] = $award_integral_service->getAchievement($user['uid']);
 
-        return ['user' => array_merge($user, compact('award_lack', 'integral_price', 'static_integral', 'action_integral')), 'level_list' => $list, 'level_info' => $levelInfo];
+        return ['user' => $user, 'level_list' => $list, 'level_info' => $levelInfo];
     }
 
     /**