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

fix: 产品折扣设置显示基准折扣(1.0)并标记方案内产品

Browse Source 
- get_discount_setting_products: LEFT JOIN基准折扣方案_HeaX, COALESCE优先方案折扣, 新增in_plan字段
- get_products_with_discount.dspy: 同步加基准折扣COALESCE
- index.ui: 折扣默认1.0, 新增'✓方案内'标记列
- save_discount: old_discount默认1.0
This commit is contained in:
yumoqing 2026-07-04 19:49:02 +08:00
parent 51a1616b9f
commit bc8af7a4cf
3 changed files with 134 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
discount/init.py
View File

@ -754,6 +754,10 @@ async def get_discount_setting_products(request):
config = getConfig() config = getConfig()
db.databases = config.databases db.databases = config.databases
# 查询基准折扣方案ID (customerid='*', 全部用户适用)
base_sql = "SELECT id FROM discount WHERE customerid='*' AND resellerid=${org_id}$ LIMIT 1"
base_ns = {'org_id': user_orgid}
sql = """ sql = """
SELECT SELECT
p.id as productid, p.id as productid,
@ -762,18 +766,31 @@ async def get_discount_setting_products(request):
p.category_id, p.category_id,
pc.name as category_name, pc.name as category_name,
dd.id as detail_id, dd.id as detail_id,
dd.discount, COALESCE(dd.discount, base_dd.discount) as discount,
dd.discountid dd.discountid,
CASE WHEN dd.id IS NOT NULL THEN 1 ELSE 0 END as in_plan
FROM product p FROM product p
LEFT JOIN product_category pc ON p.category_id = pc.id LEFT JOIN product_category pc ON p.category_id = pc.id
LEFT JOIN discount_detail dd ON dd.productid = p.id LEFT JOIN discount_detail dd ON dd.productid = p.id
AND dd.discountid = ${discountid}$ AND dd.discountid = ${discountid}$
LEFT JOIN discount_detail base_dd ON base_dd.productid = p.id
AND base_dd.discountid = ${base_discountid}$
WHERE p.org_id = ${org_id}$ AND p.status = '1' WHERE p.org_id = ${org_id}$ AND p.status = '1'
""" """
ns = {'discountid': discountid, 'org_id': user_orgid} ns = {'discountid': discountid, 'org_id': user_orgid}
async with db.sqlorContext(dbname) as sor: async with db.sqlorContext(dbname) as sor:
# 查询基准折扣方案ID, 若不存在则降级(没有基准折扣)
base_recs = await sor.sqlExe(base_sql, base_ns)
base_discountid = base_recs[0].id if base_recs else None
if base_discountid:
ns['base_discountid'] = base_discountid
else:
# 无基准方案时, 用discountid自身代替, 保证COALESCE正常(只会取dd.discount, base_dd为NULL)
ns['base_discountid'] = discountid
recs = await sor.sqlExe(sql, ns) recs = await sor.sqlExe(sql, ns)
# 为每个产品附加 in_plan 标记
return recs if recs else [] return recs if recs else []

24
wwwroot/discount_setting/get_products_with_discount.dspy
View File

@ -16,6 +16,17 @@ if not ns.get('page'):
if not ns.get('sort'): if not ns.get('sort'):
ns['sort'] = 'category_name, product_name' ns['sort'] = 'category_name, product_name'
ns['org_id'] = user_orgid
db = DBPools()
dbname = get_module_dbname('discount')
# 查询基准折扣方案ID (customerid='*', 全部用户适用)
base_sql = "SELECT id FROM discount WHERE customerid='*' AND resellerid=${org_id}$ LIMIT 1"
async with db.sqlorContext(dbname) as sor:
base_recs = await sor.sqlExe(base_sql, ns.copy())
base_discountid = base_recs[0].id if base_recs else discountid
ns['base_discountid'] = base_discountid
sql = ''' sql = '''
SELECT SELECT
p.id as productid, p.id as productid,
@ -24,21 +35,20 @@ SELECT
p.category_id, p.category_id,
pc.name as category_name, pc.name as category_name,
dd.id as detail_id, dd.id as detail_id,
dd.discount, COALESCE(dd.discount, base_dd.discount) as discount,
dd.discountid dd.discountid,
CASE WHEN dd.id IS NOT NULL THEN 1 ELSE 0 END as in_plan
FROM product p FROM product p
LEFT JOIN product_category pc ON p.category_id = pc.id LEFT JOIN product_category pc ON p.category_id = pc.id
LEFT JOIN discount_detail dd ON dd.productid = p.id LEFT JOIN discount_detail dd ON dd.productid = p.id
AND dd.discountid = ${discountid}$ AND dd.discountid = ${discountid}$
LEFT JOIN discount_detail base_dd ON base_dd.productid = p.id
AND base_dd.discountid = ${base_discountid}$
WHERE p.org_id = ${org_id}$ AND p.status = '1' WHERE p.org_id = ${org_id}$ AND p.status = '1'
ORDER BY pc.name, p.product_name ORDER BY pc.name, p.product_name
''' '''
ns['org_id'] = user_orgid debug(f'get_products_with_discount: org_id={user_orgid}, discountid={discountid}, dbname={dbname}, base_discountid={ns["base_discountid"]}')
db = DBPools()
dbname = get_module_dbname('discount')
debug(f'get_products_with_discount: org_id={user_orgid}, discountid={discountid}, dbname={dbname}')
async with db.sqlorContext(dbname) as sor: async with db.sqlorContext(dbname) as sor:
r = await sor.sqlPaging(sql, ns.copy()) r = await sor.sqlPaging(sql, ns.copy())
debug(f'{sql=}, {ns=},get_products_with_discount: returned {len(r.get("rows", []))} products') debug(f'{sql=}, {ns=},get_products_with_discount: returned {len(r.get("rows", []))} products')

194
wwwroot/discount_setting/index.ui
View File

@ -1,102 +1,104 @@
{% set products = get_discount_setting_products(request) %} {% set products = get_discount_setting_products(request) %}
{% set info = get_discount_info(request) %} {% set info = get_discount_info(request) %}
{ {
"widgettype": "VBox", \t"widgettype": "VBox",
"options": { \t"options": {
"width": "100%", \t\t"width": "100%",
"height": "100%", \t\t"height": "100%",
"css": "filler" \t\t"css": "filler"
}, \t},
"subwidgets": [ \t"subwidgets": [
{ \t\t{
"widgettype": "Text", \t\t\t"widgettype": "Text",
"options": { \t\t\t"options": {
"text": "产品折扣设置 - {{info.name or ''}}{% if info.customer %} ({{info.customer}}){% endif %}", \t\t\t\t"text": "产品折扣设置 - {{info.name or ''}}{% if info.customer %} ({{info.customer}}){% endif %}",
"fontSize": "16px", \t\t\t\t"fontSize": "16px",
"fontWeight": "600", \t\t\t\t"fontWeight": "600",
"color": "#F1F5F9", \t\t\t\t"color": "#F1F5F9",
"padding": "8px 12px" \t\t\t\t"padding": "8px 12px"
} \t\t\t}
}, \t\t},
{ \t\t{
"widgettype": "HBox", \t\t\t"widgettype": "HBox",
"options": { \t\t\t"options": {
"bgcolor": "#0F172A", \t\t\t\t"bgcolor": "#0F172A",
"padding": "8px 0", \t\t\t\t"padding": "8px 0",
"borderRadius": "6px 6px 0 0", \t\t\t\t"borderRadius": "6px 6px 0 0",
"alignItems": "center", \t\t\t\t"alignItems": "center",
"width": "100%" \t\t\t\t"width": "100%"
}, \t\t\t},
"subwidgets": [ \t\t\t"subwidgets": [
{"widgettype": "Text", "options": {"text": "产品分类", "width": "22%", "padding": "0 12px", "fontSize": "12px", "fontWeight": "600", "color": "#94A3B8"}}, \t\t\t\t{"widgettype": "Text", "options": {"text": "产品分类", "width": "20%", "padding": "0 8px", "fontSize": "12px", "fontWeight": "600", "color": "#94A3B8"}},
{"widgettype": "Text", "options": {"text": "产品名称", "width": "34%", "padding": "0 12px", "fontSize": "12px", "fontWeight": "600", "color": "#94A3B8"}}, \t\t\t\t{"widgettype": "Text", "options": {"text": "产品名称", "width": "28%", "padding": "0 8px", "fontSize": "12px", "fontWeight": "600", "color": "#94A3B8"}},
{"widgettype": "Text", "options": {"text": "产品编码", "width": "22%", "padding": "0 12px", "fontSize": "12px", "fontWeight": "600", "color": "#94A3B8"}}, \t\t\t\t{"widgettype": "Text", "options": {"text": "产品编码", "width": "18%", "padding": "0 8px", "fontSize": "12px", "fontWeight": "600", "color": "#94A3B8"}},
{"widgettype": "Text", "options": {"text": "折扣", "width": "22%", "padding": "0 12px", "fontSize": "12px", "fontWeight": "600", "color": "#94A3B8"}} \t\t\t\t{"widgettype": "Text", "options": {"text": "折扣", "width": "14%", "padding": "0 8px", "fontSize": "12px", "fontWeight": "600", "color": "#94A3B8"}},
] \t\t\t\t{"widgettype": "Text", "options": {"text": "状态", "width": "16%", "padding": "0 8px", "fontSize": "12px", "fontWeight": "600", "color": "#94A3B8"}}
}, \t\t\t]
{ \t\t},
"widgettype": "VScrollPanel", \t\t{
"options": { \t\t\t"widgettype": "VScrollPanel",
"width": "100%", \t\t\t"options": {
"flex": "1" \t\t\t\t"width": "100%",
}, \t\t\t\t"flex": "1"
"subwidgets": [ \t\t\t},
{ \t\t\t"subwidgets": [
"widgettype": "VBox", \t\t\t\t{
"options": { \t\t\t\t\t"widgettype": "VBox",
"width": "100%" \t\t\t\t\t"options": {
}, \t\t\t\t\t\t"width": "100%"
"subwidgets": [ \t\t\t\t\t},
\t\t\t\t\t"subwidgets": [
{% for p in products %} {% for p in products %}
{ \t\t\t\t\t\t{
"widgettype": "HBox", \t\t\t\t\t\t\t"widgettype": "HBox",
"options": { \t\t\t\t\t\t\t"options": {
"padding": "6px 0", \t\t\t\t\t\t\t\t"padding": "6px 0",
"border": "0 0 1px 0", \t\t\t\t\t\t\t\t"border": "0 0 1px 0",
"borderColor": "#334155", \t\t\t\t\t\t\t\t"borderColor": "#334155",
"alignItems": "center", \t\t\t\t\t\t\t\t"alignItems": "center",
"width": "100%" \t\t\t\t\t\t\t\t"width": "100%"
}, \t\t\t\t\t\t\t},
"subwidgets": [ \t\t\t\t\t\t\t"subwidgets": [
{"widgettype": "Text", "options": {"text": "{{p.category_name or ''}}", "width": "22%", "padding": "0 12px", "fontSize": "12px", "color": "#E2E8F0"}}, \t\t\t\t\t\t\t\t{"widgettype": "Text", "options": {"text": "{{p.category_name or ''}}", "width": "20%", "padding": "0 8px", "fontSize": "12px", "color": "#E2E8F0"}},
{"widgettype": "Text", "options": {"text": "{{p.product_name or ''}}", "width": "34%", "padding": "0 12px", "fontSize": "12px", "color": "#F1F5F9"}}, \t\t\t\t\t\t\t\t{"widgettype": "Text", "options": {"text": "{{p.product_name or ''}}", "width": "28%", "padding": "0 8px", "fontSize": "12px", "color": "#F1F5F9"}},
{"widgettype": "Text", "options": {"text": "{{p.product_code or ''}}", "width": "22%", "padding": "0 12px", "fontSize": "12px", "color": "#E2E8F0"}}, \t\t\t\t\t\t\t\t{"widgettype": "Text", "options": {"text": "{{p.product_code or ''}}", "width": "18%", "padding": "0 8px", "fontSize": "12px", "color": "#E2E8F0"}},
{ \t\t\t\t\t\t\t\t{
"widgettype": "UiFloat", \t\t\t\t\t\t\t\t\t"widgettype": "UiFloat",
"options": { \t\t\t\t\t\t\t\t\t"options": {
"width": "22%", \t\t\t\t\t\t\t\t\t\t"width": "14%",
"padding": "0 12px", \t\t\t\t\t\t\t\t\t\t"padding": "0 8px",
"name": "discount", \t\t\t\t\t\t\t\t\t\t"name": "discount",
"value": "{{p.discount or ''}}", \t\t\t\t\t\t\t\t\t\t"value": "{{p.discount or '1.0'}}",
"placeholder": "0~1", \t\t\t\t\t\t\t\t\t\t"placeholder": "0~1",
"dec_len": 2, \t\t\t\t\t\t\t\t\t\t"dec_len": 2,
"fontSize": "12px" \t\t\t\t\t\t\t\t\t\t"fontSize": "12px"
}, \t\t\t\t\t\t\t\t\t},
"binds": [ \t\t\t\t\t\t\t\t\t"binds": [
{ \t\t\t\t\t\t\t\t\t\t{
"wid": "self", \t\t\t\t\t\t\t\t\t\t\t"wid": "self",
"event": "blur", \t\t\t\t\t\t\t\t\t\t\t"event": "blur",
"actiontype": "urlwidget", \t\t\t\t\t\t\t\t\t\t\t"actiontype": "urlwidget",
"datawidget": "self", \t\t\t\t\t\t\t\t\t\t\t"datawidget": "self",
"target": "self", \t\t\t\t\t\t\t\t\t\t\t"target": "self",
"options": { \t\t\t\t\t\t\t\t\t\t\t"options": {
"url": "{{entire_url('./save_discount.dspy')}}", \t\t\t\t\t\t\t\t\t\t\t\t"url": "{{entire_url('./save_discount.dspy')}}",
"params": { \t\t\t\t\t\t\t\t\t\t\t\t"params": {
"discountid": "{{params_kw.discountid}}", \t\t\t\t\t\t\t\t\t\t\t\t\t"discountid": "{{params_kw.discountid}}",
"old_discount": "{{p.discount or ''}}", \t\t\t\t\t\t\t\t\t\t\t\t\t"old_discount": "{{p.discount or '1.0'}}",
"productid": "{{p.productid}}", \t\t\t\t\t\t\t\t\t\t\t\t\t"productid": "{{p.productid}}",
"detail_id": "{{p.detail_id or ''}}" \t\t\t\t\t\t\t\t\t\t\t\t\t"detail_id": "{{p.detail_id or ''}}"
} \t\t\t\t\t\t\t\t\t\t\t\t}
} \t\t\t\t\t\t\t\t\t\t\t}
} \t\t\t\t\t\t\t\t\t\t}
] \t\t\t\t\t\t\t\t\t]
} \t\t\t\t\t\t\t\t},
] \t\t\t\t\t\t\t\t{"widgettype": "Text", "options": {"text": "{% if p.in_plan == 1 %}✓方案内{% endif %}", "width": "16%", "padding": "0 8px", "fontSize": "11px", "color": "#34D399"}}
}{% if not loop.last %},{% endif %} \t\t\t\t\t\t\t]
\t\t\t\t\t\t}{% if not loop.last %},{% endif %}
{% endfor %} {% endfor %}
] \t\t\t\t\t]
} \t\t\t\t}
] \t\t\t]
} \t\t}
] \t]
} }