yumoqing/product_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(purchase): user_org_id获取崩溃——DictObject的hasattr恒True导致await None()

Browse Source 
- dspy侧显式取get_userorgid()传入(与purchase_confirm同款)
- core侧hasattr判断改callable检查,兜底_get_current_org_id
This commit is contained in:
yumoqing 2026-08-28 17:09:33 +08:00
parent c32fa00c62
commit ff501c13b5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
product_management/core.py
View File

@ -1464,9 +1464,10 @@ class ProductManager:
if not user_id: if not user_id:
user_id = await env.get_user() user_id = await env.get_user()
if not user_org_id: if not user_org_id:
user_org_id = await env.get_userorgid() if hasattr(env, 'get_userorgid') \ fn = getattr(env, 'get_userorgid', None)
else self._get_current_org_id() if callable(fn):
user_org_id = user_org_id or '0' user_org_id = await fn()
user_org_id = user_org_id or self._get_current_org_id() or '0'
quantity = int(quantity or 1) quantity = int(quantity or 1)
storage_gb = float(storage_gb or 0) storage_gb = float(storage_gb or 0)

2
wwwroot/storefront/api/purchase_realtime.dspy
View File

@ -13,9 +13,11 @@ try:
raise Exception('缺少产品ID') raise Exception('缺少产品ID')
env = ServerEnv() env = ServerEnv()
user_org_id = (await get_userorgid()) or '0'
r = await env.purchase_realtime( r = await env.purchase_realtime(
product_id=product_id, product_id=product_id,
user_id=userid, user_id=userid,
user_org_id=user_org_id,
charge_mode=params_kw.get('charge_mode') or None, charge_mode=params_kw.get('charge_mode') or None,
quantity=int(params_kw.get('quantity', 1) or 1), quantity=int(params_kw.get('quantity', 1) or 1),
storage_gb=float(params_kw.get('storage_gb', 0) or 0), storage_gb=float(params_kw.get('storage_gb', 0) or 0),