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

This commit is contained in:
2025-10-13 16:10:44 +08:00

View File

@@ -122,6 +122,7 @@ class Redpacket extends Model
//给前端推送信息
$data['nickname'] = Db::name('user')->where('id', $data['user_id'])->value('nickname');
$data['avatar'] = Db::name('user')->where('id', $data['user_id'])->value('avatar');
$data['redpacket_id'] = $redpacketId;
$text = [
'redpacketInfo' => $data,
@@ -149,6 +150,7 @@ class Redpacket extends Model
$redpacket = $redpacket->toArray();
$redpacket['nickname'] = Db::name('user')->where('id', $redpacket['user_id'])->value('nickname');
$redpacket['avatar'] = Db::name('user')->where('id', $redpacket['user_id'])->value('avatar');
$redpacket['redpacket_id'] = $redpacket['id'];
return $redpacket;