|
|
|
@@ -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 |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
and wcm.`tenant_id` = #{tenantId} |
|
|
|
and wcm.`tenant_id` = #{tenantId}findListOfAdmin |
|
|
|
</if> |
|
|
|
<if test=" null != parentTenantId and '' != parentTenantId"> |
|
|
|
and wcm.`parent_tenant_id` = #{parentTenantId} |
|
|
|
</if> |
|
|
|
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 |
|
|
|
<if test=" null != tenantId and '' != tenantId"> |
|
|
|
@@ -849,6 +849,9 @@ |
|
|
|
<if test=" null != id "> |
|
|
|
and co.id = #{id} |
|
|
|
</if> |
|
|
|
<if test=" null != orderId "> |
|
|
|
and co.order_id = #{orderId} |
|
|
|
</if> |
|
|
|
<if test=" null != couponId "> |
|
|
|
and c.id = #{couponId} |
|
|
|
</if> |
|
|
|
|