xdc/fast
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(消息模块): 优化消息查询逻辑，支持俱乐部消息展示

Browse Source 
- 修改了 User、Activity、Circle、Club 和 Game 控制器中的消息查询逻辑
- 增加了对俱乐部成员的判断，使得俱乐部消息能够展示给相关用户
- 调整了消息表中的字段名称，统一使用 user_id 替代 target_id
- 优化了订单创建流程，只在需要时创建订单
- 更新了活动模型中的 costKey 属性，以适应新的费用结构
- 添加了新的费用类型翻译，以支持多退少补等功能
This commit is contained in:
夏大川
2025-06-06 12:00:13 +08:00
parent d788227ff1
commit c9a8b9d5e8
9 changed files with 63 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
addons/shopro/controller/user/User.php
View File

@@ -363,7 +363,7 @@ class User extends Common
'name' => $user['nickname'],
'avatar' => $user['avatar'],
'from_id' => $user['id'],
'target_id' => $params['user_id'],
'user_id' => $params['user_id'],
'content' => json_encode([
'topic' => '好友消息',
'time' => date('Y-m-d H:i:s'),
@@ -386,17 +386,31 @@ class User extends Common
public function msgGroup()
{
$params = $this->request->param();
$query1 = Message::field('*,count(*) as num')->where('user_id', $this->auth->id);
$query2 = Message::field('*,count(*) as num')->where('user_id', $this->auth->id);
$member = Menber::where('user_id', $this->auth->id)->where('role', '>', 1)->column('club_id');
if (!empty($member)) {
$query1 = Message::field('*,count(*) as num')->where(function ($q1) use ($member) {
$q1->where('user_id', $this->auth->id)
->whereOr(function ($q2) use ($member) {
$q2->where('type', 3)->whereIn('from_id', $member);
});
});
$query2 = Message::field('*,count(*) as num')->where(function ($q1) use ($member) {
$q1->where('user_id', $this->auth->id)
->whereOr(function ($q2) use ($member) {
$q2->where('type', 3)->whereIn('from_id', $member);
});
});
} else {
$query1 = Message::field('*,count(*) as num')->where('user_id', $this->auth->id);
$query2 = Message::field('*,count(*) as num')->where('user_id', $this->auth->id);
}
if (isset($params['type'])) {
$query1->where('type', $params['type']);
$query2->where('type', $params['type']);
}
$query1->group('from_id')->order('update_time', 'desc');
$query2->group('from_id')->order('update_time', 'desc');
$num = $query2->where('status', 0)->column('count(*) as num', 'from_id'); // ->column('count(*) as num', 'gender');
// dd($num);
$num = $query2->where('status', 0)->column('count(*) as num', 'from_id');
$res = $query1->paginate($params['pageSize'] ?? 10);
$list = $res->items();
foreach ($list as &$r) {
@@ -410,8 +424,17 @@ class User extends Common
public function msg()
{
$params = $this->request->param();
$query = Message::where('user_id', $this->auth->id);
$member = Menber::where('user_id', $this->auth->id)->where('role', '>', 1)->column('club_id');
if (!empty($member)) {
$query = Message::where(function ($q1) use ($member) {
$q1->where('user_id', $this->auth->id) //用户消息
->whereOr(function ($q2) use ($member) { //俱乐部消息
$q2->where('type', 3)->whereIn('from_id', $member);
});
});
} else {
$query = Message::where('user_id', $this->auth->id);
}
if (isset($params['type'])) {
$query->where('type', $params['type']);
}