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

app/Repositories/BeanRepository.php

@@ -154,17 +154,21 @@ class BeanRepository
     //星球首页
     public function starHome($request)
     {
+        $today = Carbon::now()->toDateString();
+        $token =  JWTAuth::decode(JWTAuth::getToken());
+        $uid = $token['user']->uid;
+        $bean = Redis::ZSCORE('user_rainbow_bean'.$today,$uid);
+
         $star_home = [];
         $user_bean = Redis::get('my_bean');
         Log::debug($user_bean);
         $user_bean = json_decode($user_bean,true);
         $yesterday_quantity_issued = Redis::get('yesterday_quantity_issued');
         Log::debug($user_bean);
-        $token =  JWTAuth::decode(JWTAuth::getToken());
-        $uid = $token['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']['today_add_bean'] = intval($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;//昨日发放总彩虹豆