From ec181d951f47ec66f7a113f1e6686e2feb79fc97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Mon, 8 Dec 2025 15:38:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=EF=BC=9A=20=20=20=E5=85=AC=E4=BC=9A=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E4=B8=AA=E4=BA=BA=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=86=8D=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5=E5=93=AA=E9=87=8C=E5=8F=91?= =?UTF-8?q?=E9=80=81=E4=B8=80=E4=B8=AA=E6=B6=88=E6=81=AF=EF=BC=8C=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E8=B0=83=E6=95=B4=E4=BA=86=E4=BD=A0=E7=9A=84=20?= =?UTF-8?q?=E6=94=B6=E7=9B=8A=20=E4=B8=BA=20XX=EF=BC=8C=20=20=E6=82=A8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=90=8C=E6=84=8F=20=20=E6=8B=92=E7=BB=9D?= =?UTF-8?q?=EF=BC=88=E9=BB=98=E8=AE=A424=E5=B0=8F=E6=97=B6=EF=BC=8C24?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=86=85=20=E6=B2=A1=E5=90=8C=E6=84=8F?= =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=8B=92=E7=BB=9D=EF=BC=89=E5=9C=A8?= =?UTF-8?q?=E8=BF=99=E4=B8=AA=E6=9C=9F=E9=97=B4=20=20=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E4=BB=96=E5=8E=9F=E6=9C=89=E7=9A=84=E8=BF=9B=E8=A1=8C=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=EF=BC=8C=E5=90=8C=E6=84=8F=E4=BA=86=E5=B0=B1=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=85=AC=E4=BC=9A=E7=BB=99=E7=9A=84=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Guild.php | 11 ++++++ application/api/model/Decorate.php | 2 +- application/api/model/Guild.php | 44 ++++++++++++++++++++++ application/guildadmin/controller/User.php | 20 +++++++++- 4 files changed, 75 insertions(+), 2 deletions(-) diff --git a/application/api/controller/Guild.php b/application/api/controller/Guild.php index 8391f664..49e288ef 100644 --- a/application/api/controller/Guild.php +++ b/application/api/controller/Guild.php @@ -242,4 +242,15 @@ class Guild extends BaseCom return V($reslut['code'],$reslut['msg'], $reslut['data']); } + /* + * 公会调整收益审核接口 + */ + public function user_ratio_up_apply(){ + $uid = $this->uid; + $apply_id = input('apply_id', 0); + $type = input('type', 0); + $reslut = model('Guild')->user_ratio_up_apply($uid, $apply_id, $type); + return V($reslut['code'],$reslut['msg'], $reslut['data']); + } + } diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php index 8444977a..bef9b098 100644 --- a/application/api/model/Decorate.php +++ b/application/api/model/Decorate.php @@ -27,7 +27,7 @@ class Decorate extends Model //获取装扮类型 public function get_type_list($have_hot = 0) { - $no_show_ids = [6,7,8,3,10,11]; + $no_show_ids = [7,8,3,10,11]; $label = $this->TypeArray; if ($have_hot) { $label = [100 => '热门'] + array_filter($this->TypeArray, fn($key) => $key != 100, ARRAY_FILTER_USE_KEY); diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php index dc04fa26..b6bce5f4 100644 --- a/application/api/model/Guild.php +++ b/application/api/model/Guild.php @@ -1202,4 +1202,48 @@ class Guild extends Model return ['code' => 0, 'msg' => '处理失败', 'data' => null]; } } + + //公会调整收益审核接口 + public function user_ratio_up_apply($user_id,$message_id,$status){ + $guild_user_ratio_up = Db::name('vs_guild_user_ratio_up_log')->where(['message_id'=>$message_id,'delete_time'=>0])->find(); + if(empty($guild_user_ratio_up)){ + return ['code' => 0, 'msg' => '邀请信息不存在', 'data' => null]; + } + if($user_id != $guild_user_ratio_up['user_id']){ + return ['code' => 0, 'msg' => '您没有权限处理此信息', 'data' => null]; + } + if($guild_user_ratio_up['status'] != 0){ + return ['code' => 0, 'msg' => '此邀请信息已处理过', 'data' => null]; + } + if($status == 1){ + //处理结算比例 + $res = db::name('vs_guild_user')->where(['id'=>$guild_user_ratio_up['guild_user_id']])->update(['settlement_ratio'=>$guild_user_ratio_up['settlement_ratio']]); + if($res){ + $data = [ + 'status' => 1, + 'apply_time' => time(), + 'updatetime' => time(), + ]; + $guild_user_res = Db::name('vs_guild_user_ratio_up_log')->where(['message_id'=>$message_id,'delete_time'=>0])->update($data); + if($guild_user_res){ + return ['code' => 1, 'msg' => '处理成功', 'data' => null]; + }else{ + return ['code' => 0, 'msg' => '处理失败', 'data' => null]; + } + } + + }else{ + $data = [ + 'status' => 2, + 'apply_time' => time(), + 'updatetime' => time(), + ]; + $guild_user_res = Db::name('vs_guild_user_ratio_up_log')->where(['message_id'=>$message_id,'delete_time'=>0])->update($guild_user_invited_data); + if($guild_user_res){ + return ['code' => 1, 'msg' => '处理成功', 'data' => null]; + }else{ + return ['code' => 0, 'msg' => '处理失败', 'data' => null]; + } + } + } } diff --git a/application/guildadmin/controller/User.php b/application/guildadmin/controller/User.php index 96a544cc..18cc2b1a 100644 --- a/application/guildadmin/controller/User.php +++ b/application/guildadmin/controller/User.php @@ -230,7 +230,25 @@ class User extends GuildAdmin if($settlement_ratio > $ratio){ return V(0,"最高比例不能超过".$ratio); } - $result = db::name('vs_guild_user')->where(['id'=>$id])->update(['settlement_ratio'=>$settlement_ratio]); + //发送系统信息 + $data['type'] = 7; + $data['title'] = '公会调整个人收益比例通知'; + $data['receiving_id'] = $guild_user['user_id']; + $data['content'] = "公会调整了你的收益调整后的收益为{$settlement_ratio}%。"; + $data['createtime'] = time(); + $res = db::name('system_message')->insertGetId($data); + if(!$res){ + return V(0,"操作失败"); + } + $result = db::name('vs_guild_user_ratio_up_log')->insert([ + 'guild_user_id'=>$id, + 'user_id' => $guild_user['user_id'], + 'settlement_ratio'=>$settlement_ratio, + 'status' => 0, + 'message_id' => $res, + 'createtime'=>time() + ]); +// $result = db::name('vs_guild_user')->where(['id'=>$id])->update(['settlement_ratio'=>$settlement_ratio]); if($result){ return V(1,"操作成功"); }else{