From 0acba302fb88ab0a30302b53698b30ab171e2413 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 28 Jan 2019 15:49:13 +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 --- .../main/resources/mapper/WxOrderMapper.xml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index f901dfc48..5c7021587 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -471,7 +471,7 @@ o.order_status,o.create_date,o.update_date,o.detail,'[多商户交易]' merchant_name,cubi.`name` c_user_name,cubi.phone from ( - select o.* from wx_order o where o.type=0 and o.id in( + select o.* from wx_order o where o.type=0 and o.order_status = 1 and o.id in( select o.id from wx_order o left join wx_coupon_merchant cm on o.product_id=cm.product_id group by o.id having count(o.id)>1)) o left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id @@ -480,7 +480,7 @@ o.order_status,o.create_date,o.update_date,o.detail,m.`name` merchant_name,cubi.`name` c_user_name,cubi.phone from( select o.*,cm.merchant_id from ( - select o.* from wx_order o where o.type=0 and o.id not in( + select o.* from wx_order o where o.type=0 and o.order_status = 1 and o.id not in( select o.id from wx_order o left join wx_coupon_merchant cm on o.product_id=cm.product_id group by o.id having count(o.id)>1) ) o @@ -488,7 +488,7 @@ union all select o.*,mbu.merchant_id from wx_order o left join wx_merchant_b_user mbu on o.product_id=mbu.id - where type in (1,2))o + where o.type in (1,2) and o.order_status = 1 ) 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 @@ -496,7 +496,7 @@ 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 + where o.type=3 and o.order_status = 1 ) o @@ -516,49 +516,49 @@