From 174a21efa06a80427e796ddf2eb99ebae2a7c3a1 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 20 Apr 2020 23:22:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E8=AE=A2=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E8=A1=A5=E8=B4=B4=E9=87=91=E9=A2=9D=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=88=86?= =?UTF-8?q?=E8=B4=A6=E5=95=86=E6=88=B7=E5=8F=B7=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E5=95=86=E6=88=B7=E7=BB=93=E8=B4=A6=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index a1db4c92c..e1901b3fa 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -657,7 +657,7 @@ from wx_merchant_b_user bu inner join wx_merchant m on bu.merchant_id=m.id where bu.tenant_id = #{tenantId} ) bu on bu.bu_id = co.b_user_id - left join wx_merchant_subsidy ms on co.id = ms.coupon_order_id + left join wx_merchant_subsidy ms on co.id = ms.coupon_order_id and ms.type = 1 left join wx_coupon_action_log cal on co.id = cal.coupon_order_id and co.coupon_id = cal.coupon_id where 1=1 @@ -742,7 +742,7 @@ left join wx_c_user cu on cu.id = co.c_user_id left join wx_merchant_b_user bu on co.b_user_id = bu.id left join wx_merchant m on m.id = bu.merchant_id - left join wx_merchant_subsidy ms on co.id = ms.coupon_order_id + left join wx_merchant_subsidy ms on co.id = ms.coupon_order_id and ms.type = 1 where co.id = #{id} and c.id = co.coupon_id