From 99369fc8cc19c5de5891349f2e528d72465c3547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Mon, 8 Dec 2025 16:18:01 +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/adminapi/controller/Decorate.php | 2 +- application/api/controller/Guild.php | 17 +++++------------ application/api/model/Guild.php | 2 +- application/api/model/UserMessage.php | 4 ++++ 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/application/adminapi/controller/Decorate.php b/application/adminapi/controller/Decorate.php index 4bc78890..c39a28b8 100644 --- a/application/adminapi/controller/Decorate.php +++ b/application/adminapi/controller/Decorate.php @@ -39,7 +39,7 @@ class Decorate extends adminApi $type = input('type', ''); $where = ['delete_time'=>0]; if($name){ - $where['name'] = ['like', '%'.$name.'%']; + $where['title'] = ['like', '%'.$name.'%']; } if($type){ $where['type'] = $type; diff --git a/application/api/controller/Guild.php b/application/api/controller/Guild.php index 49e288ef..09d4360d 100644 --- a/application/api/controller/Guild.php +++ b/application/api/controller/Guild.php @@ -238,18 +238,11 @@ class Guild extends BaseCom $uid = $this->uid; $apply_id = input('apply_id', 0); $type = input('type', 0); - $reslut = model('Guild')->guild_invite_handle($uid, $apply_id, $type); - 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); + if($type == 6){ + $reslut = model('Guild')->guild_invite_handle($uid, $apply_id, $type); + }elseif($type == 7){ + $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/Guild.php b/application/api/model/Guild.php index b6bce5f4..b287e0d6 100644 --- a/application/api/model/Guild.php +++ b/application/api/model/Guild.php @@ -1238,7 +1238,7 @@ class Guild extends Model '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); + $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{ diff --git a/application/api/model/UserMessage.php b/application/api/model/UserMessage.php index 646c4789..79e26430 100644 --- a/application/api/model/UserMessage.php +++ b/application/api/model/UserMessage.php @@ -155,6 +155,10 @@ class UserMessage extends Model $guild_user_invited = db::name('vs_guild_user_invited')->where('message_id', $v['id'])->field('status')->find(); $v['guild_invited_status'] = $guild_user_invited['status']; } + if($v['type'] == 7){ + $guild_user_invited = db::name('vs_guild_user_ratio_up_log')->where('message_id', $v['id'])->field('status')->find(); + $v['guild_invited_status'] = $guild_user_invited['status']; + } } }