Commit Graph

612 Commits

Author SHA1 Message Date
e278abdf75 Merge remote-tracking branch 'origin/develop' into develop 2025-09-09 16:38:56 +08:00
f6abe72cb6 巡乐会抽奖接口提交.-bug修改 2025-09-09 16:38:44 +08:00
66aee47ba3 送礼加锁处理 2025-09-09 16:15:52 +08:00
49f55dd568 Merge remote-tracking branch 'origin/develop' into develop 2025-09-09 15:37:52 +08:00
2083ed05ec 巡乐会抽奖接口提交.-bug修改 2025-09-09 15:37:45 +08:00
7215a5ff5a 增加房间火热值修改 2025-09-09 15:14:13 +08:00
526b9b6c84 Merge remote-tracking branch 'origin/develop' into develop 2025-09-09 15:06:24 +08:00
2877ec4d72 巡乐会抽奖接口提交.-bug修改 2025-09-09 15:06:18 +08:00
5e95aa61b1 发放礼物加锁 2025-09-09 14:37:25 +08:00
0aecadd263 巡乐会抽奖接口提交.-bug修改 2025-09-09 14:27:59 +08:00
1d20d608e1 巡乐会抽奖接口提交.-bug修改 2025-09-09 11:14:52 +08:00
5a6a6adc45 背包礼物一键全清 2025-09-09 10:15:44 +08:00
08a67d55e5 修改房间类型 K歌房处理 2025-09-08 20:05:33 +08:00
3e9af0e391 巡乐会抽奖接口提交.-bug修改 2025-09-08 19:33:20 +08:00
27bcaefc00 巡乐会抽奖接口提交.-bug修改 2025-09-08 18:51:10 +08:00
ec44d5f605 Merge remote-tracking branch 'origin/develop' into develop 2025-09-08 18:23:16 +08:00
1318b6440b 巡乐会抽奖接口提交.-公会创建时排除电影房 2025-09-08 18:23:09 +08:00
b2b0f1e8ee 微信支付 2025-09-08 16:50:29 +08:00
e0e5ff4d90 巡乐会抽奖接口提交.-盲盒转盘期数修改 2025-09-08 14:45:00 +08:00
12f1a743f7 巡乐会抽奖接口提交.-bug修改 2025-09-06 17:24:51 +08:00
d481ad72cc 进入房间 连线推送 2025-09-05 19:44:15 +08:00
9b7ba5dc35 巡乐会抽奖接口提交.-bug修改 2025-09-05 17:50:50 +08:00
f7e2d72369 巡乐会抽奖接口提交.-bug修改 2025-09-05 16:42:00 +08:00
b0ae83dd8f Merge remote-tracking branch 'origin/develop' into develop 2025-09-05 16:39:02 +08:00
73ab0691b4 巡乐会抽奖接口提交.-bug修改 2025-09-05 16:38:54 +08:00
580281d6b9 话题列表 图片 2025-09-05 16:33:33 +08:00
886a0263d8 更新房间数据判断是否在房间 2025-09-05 16:23:19 +08:00
8ace795429 巡乐会抽奖接口提交.-权限放行 2025-09-05 11:52:20 +08:00
806c45abc4 更新房间数据判断是否在房间 2025-09-05 11:51:53 +08:00
1107209f3f 巡乐会抽奖接口提交.-图片上传调整 2025-09-05 11:25:21 +08:00
49b8890304 Merge remote-tracking branch 'origin/develop' into develop 2025-09-05 11:13:26 +08:00
d69a1ca9bb 巡乐会抽奖接口提交.-联调-盘-bug修改 盲盒转盘礼物补发时间改为30分钟内 2025-09-05 11:13:19 +08:00
ed322a4098 删除申请上麦 2025-09-05 10:52:26 +08:00
612f48402d 巡乐会 抽中指定礼物 时间减少 2025-09-04 18:26:01 +08:00
a48da36bc8 巡乐会抽奖接口提交.-联调-盘-bug修改 盲盒转盘礼物补发时间改为30分钟内 2025-09-03 23:19:48 +08:00
a8614dc801 巡乐会抽奖接口提交.-联调-盘-bug修改 2025-09-03 23:01:04 +08:00
4736843030 Merge remote-tracking branch 'origin/develop' into develop 2025-09-03 21:27:28 +08:00
f7e42020a7 巡乐会抽奖接口提交.-联调-盘-bug修改 2025-09-03 21:26:30 +08:00
53d42fa313 抱麦 2025-09-03 19:49:19 +08:00
e0f27da870 Merge remote-tracking branch 'origin/develop' into develop 2025-09-03 18:16:19 +08:00
c58ac9559e 巡乐会抽奖接口提交.-联调-盘-bug修改 2025-09-03 18:16:12 +08:00
1c8ca65dd5 交友卡关系 创建小房间失败继续进行 2025-09-03 17:19:49 +08:00
b81ebd1f37 交友卡关系 创建小房间失败继续进行 2025-09-03 16:20:35 +08:00
ceab1684db 收益计算小数点保留4位 2025-09-03 16:00:45 +08:00
6d68a72144 工会排行处理 2025-09-03 15:50:19 +08:00
dbda4a6887 拍卖房 同意上麦 处理 2025-09-02 22:09:03 +08:00
aec7cbe765 巡乐会抽奖接口提交.-联调- 后台-房间审核时绑定盲盒转盘盘 2025-09-02 21:19:33 +08:00
d79bc4acf7 巡乐会抽奖接口提交.-联调- 后台-房间审核时绑定盲盒转盘盘 2025-09-02 21:14:34 +08:00
309c899e53 巡乐会抽奖接口提交.-联调- bug修改-工会改成公会 2025-09-02 20:55:00 +08:00
6f5a60b00a Merge remote-tracking branch 'origin/develop' into develop 2025-09-02 19:32:31 +08:00