|
@@ -420,9 +420,9 @@ class DreamController extends Controller
|
|
$top = [] ;
|
|
$top = [] ;
|
|
foreach ($support_dream as $item) {
|
|
foreach ($support_dream as $item) {
|
|
if (!array_key_exists($item->user_id,$top)) {
|
|
if (!array_key_exists($item->user_id,$top)) {
|
|
- $top[$item->user_id] = $item->score;
|
|
|
|
|
|
+ $top[$item->user_id] = $item->coin;
|
|
}else{
|
|
}else{
|
|
- $top[$item->user_id] += $item->score;
|
|
|
|
|
|
+ $top[$item->user_id] += $item->coin;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
arsort($top);
|
|
arsort($top);
|
|
@@ -432,6 +432,8 @@ class DreamController extends Controller
|
|
}else{
|
|
}else{
|
|
$old_top_user_id = 0;
|
|
$old_top_user_id = 0;
|
|
}
|
|
}
|
|
|
|
+ /* dd($user->id);
|
|
|
|
+ dd($old_top_user_id);*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -440,10 +442,6 @@ class DreamController extends Controller
|
|
$dream->get_coin += $coin;
|
|
$dream->get_coin += $coin;
|
|
$dream->mark += $coin*$number;
|
|
$dream->mark += $coin*$number;
|
|
$dream->save();
|
|
$dream->save();
|
|
-// 在支持梦想时 如果梦主排名配取代时发送系统消息
|
|
|
|
- dd($old_top_user_id);
|
|
|
|
- $this->systemInfo($dream->id,$user->id,$old_top_user_id);
|
|
|
|
-
|
|
|
|
|
|
|
|
// 梦想实现创建二维码
|
|
// 梦想实现创建二维码
|
|
if ($dream->coin >= $dream->get_coin && empty($dream->code)) {
|
|
if ($dream->coin >= $dream->get_coin && empty($dream->code)) {
|
|
@@ -475,6 +473,8 @@ class DreamController extends Controller
|
|
'score'=>$coin*$number,
|
|
'score'=>$coin*$number,
|
|
];
|
|
];
|
|
$ok = SupportDreamModel::create($data);
|
|
$ok = SupportDreamModel::create($data);
|
|
|
|
+ // 在支持梦想时 如果梦主排名配取代时发送系统消息
|
|
|
|
+ $this->systemInfo($dream_id,$user->id,$old_top_user_id);
|
|
if (!$ok) {
|
|
if (!$ok) {
|
|
return $this->error(ErrorCode::MERCHANT_SERVICE_STATUS_INVALID);
|
|
return $this->error(ErrorCode::MERCHANT_SERVICE_STATUS_INVALID);
|
|
}
|
|
}
|
|
@@ -501,7 +501,7 @@ class DreamController extends Controller
|
|
SystemInfoModel::create($info);
|
|
SystemInfoModel::create($info);
|
|
|
|
|
|
// 长连接
|
|
// 长连接
|
|
- $this->jPush($message,'',$user_id);
|
|
|
|
|
|
+// $this->jPush($message,'',$user_id);
|
|
|
|
|
|
// 支持成功返回数据到当前页面 top3user
|
|
// 支持成功返回数据到当前页面 top3user
|
|
$support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
|
|
$support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
|
|
@@ -531,14 +531,14 @@ class DreamController extends Controller
|
|
public function systemInfo($dream_id,$user_id,$old_top_user_id)
|
|
public function systemInfo($dream_id,$user_id,$old_top_user_id)
|
|
{
|
|
{
|
|
$user = UserInfoModel::find($user_id);
|
|
$user = UserInfoModel::find($user_id);
|
|
- $dream = UserInfoModel::find($dream_id);
|
|
|
|
|
|
+ $dream = DreamInfoModel::find($dream_id);
|
|
$support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
|
|
$support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
|
|
$top = [] ;
|
|
$top = [] ;
|
|
foreach ($support_dream as $item) {
|
|
foreach ($support_dream as $item) {
|
|
if (!array_key_exists($item->user_id,$top)) {
|
|
if (!array_key_exists($item->user_id,$top)) {
|
|
- $top[$item->user_id] = $item->score;
|
|
|
|
|
|
+ $top[$item->user_id] = $item->coin;
|
|
}else{
|
|
}else{
|
|
- $top[$item->user_id] += $item->score;
|
|
|
|
|
|
+ $top[$item->user_id] += $item->coin;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
arsort($top);
|
|
arsort($top);
|
|
@@ -548,11 +548,10 @@ class DreamController extends Controller
|
|
}else{
|
|
}else{
|
|
$top_user_id = $old_top_user_id;
|
|
$top_user_id = $old_top_user_id;
|
|
}
|
|
}
|
|
- Log::info('-----------'.$top_user_id.'-----------'.$old_top_user_id.'-----------');
|
|
|
|
if ($top_user_id != $old_top_user_id) { //新的最大支持者不是以前的最大支持者时
|
|
if ($top_user_id != $old_top_user_id) { //新的最大支持者不是以前的最大支持者时
|
|
$arr = [
|
|
$arr = [
|
|
'user_id'=>0,
|
|
'user_id'=>0,
|
|
- 'message'=>"你已不是《$dream->name》的《梦主》啦!".$user->nickname."以$new_arr[0]分刚取代你的位置",
|
|
|
|
|
|
+ 'message'=>"你已不是《".$dream->name."》的《梦主》啦!".$user->nickname."以$new_arr[0]分刚取代你的位置",
|
|
'to_user_id'=>$old_top_user_id,
|
|
'to_user_id'=>$old_top_user_id,
|
|
'dream_id'=>$dream_id,
|
|
'dream_id'=>$dream_id,
|
|
'is_url'=>1,
|
|
'is_url'=>1,
|