出价涨身价

application/api/controller/RoomPit.php

@@ -107,6 +107,12 @@ class RoomPit extends BaseCom
         }
         $room_label = $res['data']['label_id'];
         $room_type = $res['data']['type_id'];
+        if($room_type == 10){
+            $upit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $this->uid])->value('pit_number');
+            if($upit == 2){
+                return V(0, '师父麦，不能操作', null);
+            }
+        }
         if(($room_label == 1 && ($room_type == 1 || $room_type == 3 || $room_type == 4 || $room_type == 8)) || $room_type == 2 || $room_type == 7 || $room_type == 9 || $room_type == 10){
             $reslut = model('RoomPit')->DownPit($this->uid, $room_id,$pit_number);
         }elseif ($room_label == 2 && ($room_type == 1 || $room_type == 3 || $room_type == 4 || $room_type == 8)){

application/api/model/GiveGift.php

@@ -197,7 +197,7 @@ class GiveGift extends Model
             }
             //收礼人认证歌手等级升级
             model('api/SingerSong')->singerLevelUp($to_id,$gift_price);
-            //收礼人身价计算
+            //收礼人身价计算  这里的增长身价是收礼物的价值按比率产生的身价值  身价=收礼产生的身价+签约时的溢价
             $coin_market_values = explode(',', get_system_config_value('coin_market_value'));
             $change_value = ceil($gift_price / ($coin_market_values[0] ?? 100) * ($coin_market_values[1] ?? 1));
             model('api/MarketValue')->change($to_id,$change_value,0);

application/api/model/RoomPit.php

@@ -135,6 +135,8 @@ class RoomPit extends Model
         if($roomtype == 10){
             if($pit_number == 1){
                 $pit_text = '签约麦';
+            }elseif($pit_number == 2){
+                $pit_text = '师父麦';
             }elseif ($pit_number == 3 || $pit_number == 4 || $pit_number == 5) {
                 $pit_text = '老板麦';
             }elseif($pit_number == 9){
@@ -976,9 +978,8 @@ class RoomPit extends Model
         if(!$accept_user_id){
             return ['code' => 0, 'msg' => '请选择用户', 'data' => null];
         }
-
+        $room_type = db::name('vs_room')->where(['id' => $room_id])->value('type_id');
         if($type == 1){//抱麦
-            $room_type = db::name('vs_room')->where(['id' => $room_id])->value('type_id');
             if($room_type == 7 && ($pit_number == 7  || $pit_number == 8)){
                 return ['code' => 0, 'msg' => '互娱房  不能上7、8号麦位', 'data' => null];
             }
@@ -1157,7 +1158,18 @@ class RoomPit extends Model
                         return ['code' => 0, 'msg' => $res['msg'], 'data' => null];
                     }
                 }
+                if($room_type == 10){
+                    $pit_numbers = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $accept_user_id])->value('pit_number');
+                    if($pit_numbers == 2){
+                        return ['code' => 0, 'msg' => '师傅麦 此阶段不可操作', 'data' => null];
+                    }
+                }
             }else{
+                if($room_type == 10){
+                    if($pit_number == 2){
+                        return ['code' => 0, 'msg' => '师傅麦 此阶段不可操作', 'data' => null];
+                    }
+                }
                 $step = db::name('vs_room')->where(['id' => $room_id, 'type_id' => 7])->value('step');
                 if($step && $step != 1 && $pit_number < 9){
                     return ['code' => 0, 'msg' => '交友房 此阶段不可操作', 'data' => null];

application/api/model/Sign.php

@@ -117,11 +117,8 @@ class Sign extends Model
 
         //获取出价最高用户
         $sign_user = db::name('vs_user_sign_auction')->where(['room_id' => $room_id,'sign_time' => $sign_time,'type' => 0])->order('sign_value desc')->field('id,user_id,sign_value')->find();
-        //更新用户的身价并且添加记录
+        //更新用户的身价并且添加记录   此时增长的身价是出价  这个出价就是身价溢价
-        //收礼人身价计算
+        $dd = model('api/MarketValue')->change($sign_user_id,$sign_user['sign_value'],0);
-        $coin_market_values = explode(',', get_system_config_value('coin_market_value'));
-        $change_value = ceil($sign_user['sign_value'] / ($coin_market_values[0] ?? 100) * ($coin_market_values[1] ?? 1));
-        $dd = model('api/MarketValue')->change($sign_user_id,$change_value,0);
         if($dd['code'] != 1){
             Db::rollback();
             return ['code' => 0, 'msg' => $dd['msg'], 'data' => null];