From 56e614aac4a6c95c770f7fa257a6f4e3d026ceb6 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 17 Dec 2018 23:58:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E4=B8=8D=E8=83=BD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=80=9A=E7=94=A8=E5=88=B8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/WxCouponOrderMapper.xml | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 99b96e1f1..ba85e2235 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -335,7 +335,9 @@ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, c.title,c.sale_price,c.use_price,c.price,c.unit, - m.name as merchant_name + (case when com.mc=1 then + (select m.name from wx_merchant m, wx_coupon_merchant cm + where m.id = cm.merchant_id and cm.product_id=co.coupon_id) else '[多商户通用]' end) as merchant_name @@ -348,20 +350,16 @@