's'

app/services/payment.py

@@ -46,6 +46,7 @@ def _create_user_by_email(email: str) -> str | None:
             "email": email,
             "password": DEFAULT_PASSWORD,
             "passwordConfirm": DEFAULT_PASSWORD,
+            "live_allowed": True,
         },
         headers={"Content-Type": "application/json", "Authorization": f"Bearer {token}"},
         timeout=10,
@@ -131,8 +132,10 @@ def handle_payment_success(
 
     if pay_type == "meetup":
         logging.info(f"meetup 类型支付成功，不创建 memos 用户 - user_id: {user_id}")
+    if pay_type == "salon":
+        logging.info(f"salon 类型支付成功 - user_id: {user_id}")
 
-    valid_types = ["vip", "book", "meetup", "video"]
+    valid_types = ["vip", "book", "meetup", "video", "salon"]
     if pay_type not in valid_types:
         pay_type = "vip"
 
@@ -162,6 +165,26 @@ def handle_payment_success(
                     "amount": amount_cents,
                 })
                 logging.info(f"meetup 完整记录创建（兜底） - user_id: {user_id}")
+        elif pay_type == "salon":
+            solan = pb_client.collection("solanRed")
+            existing = solan.get_list(1, 1, {
+                "filter": f'user_id = "{user_id}"',
+                "sort": "-created",
+            })
+            if existing.items:
+                record_id = existing.items[0].id
+                solan.update(record_id, {
+                    "order_id": order_id,
+                    "amount": amount_cents,
+                })
+                logging.info(f"salon 支付字段补齐成功 - user_id: {user_id}, record_id: {record_id}")
+            else:
+                solan.create({
+                    "user_id": user_id,
+                    "order_id": order_id,
+                    "amount": amount_cents,
+                })
+                logging.info(f"salon 完整记录创建（兜底） - user_id: {user_id}")
         else:
             existing = pb_client.collection("payments").get_list(1, 1, {
                 "filter": f'order_id = "{order_id}"',
@@ -177,8 +200,8 @@ def handle_payment_success(
                 }
                 pb_client.collection("payments").create(payload)
 
-        # 写入 site_vip（站点独立 VIP）。meetup 类型统一写 site_id=meetup
-        effective_site_id = "meetup" if pay_type == "meetup" else site_id
+        # 写入 site_vip（站点独立 VIP）。meetup 写 site_id=meetup，salon 写 site_id=salon
+        effective_site_id = "meetup" if pay_type == "meetup" else ("salon" if pay_type == "salon" else site_id)
         if effective_site_id:
             try:
                 site_vip = pb_client.collection("site_vip")

app/services/pb.py

@@ -1,10 +1,7 @@
 """PocketBase 客户端（基于 SDK）"""
-import logging
-
 from app.config import PB_URL, PB_ADMIN_EMAIL, PB_ADMIN_PASSWORD
 from app.sdk.pocketbase import PocketBaseSDK
 
-logger = logging.getLogger(__name__)
 _pb_sdk: PocketBaseSDK | None = None
 
 
@@ -20,8 +17,6 @@ def _get_pb_sdk() -> PocketBaseSDK:
 
 
 def get_pb_client():
-    """获取已认证的 PocketBase 客户端"""
+    """获取已认证的 PocketBase 客户端（复用已登录实例，不重复打日志）"""
     sdk = _get_pb_sdk()
-    client = sdk.get_client()
-    logger.info("PocketBase admin 登录成功")
-    return client
+    return sdk.get_client()