From 5e90686fbd4c2bcf327d583ccade94eb5c6105cf Mon Sep 17 00:00:00 2001 From: yumoqing Date: Fri, 3 Jul 2026 18:05:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20base=20discount=20query=20=E2=80=94=20cu?= =?UTF-8?q?stomerid=20default=20is=20'*'=20not=20NULL,=20remove=20IS=20NUL?= =?UTF-8?q?L=20and=20unnecessary=20GROUP=20BY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- discount/init.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/discount/init.py b/discount/init.py index 078531c..696da01 100644 --- a/discount/init.py +++ b/discount/init.py @@ -827,11 +827,10 @@ async def get_marketing_discount_products(request): FROM product p LEFT JOIN product_category pc ON p.category_id = pc.id LEFT JOIN ( - SELECT dd.productid, MAX(dd.discount) as discount + SELECT dd.productid, dd.discount FROM discount_detail dd JOIN discount d ON dd.discountid = d.id - WHERE d.resellerid = ${org_id}$ AND (d.customerid IS NULL OR d.customerid = '*') - GROUP BY dd.productid + WHERE d.resellerid = ${org_id}$ AND d.customerid = '*' ) base ON base.productid = p.id LEFT JOIN discount_detail mkt ON mkt.productid = p.id AND mkt.discountid = ${discountid}$ WHERE p.org_id = ${org_id}$ AND p.status = '1'