|
|
|
@@ -491,12 +491,6 @@ |
|
|
|
where o.type in (1,2) and o.order_status in (1,4) ) o |
|
|
|
left join wx_merchant m on o.merchant_id=m.id |
|
|
|
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id |
|
|
|
union all |
|
|
|
select o.id,o.order_number,o.tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.type,o.payment_type,o.payment,o.payment_time, |
|
|
|
o.order_status,o.create_date,o.update_date,o.detail,m.`name` merchant_name,cubi.`name` c_user_name,cubi.phone |
|
|
|
from wx_order o left join wx_merchant m on o.product_id=m.id |
|
|
|
left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id |
|
|
|
where o.type=3 and o.order_status in (1,4) |
|
|
|
) o |
|
|
|
<where> |
|
|
|
<if test="tenantId!=null"> |
|
|
|
@@ -519,7 +513,7 @@ |
|
|
|
select o.*, m.`name` merchantName from ( |
|
|
|
select o.*,cm.merchant_id from wx_order o |
|
|
|
left join wx_coupon_merchant cm on o.product_id=cm.product_id |
|
|
|
where o.type in (0,3) and o.order_status in (1,4)) o |
|
|
|
where o.type = 0 and o.order_status in (1,4)) o |
|
|
|
left join wx_merchant m on o.merchant_id=m.id |
|
|
|
union all |
|
|
|
select o.*,m.`name` merchantName from ( |
|
|
|
@@ -544,7 +538,7 @@ |
|
|
|
select o.*,m.`name` merchantName from ( |
|
|
|
select o.*,cm.merchant_id from wx_order o |
|
|
|
left join wx_coupon_merchant cm on o.product_id=cm.product_id |
|
|
|
where o.type in (0,3) and o.order_status = #{order_status}) o |
|
|
|
where o.type = 0 and o.order_status = #{order_status}) o |
|
|
|
left join wx_merchant m on o.merchant_id=m.id |
|
|
|
union all |
|
|
|
select o.*,m.`name` merchantName from ( |
|
|
|
|