From 0311943afaeb4fb8393ffd3d43a284cb10c13f89 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 24 Oct 2019 16:28:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BA=BF=E4=B8=8A=E4=BA=A4=E6=98=93][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index c4df36f02..70a7a6ac6 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -560,6 +560,7 @@ left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id where o.tenant_id=#{tenantId} and c.type!=100 and o.order_status in(0,1,2,3,4,5) + and press_current_num=0 and order_group_id=0 union all select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, case o.order_status when 6 then 0 when 7 then 0 @@ -567,7 +568,7 @@ c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,3 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id - where o.tenant_id=#{tenantId} and c.type=8 and o.payment=c.sale_price + where o.tenant_id=#{tenantId} and c.type=8 and press_current_num>0 union all select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, case o.order_status when 10 then 1 when 11 then 1 @@ -576,7 +577,7 @@ c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,4 attribute from wx_order o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id left join wx_coupon c on o.product_id=c.id - where o.tenant_id=#{tenantId} and c.type=9 and o.payment=c.sale_price + where o.tenant_id=#{tenantId} and c.type=9 and order_group_id>0 ) o