修复婚礼红包领取:①ChatController userJoin 写入 user_id ②WeddingService 从 room:1:users Hash 读在线用户 ③新郎新娘也可领红包 ④删除结婚弹窗冗余的'举办婚礼'按钮 ⑤升级红包领取按钮为橙色渐变样式
This commit is contained in:
@@ -71,6 +71,7 @@ class ChatController extends Controller
|
||||
// 获取当前在职职务信息(用于内容显示)
|
||||
$activePosition = $user->activePosition;
|
||||
$userData = [
|
||||
'user_id' => $user->id,
|
||||
'level' => $user->user_level,
|
||||
'sex' => $user->sex,
|
||||
'headface' => $user->headface,
|
||||
@@ -221,7 +222,7 @@ class ChatController extends Controller
|
||||
->where('divorce_type', 'mutual')
|
||||
->whereNotNull('divorcer_id')
|
||||
->where('divorcer_id', '!=', $user->id)
|
||||
->where(function($q) use ($user) {
|
||||
->where(function ($q) use ($user) {
|
||||
$q->where('user_id', $user->id)->orWhere('partner_id', $user->id);
|
||||
})
|
||||
->first();
|
||||
|
||||
Reference in New Issue
Block a user