From eaa2578b4c46dbcefcfe3d8da9d2579368e0a3fd Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 28 Jan 2019 17:02:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BA=A4=E6=98=93=E5=AF=B9=E8=B4=A6=E5=8D=95]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]:=E5=82=A8=E5=80=BC=E5=8D=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=8B=BF=E8=B5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxOrderMapper.xml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 7c3e1c5db..89f911d23 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -491,12 +491,6 @@ where o.type in (1,2) and o.order_status in (1,4) ) o left join wx_merchant m on o.merchant_id=m.id left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id - union all - select o.id,o.order_number,o.tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.type,o.payment_type,o.payment,o.payment_time, - o.order_status,o.create_date,o.update_date,o.detail,m.`name` merchant_name,cubi.`name` c_user_name,cubi.phone - from wx_order o left join wx_merchant m on o.product_id=m.id - left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id - where o.type=3 and o.order_status in (1,4) ) o @@ -519,7 +513,7 @@ select o.*, m.`name` merchantName from ( select o.*,cm.merchant_id from wx_order o left join wx_coupon_merchant cm on o.product_id=cm.product_id - where o.type in (0,3) and o.order_status in (1,4)) o + where o.type = 0 and o.order_status in (1,4)) o left join wx_merchant m on o.merchant_id=m.id union all select o.*,m.`name` merchantName from ( @@ -544,7 +538,7 @@ select o.*,m.`name` merchantName from ( select o.*,cm.merchant_id from wx_order o left join wx_coupon_merchant cm on o.product_id=cm.product_id - where o.type in (0,3) and o.order_status = #{order_status}) o + where o.type = 0 and o.order_status = #{order_status}) o left join wx_merchant m on o.merchant_id=m.id union all select o.*,m.`name` merchantName from (