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 16:18:01 +08:00
parent ec181d951f
commit 99369fc8cc
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/adminapi/controller/Decorate.php
View File

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

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

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

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

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

4
application/api/model/UserMessage.php
View File

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