MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
赵钊
2025-08-19 18:09:57 +08:00
parent 251ffc84a8 694983f09d
commit 626433fc9c
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/api/model/Friend.php
View File

@@ -40,6 +40,7 @@ class Friend extends Model
//推送给前端消息 //推送给前端消息
$text['text'] = '交友开始'; $text['text'] = '交友开始';
$text['step'] = 2; $text['step'] = 2;
$text['friend_id'] = $id;
model('api/Chat')->sendMsg(1039,$room_id,$text); model('api/Chat')->sendMsg(1039,$room_id,$text);
return ['code' => 1, 'msg' => '操作成功！', 'data' => ['friend_id' => $id]]; return ['code' => 1, 'msg' => '操作成功！', 'data' => ['friend_id' => $id]];
}else{ }else{

3
application/api/model/Room.php
View File

@@ -1491,7 +1491,7 @@ class Room extends Model
$user_info['is_room_owner'] = db::name('vs_room')->where(['id' => $room_id, 'user_id' => $user_id])->find() ? 1 : 0; $user_info['is_room_owner'] = db::name('vs_room')->where(['id' => $room_id, 'user_id' => $user_id])->find() ? 1 : 0;
$user_info['is_follow'] = db::name('user_follow')->where(['user_id' => $uid, 'follow_id' => $user_id,'type' => 1])->find() ? 1 : 0; $user_info['is_follow'] = db::name('user_follow')->where(['user_id' => $uid, 'follow_id' => $user_id,'type' => 1])->find() ? 1 : 0;
//近90天内收到的礼物数量 //近90天内收到的礼物数量
$user_info['gift_num'] = db::name('vs_give_gift')->where(['gift_user' => $uid])->whereTime('createtime', '>', strtotime('-90 day'))->sum('number')?? 0; $user_info['gift_num'] = db::name('vs_give_gift')->where(['gift_user' => $user_id])->whereTime('createtime', '>', strtotime('-90 day'))->sum('number')?? 0;
if($guild_id){ if($guild_id){
$guild = Db::name('vs_guild')->where('id' ,$guild_id)->value('guild_name'); $guild = Db::name('vs_guild')->where('id' ,$guild_id)->value('guild_name');
}else{ }else{
@@ -1679,6 +1679,7 @@ class Room extends Model
} }
//开启事务 //开启事务
db::startTrans(); db::startTrans();
$data = [];
if($type == 1 || $type == 3 || $type == 4){ if($type == 1 || $type == 3 || $type == 4){
$data = [ $data = [
'label_id' => 1, 'label_id' => 1,

6
application/api/model/UserZone.php
View File

@@ -548,6 +548,12 @@ class UserZone extends Model
$data['is_delete'] = 2; $data['is_delete'] = 2;
$data['delete_time'] = time(); $data['delete_time'] = time();
$reslut = db::name('user_zone')->where('id', $zid)->update($data); $reslut = db::name('user_zone')->where('id', $zid)->update($data);
$top_zone = db::name('user_zone_topic')->where('zone_id',$zid)->select();
if($top_zone){
foreach ($top_zone as $v){
db::name('user_zone_topic')->where('id',$v['id'])->delete();
}
}
if ($reslut) { if ($reslut) {
return ['code' => 1, 'msg' => '删除成功', 'data' => null]; return ['code' => 1, 'msg' => '删除成功', 'data' => null];
} else { } else {