diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php index 3bf4778..9d6dbba 100644 --- a/application/api/model/Friend.php +++ b/application/api/model/Friend.php @@ -40,6 +40,7 @@ class Friend extends Model //推送给前端消息 $text['text'] = '交友开始'; $text['step'] = 2; + $text['friend_id'] = $id; model('api/Chat')->sendMsg(1039,$room_id,$text); return ['code' => 1, 'msg' => '操作成功!', 'data' => ['friend_id' => $id]]; }else{ diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 51f5c67..de66e1e 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -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_follow'] = db::name('user_follow')->where(['user_id' => $uid, 'follow_id' => $user_id,'type' => 1])->find() ? 1 : 0; //近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){ $guild = Db::name('vs_guild')->where('id' ,$guild_id)->value('guild_name'); }else{ @@ -1679,6 +1679,7 @@ class Room extends Model } //开启事务 db::startTrans(); + $data = []; if($type == 1 || $type == 3 || $type == 4){ $data = [ 'label_id' => 1, diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php index 2372db6..3d85fe6 100644 --- a/application/api/model/UserZone.php +++ b/application/api/model/UserZone.php @@ -548,6 +548,12 @@ class UserZone extends Model $data['is_delete'] = 2; $data['delete_time'] = time(); $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) { return ['code' => 1, 'msg' => '删除成功', 'data' => null]; } else {