diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 6962339..07d3843 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -1630,7 +1630,7 @@ class Room extends Model //当前等级名称 $res['name'] = Db::name('user_cp_level')->where(['level' => $res['level']])->value('name'); $res['direction'] = Db::name('user_cp_level')->where(['level' => $res['level']])->value('direction'); - $res['pendant'] = model('api/Decorate')->user_decorate_detail($res['user_id1'], 11);//挂件(装扮) + $res['pendant'] = model('api/Decorate')->user_decorate_detail($user_id, 11);//挂件(装扮) $user_info['cp_info'] = $res; } return ['code' => 1, 'msg' => '成功', 'data' => $user_info]; diff --git a/application/api/model/UserCp.php b/application/api/model/UserCp.php index 270e83c..69aae42 100644 --- a/application/api/model/UserCp.php +++ b/application/api/model/UserCp.php @@ -68,7 +68,8 @@ class UserCp extends Model Db::name('user_cp_zone')->where(['id' => $rees['id']])->update(['status' => 2]); } //给两个用户给CP装扮 - $pendant_id = Db::name('user_cp_level')->where(['deletetime' => 0])->order('level asc')->value('pendant_id'); + $pendant_ids = Db::name('user_cp_level')->where(['deletetime' => 0])->order('level asc')->value('pendant_id'); + $pendant_id = Db::name('vs_decorate_price')->where(['id' => $pendant_ids])->value('did'); // 给两个用户添加CP装扮 //先检查该用户是否已有该装扮 foreach ([$from_user_id, $to_user_id] as $user_id) { @@ -169,12 +170,13 @@ class UserCp extends Model //给用户修改Cp装扮 if($level['pendant_id']){ //先检查该用户是否已有该装扮 + $pendant_id = Db::name('vs_decorate_price')->where(['id' => $level['pendant_id']])->value('did'); foreach ([$from_user_id, $to_user_id] as $user_id) { $zhuangban = Db::name('vs_user_decorate') ->where([ 'user_id' => $user_id, 'type' => 11, - 'did' => $level['pendant_id'], + 'did' => $pendant_id, 'is_using' => 1 ]) ->find(); @@ -189,7 +191,7 @@ class UserCp extends Model // 给两个用户添加CP装扮 $decorate_data = [ 'type' => 11, // 装扮类型11-cp装扮 - 'did' => $level['pendant_id'], + 'did' => $pendant_id, 'is_using' => 1, // 1-使用中,2-未使用 'end_time' => 0, // 0-永久 'is_perpetual' => 1, // 1-永久,2-限时