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

Compare commits

base: yumoqing:1e65451da4e97d77dc072113e2d1aab06fda80c0
Branches Tags
yumoqing:main
yumoqing:feat/modern-ui-pricing
...
compare: yumoqing:30766b6c88fa8daca219a7f0c66f9b5f619b4826
Branches Tags
yumoqing:main
yumoqing:feat/modern-ui-pricing

3 Commits
1e65451da4 ... 30766b6c88

Author SHA1 Message Date
Hermes Agent
30766b6c88 Revert "fix: skip_keys添加value_mode，防止定价项顶层value_mode被误当字段检查导致匹配失败" 
This reverts commit 3a9e30313b41adf8f23a04bd7b1a0fe82256c2e4.
 2026-06-23 17:04:13 +08:00
Hermes Agent
b2521678ad Revert "fix: non-field keys in pricing items skip instead of raise - aligns top-level loop (line 618) with filters loop (line 653) behavior - value_mode and other control params at filter level no longer cause 'fields中没有定义' error" 
This reverts commit 6df2569c8ed9615c488d565fffa30883e819dce6.
 2026-06-23 17:04:13 +08:00
Hermes Agent
03a0bea51f Revert "fix: value_mode read from field definition, not filter_item - removed item_value_mode from filters loops (2 places) - check_value(f, fv, dv) now falls back to f.value_mode per field - fixes: filter-level value_mode:between was applied to ALL fields including model (string), causing between parse error on model name" 
This reverts commit 1e65451da4e97d77dc072113e2d1aab06fda80c0.
 2026-06-23 17:04:13 +08:00
1 changed files with 7 additions and 3 deletions
Show Stats Expand all files Collapse all files

10
pricing/pricing.py
View File

@ -617,7 +617,9 @@ order by b.enabled_date desc"""
continue continue
f = d.fields.get(k) f = d.fields.get(k)
if not f: if not f:
continue # 非字段key（如value_mode等控制参数），跳过 e = f'定价项({i})中的{k}在fields中没有定义'
exception(f'{e}')
raise Exception(e)
data_value = config_data.get(k) data_value = config_data.get(k)
data_value = data_mapping(d, k, data_value) data_value = data_mapping(d, k, data_value)
if data_value is None: if data_value is None:
@ -644,6 +646,7 @@ order by b.enabled_date desc"""
if 'unit_prices' in filter_item: if 'unit_prices' in filter_item:
continue # tiered定价项，不在此处检查 continue # tiered定价项，不在此处检查
item_ok = True item_ok = True
item_value_mode = filter_item.get('value_mode')
for fk, fv in filter_item.items(): for fk, fv in filter_item.items():
if fk in ('unit_prices', 'value_mode'): if fk in ('unit_prices', 'value_mode'):
continue continue
@ -655,7 +658,7 @@ order by b.enabled_date desc"""
if data_value is None: if data_value is None:
continue # 数据中没有该键，视为匹配 continue # 数据中没有该键，视为匹配
try: try:
flg = check_value(f, fv, data_value) flg = check_value(f, fv, data_value, item_value_mode)
if not flg: if not flg:
item_ok = False item_ok = False
break break
@ -683,6 +686,7 @@ order by b.enabled_date desc"""
# 处理 filters 中的区间定价（查找匹配的 unit_prices） # 处理 filters 中的区间定价（查找匹配的 unit_prices）
if 'filters' in p: if 'filters' in p:
for filter_item in p['filters']: for filter_item in p['filters']:
item_value_mode = filter_item.get('value_mode')
for fk, fv in filter_item.items(): for fk, fv in filter_item.items():
if fk in ('unit_prices', 'value_mode'): if fk in ('unit_prices', 'value_mode'):
continue continue
@ -694,7 +698,7 @@ order by b.enabled_date desc"""
if data_value is None: if data_value is None:
continue continue
try: try:
flg = check_value(f, fv, data_value) flg = check_value(f, fv, data_value, item_value_mode)
if flg and 'unit_prices' in filter_item: if flg and 'unit_prices' in filter_item:
unit_price = filter_item['unit_prices'] unit_price = filter_item['unit_prices']
except: except: