Merge remote-tracking branch 'origin/develop' into develop

2025-09-02 19:32:31 +08:00
parent 33a1d90fb5 07fa094660
commit 6f5a60b00a
1 changed files with 4 additions and 0 deletions
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1731,6 +1731,10 @@ class Room extends Model
            return ['code' => 0, 'msg' => '房间类型已存在', 'data' => null];
        }

+        if($roomInfo['type_id'] == 7 && ($roomInfo['step'] == 2 || $roomInfo['step'] == 3)){
+            return ['code' => 0, 'msg' => '请先结束交友后在修改房间类型', 'data' => null];
+        }
+
        //开启事务
        db::startTrans();
        $data = [];