YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

新增需求变更：

Browse Source 
公会如果调整了个人收益，需要再用户的系统通知哪里发送一个消息，公会调整了你的 收益 为 XX，  您是否同意  拒绝（默认24小时，24小时内 没同意，默认拒绝）在这个期间  按照他原有的进行计算，同意了就按照公会给的进行计算
This commit is contained in:
赵钊
2025-12-08 15:38:27 +08:00
parent 7484817c82
commit ec181d951f
4 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
application/api/controller/Guild.php
View File

@@ -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']);
}
}

2
application/api/model/Decorate.php
View File

@@ -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);

44
application/api/model/Guild.php
View File

@@ -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];
}
}
}
}

20
application/guildadmin/controller/User.php
View File

@@ -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{