|
|
|
@@ -575,7 +575,7 @@ |
|
|
|
where m.id = cm.merchant_id and cm.product_id=co.coupon_id and cm.status = 0) else '[多商户通用]' end) as merchant_name, |
|
|
|
(case when com.mc = 1 then (select m.id from wx_merchant m, |
|
|
|
wx_coupon_merchant cm where m.id = cm.merchant_id and cm.product_id = co.coupon_id |
|
|
|
and cm.status = 0) else 0 end) as merchant_id,cu.phone,bu.verify_merchant_name |
|
|
|
and cm.status = 0) else 0 end) as merchant_id,cu.phone,bu.verify_merchant_name,cal.channel_type |
|
|
|
</sql> |
|
|
|
|
|
|
|
<sql id="allAdminCouponOrderDetailColumns"> |
|
|
|
@@ -601,6 +601,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_coupon_action_log cal on co.id = cal.coupon_order_id and co.coupon_id = cal.coupon_id |
|
|
|
where 1=1 |
|
|
|
<choose> |
|
|
|
<when test=" null != couponType"> |
|
|
|
|