Merge remote-tracking branch 'origin/develop' into develop

app/Repositories/BeanRepository.php

@@ -2,6 +2,7 @@
 namespace App\Repositories;
 use App\Models\Post;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 use Tymon\JWTAuth\Facades\JWTAuth;
 use Illuminate\Support\Facades\Redis;
@@ -159,8 +160,10 @@ class BeanRepository
         $user_bean = json_decode($user_bean,true);
         $yesterday_quantity_issued = Redis::get('yesterday_quantity_issued');
         Log::debug($user_bean);
-        $star_home['mybean']['user_all_bean'] = intval($user_bean['user_all_bean']) ?? 0;//用户总彩虹豆
-        $star_home['mybean']['yesterday_add_bean'] = intval($user_bean['yesterday_add_bean']) ?? 0;//昨日发放彩虹豆
+        $uid = Auth::user()->uid;
+        $my_bean = $this->get_user_bean($uid);
+        $star_home['mybean']['user_all_bean'] = intval($my_bean['user_all_bean']) ?? 0;//用户总彩虹豆
+        $star_home['mybean']['yesterday_add_bean'] = intval($my_bean['yesterday_add_bean']) ?? 0;//昨日发放彩虹豆
         $star_home['mybean']['user_count'] = intval($user_bean['user_count']) ?? 0;//已入驻居民
         $star_home['mybean']['yesterday_add_user'] = intval($user_bean['yesterday_add_user']) ?? 0;//昨日新增居民
         $star_home['mybean']['yesterday_quantity_issued'] = intval($yesterday_quantity_issued) ?? 0;//昨日发放总彩虹豆
@@ -173,6 +176,21 @@ class BeanRepository
 
     }
 
+    //获取某用户豆数
+    function get_user_bean($uid)
+    {
+        try {
+            $url = config("customer.app_service_url").'/user/v2/user_bean';
+            $array = [
+                'json' => ['uid' => $uid], 'query' => [], 'http_errors' => false,'headers'=>['Authorization'=>"Bearer ".JWTAuth::getToken()]
+            ];
+            return http($url,$array,'get');
+        } catch (\Exception $e) {
+            return [];
+        }
+
+    }
+
     //获取每日新闻
     function getNews($request) {
         try {