diff --git a/application/adminapi/controller/Nobility.php b/application/adminapi/controller/Nobility.php index 5eaf3c40..ea863cf5 100644 --- a/application/adminapi/controller/Nobility.php +++ b/application/adminapi/controller/Nobility.php @@ -414,4 +414,19 @@ class Nobility extends adminApi return V(0, "删除失败"); } } + + //爵位赠送 + public function give_nobility(){ + $user_code = input('user_code', ''); + $lid = input('lid', ''); + $user_id = db::name('user')->where('delete_time', 0)->where('user_code', $user_code)->value('id'); + if (empty($user_id)) { + return V(0, "请选择用户"); + } + if (empty($lid)) { + return V(0, "请选择爵位"); + } + $reslut = model('api/Nobility')->buyNobility($user_id,$lid); + return V($reslut['code'],$reslut['msg'], null); + } } \ No newline at end of file diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php index 1cfec402..8f1d8a83 100644 --- a/application/api/model/Guild.php +++ b/application/api/model/Guild.php @@ -364,6 +364,11 @@ class Guild extends Model if($reslut){ //减少公会人数 db::name('vs_guild')->where('id', $guild_info['id'])->setDec('num'); + if($guild_id<=95){ //事故处理-114以前的群被删了 + $guild_id = "g".$guild_id; + }else{ + $guild_id = $guild_id; + } model('api/Tencent')->delete_group_member('g'.$guild_id, $user_id); return ['code' => 1, 'msg' => '踢出成功','data' => null]; }else{ @@ -1138,12 +1143,17 @@ class Guild extends Model * 设置群聊信息 */ public function set_guild_info($guild_id,$name,$notice,$avatar){ + if($guild_id<=95){ + $guild_id = "g".$guild_id; + }else{ + $guild_id = $guild_id; + } $guild_id = 'g'.$guild_id; $return = model('api/Tencent')->modify_group_base_info($guild_id, $name,$avatar, $notice); return ['code' => $return['code'], 'msg' => $return['msg'], 'data' => $return['data']]; } - /* + /*dd * 我的公会 * @param $id * @param $user_id diff --git a/application/api/model/Nobility.php b/application/api/model/Nobility.php index eb5ccef1..73d2daf5 100644 --- a/application/api/model/Nobility.php +++ b/application/api/model/Nobility.php @@ -265,7 +265,7 @@ class Nobility extends Model //更新装备缓存 $cache_key = 'user_base_info_'.$user_id; Cache::rm($cache_key); - return ['code' => 1, 'msg' => '成功']; + return ['code' => 1, 'msg' => '成功', 'data' => null]; } //购买爵位价格