|
@@ -153,8 +153,8 @@ class BeanRepository
|
|
|
$yesterday_start = Carbon::now()->addDays(-1)->startOfDay()->toDateTimeString();
|
|
|
$yesterday_end = Carbon::now()->addDays(-1)->endOfDay()->toDateTimeString();
|
|
|
if ($request['type'] == 0){//排行榜赚豆达人
|
|
|
- $all_beans = Redis::ZREVRANGEBYSCORE('user_rainbow_bean2019-06-21', 100000000, 0, array('WITHSCORES'=>true,'limit' => array(0, 20)));//.$yesterday
|
|
|
-
|
|
|
+ $yesterday = Carbon::yesterday()->toDateString();
|
|
|
+ $all_beans = Redis::ZREVRANGEBYSCORE('user_rainbow_bean'.$yesterday, 100000000, 0, array('WITHSCORES'=>true,'limit' => array(0, 20)));
|
|
|
$new_arr = [];
|
|
|
$i = 0;
|
|
|
foreach ($all_beans as $key => $val) {
|
|
@@ -264,18 +264,18 @@ class BeanRepository
|
|
|
|
|
|
public function starHome($request)
|
|
|
{
|
|
|
- $star_home['star'] = [];
|
|
|
- $my_bean = [];
|
|
|
- $star_home['star'][0]['mybean'] = $my_bean;
|
|
|
- $star_home['star'][0]['mybean']['user_all_bean'] = Redis::get('user_all_bean');//用户总彩虹豆
|
|
|
- $star_home['star'][0]['mybean']['yesterday_add_bean'] = Redis::get('yesterday_add_bean');//昨日发放彩虹豆
|
|
|
- $star_home['star'][0]['mybean']['user_count'] = Redis::get('user_count');//已入驻居民
|
|
|
- $star_home['star'][0]['mybean']['yesterday_add_user'] = Redis::get('yesterday_add_user');//昨日新增居民
|
|
|
- $star_home['star'][0]['mybean']['yesterday_quantity_issued'] = Redis::get('yesterday_quantity_issued');//昨日发放总彩虹豆
|
|
|
+ $star_home = [];
|
|
|
+ $user_bean = Redis::get('my_bean');
|
|
|
+ $user_bean = json_decode($user_bean,true);
|
|
|
+ $star_home[0]['mybean']['user_all_bean'] = $user_bean['user_all_bean'];//用户总彩虹豆
|
|
|
+ $star_home[0]['mybean']['yesterday_add_bean'] = $user_bean['yesterday_add_bean'];//昨日发放彩虹豆
|
|
|
+ $star_home[0]['mybean']['user_count'] = $user_bean['user_count'];//已入驻居民
|
|
|
+ $star_home[0]['mybean']['yesterday_add_user'] = $user_bean['yesterday_add_user'];//昨日新增居民
|
|
|
+ $star_home[0]['mybean']['yesterday_quantity_issued'] = Redis::get('yesterday_quantity_issued');//昨日发放总彩虹豆
|
|
|
|
|
|
- $star_home['star'][1]['excellent_residents'] = $this->excellentResidents($request);
|
|
|
- $star_home['star'][2]['daily_news'] = $this->getNews($request);
|
|
|
- $star_home['star'][3]['tips'] = $this->getPlatformContent($id = 1);
|
|
|
+ $star_home[1]['excellent_residents'] = $this->excellentResidents($request);
|
|
|
+ $star_home[2]['daily_news'] = $this->getNews($request);
|
|
|
+ $star_home[3]['tips'] = $this->getPlatformContent($id = 1);
|
|
|
|
|
|
return $star_home;
|
|
|
|