From cc29a5e06603993e88fa10f54ed906f386001d92 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 28 Jan 2019 15:53:11 +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=85=88=E5=8F=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=9A=84=EF=BC=8C=E9=80=80=E6=AC=BE=E7=9A=84?= =?UTF-8?q?=E5=90=8E=E9=9D=A2=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxOrderMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 5c7021587..ce13549cb 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -519,13 +519,13 @@ 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 = 1) o1 + where o.type in (0,3) and o.order_status = 1) o left join wx_merchant m on o.merchant_id=m.id union all select o.*,m.`name` merchantName from ( select o.*,mbu.merchant_id from wx_order o left join wx_merchant_b_user mbu on o.product_id=mbu.id - where o.type in (1,2) and o.order_status = 1) o1 + where o.type in (1,2) and o.order_status = 1) o left join wx_merchant m on o.merchant_id=m.id ) o @@ -544,13 +544,13 @@ 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 = 1) o1 + where o.type in (0,3) and o.order_status = 1) o left join wx_merchant m on o.merchant_id=m.id union all select o.*,m.`name` merchantName from ( select o.*,mbu.merchant_id from wx_order o left join wx_merchant_b_user mbu on o.product_id=mbu.id - where o.type in (1,2) and o.order_status = 1) o1 + where o.type in (1,2) and o.order_status = 1) o left join wx_merchant m on o.merchant_id=m.id ) o