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

fix: restore IS NULL OR * to cover both conventions; keep direct dd.discount without GROUP BY

Browse Source
This commit is contained in:
yumoqing 2026-07-03 18:06:56 +08:00
parent c39e54f379
commit 51a1616b9f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
discount/init.py
View File

@ -830,7 +830,7 @@ async def get_marketing_discount_products(request):
SELECT dd.productid, dd.discount SELECT dd.productid, dd.discount
FROM discount_detail dd FROM discount_detail dd
JOIN discount d ON dd.discountid = d.id JOIN discount d ON dd.discountid = d.id
WHERE d.resellerid = ${org_id}$ AND d.customerid = '*' WHERE d.resellerid = ${org_id}$ AND (d.customerid IS NULL OR d.customerid = '*')
) base ON base.productid = p.id ) base ON base.productid = p.id
LEFT JOIN discount_detail mkt ON mkt.productid = p.id AND mkt.discountid = ${discountid}$ LEFT JOIN discount_detail mkt ON mkt.productid = p.id AND mkt.discountid = ${discountid}$
WHERE p.org_id = ${org_id}$ AND p.status = '1' WHERE p.org_id = ${org_id}$ AND p.status = '1'

2
wwwroot/marketing_discount_setting/get_products.dspy
View File

@ -32,7 +32,7 @@ LEFT JOIN (
SELECT dd.productid, dd.discount SELECT dd.productid, dd.discount
FROM discount_detail dd FROM discount_detail dd
JOIN discount d ON dd.discountid = d.id JOIN discount d ON dd.discountid = d.id
WHERE d.resellerid = ${org_id}$ AND d.customerid = '*' WHERE d.resellerid = ${org_id}$ AND (d.customerid IS NULL OR d.customerid = '*')
) base ON base.productid = p.id ) base ON base.productid = p.id
LEFT JOIN discount_detail mkt ON mkt.productid = p.id AND mkt.discountid = ${discountid}$ LEFT JOIN discount_detail mkt ON mkt.productid = p.id AND mkt.discountid = ${discountid}$
WHERE p.org_id = ${org_id}$ AND p.status = '1' WHERE p.org_id = ${org_id}$ AND p.status = '1'