Compare commits
No commits in common. "66db401fcbae3bdec2e547523c963bbf314021be" and "9ea13564efb2daf122ded64d0b06947bc7f71f33" have entirely different histories.
66db401fcb
...
9ea13564ef
@ -38,8 +38,10 @@
|
||||
}
|
||||
},
|
||||
"editexclouded": ["id", "created_by", "created_at", "updated_at", "org_id"],
|
||||
"new_data_url": "{{entire_url('/product_management/api/product_create.dspy')}}",
|
||||
"update_data_url": "{{entire_url('/product_management/api/product_update.dspy')}}",
|
||||
"delete_data_url": "{{entire_url('/product_management/api/product_delete.dspy')}}"
|
||||
"editable": {
|
||||
"new_data_url": "{{entire_url('../api/product_create.dspy')}}",
|
||||
"update_data_url": "{{entire_url('../api/product_update.dspy')}}",
|
||||
"delete_data_url": "{{entire_url('../api/product_delete.dspy')}}"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1456,7 +1456,7 @@ WHERE resource_ref_id = ${llm_id}$ AND product_type = 'llm_model' LIMIT 1"""
|
||||
# PAY*: owner → supplier, amount = raw_cost * supplier_discount
|
||||
supplier_amount = raw_cost * last_link_discount
|
||||
accounting_items.append(DictObject(
|
||||
action='PAY*', customerid=ownerid, resellerid=ownerid,
|
||||
action='PAY*', customerid=ownerid, resellerid=providerid,
|
||||
providerid=providerid, biz_date=biz_date, timestamp=timestamp,
|
||||
productid=product_id, transamt=supplier_amount,
|
||||
currency=prod_currency, base_amount=cost_base,
|
||||
@ -1492,7 +1492,7 @@ WHERE resource_ref_id = ${llm_id}$ AND product_type = 'llm_model' LIMIT 1"""
|
||||
# Final PAY*: top of chain → supplier
|
||||
supplier_amount = raw_cost * last_link_discount
|
||||
accounting_items.append(DictObject(
|
||||
action='PAY*', customerid=chain[0], resellerid=chain[0],
|
||||
action='PAY*', customerid=chain[0], resellerid=providerid,
|
||||
providerid=providerid, biz_date=biz_date, timestamp=timestamp,
|
||||
productid=product_id, transamt=supplier_amount,
|
||||
currency=prod_currency, base_amount=cost_base,
|
||||
|
||||
@ -3,8 +3,6 @@ ns = params_kw.copy()
|
||||
|
||||
|
||||
userorgid = await get_userorgid()
|
||||
userid = await get_user()
|
||||
info(f'[get_product] userorgid={userorgid} userid={userid} ns_keys={list(ns.keys())[:10]}')
|
||||
if not userorgid:
|
||||
return {
|
||||
"widgettype":"Error",
|
||||
@ -18,7 +16,6 @@ if not userorgid:
|
||||
}
|
||||
ns['org_id'] = userorgid
|
||||
ns['userorgid'] = userorgid
|
||||
del ns['org_id'] # 防止 default_filterjson 生成 AND org_id=... 抵消 OR 子查询
|
||||
|
||||
debug(f'get_product.dspy:{ns=}')
|
||||
if not ns.get('page'):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user