From 95df820da13934ae8db594cccfcce43f321c6e7f Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 12 Oct 2020 16:18:40 +0800 Subject: [PATCH] order_id --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 0a21b7505..4ad8e0596 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -748,7 +748,7 @@ cu.phone,m2.name as verify_merchant_name,cal.channel_type --> - co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, + co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.order_id, co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price, c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num, (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, @@ -773,14 +773,14 @@ FROM wx_coupon_merchant wcm WHERE STATUS = 0 - and wcm.`tenant_id` = #{tenantId} + and wcm.`tenant_id` = #{tenantId}findListOfAdmin and wcm.`parent_tenant_id` = #{parentTenantId} GROUP BY product_id) couc RIGHT JOIN ( - SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.coupon_type, + SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.coupon_type, co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.auto_refund,co.verify_type,co.pay_vendor FROM wx_coupon_order co WHERE 1=1 @@ -849,6 +849,9 @@ and co.id = #{id} + + and co.order_id = #{orderId} + and c.id = #{couponId}