From e6ed912f42d917d7fd3db61065089b1367eb444c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Wed, 17 Dec 2025 18:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E9=82=80=E8=AF=B7=E5=8A=A0?=
 =?UTF-8?q?=20=E7=BB=93=E7=AE=97=E6=AF=94=E4=BE=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Guild.php            | 10 +++++++---
 application/guildadmin/controller/User.php |  7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php
index a7b85d6a..b871011d 100644
--- a/application/api/model/Guild.php
+++ b/application/api/model/Guild.php
@@ -1087,7 +1087,7 @@ class Guild extends Model
     /*
      * 加入工会——不用申请直接加入
      */
-    public function join_guild($guild_id,$user_id=0)
+    public function join_guild($guild_id,$user_id=0,$settlement_ratio = 0)
     {
         $user_info = model('User')->get_user_info($user_id);
         if(!$user_info){
@@ -1150,7 +1150,11 @@ class Guild extends Model
         //结算比例
         $configs = get_system_config();
         //收礼人最终的收益比例 = 未加入工会的收益 + 加入工会的收益
-        $insert_data['settlement_ratio'] = $configs['room_gift_ratio'] + $configs['room_gift_guild_ratio'];
+        if($settlement_ratio){
+            $insert_data['settlement_ratio'] = $settlement_ratio;
+        }else{
+            $insert_data['settlement_ratio'] = $configs['room_gift_ratio'] + $configs['room_gift_guild_ratio'];
+        }
         $reslut = db::name('vs_guild_user')->insert($insert_data);
         if($reslut){
             //增加公会人数
@@ -1183,7 +1187,7 @@ class Guild extends Model
         }
         if($status == 1){
             //加入工会
-            $res = $this->join_guild($guild_user_invited['guild_id'],$guild_user_invited['user_id']);
+            $res = $this->join_guild($guild_user_invited['guild_id'],$guild_user_invited['user_id'],$guild_user_invited['settlement_ratio']);
             if($res['code'] != 1){
                 return ['code' => 0, 'msg' => $res['msg'], 'data' => null];
             }
diff --git a/application/guildadmin/controller/User.php b/application/guildadmin/controller/User.php
index 7bbf0506..f260fc50 100644
--- a/application/guildadmin/controller/User.php
+++ b/application/guildadmin/controller/User.php
@@ -351,6 +351,7 @@ class User extends GuildAdmin
         $guild_id = $this->guildId;
         $user_code = input('user_code','');
         $mobile = input('mobile','');
+        $settlement_ratio = input('settlement_ratio','');
         if(!$user_code){
             return V(0,"参数错误");
         }
@@ -378,13 +379,14 @@ class User extends GuildAdmin
         if($result && $result['status'] == 0){
             return V(0,"该用户已发送邀请,请等待对方同意");
         }
+        $configs = get_system_config();
         $data =[];
         //发送系统消息
         $data['type'] = 6;
         $data['title'] = '工会邀请';
         $data['admin_id'] = Session::get('admin_id');
         $data['receiving_id'] = $user_id;
-        $data['content'] = $guild['guild_name'].' 公会邀请您加入工会呢，您是否同意！';
+        $data['content'] = $guild['guild_name'].'公会邀请您加入，并将您的收益从原有的百分之'.$configs['room_gift_ratio'].'调整为百分之".$settlement_ratio."，您是否同意？';
         $data['createtime'] = time();
         $res = db::name('system_message')->insertGetId($data);
         if(!$res){
@@ -396,7 +398,8 @@ class User extends GuildAdmin
             'guild_id' => $guild_id,
             'status' => 0,
             'message_id' => $res,
-            'createtime' => time()
+            'createtime' => time(),
+            'settlement_ratio' => $settlement_ratio,
         ]);
         if($result){
             return V(1,"操作成功");