| @@ -560,6 +560,7 @@ | |||||
| left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | ||||
| left join wx_coupon c on o.product_id=c.id | left join wx_coupon c on o.product_id=c.id | ||||
| where o.tenant_id=#{tenantId} and c.type!=100 and o.order_status in(0,1,2,3,4,5) | where o.tenant_id=#{tenantId} and c.type!=100 and o.order_status in(0,1,2,3,4,5) | ||||
| and press_current_num=0 and order_group_id=0 | |||||
| union all | union all | ||||
| select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, | select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, | ||||
| case o.order_status when 6 then 0 when 7 then 0 | case o.order_status when 6 then 0 when 7 then 0 | ||||
| @@ -567,7 +568,7 @@ | |||||
| c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,3 attribute from wx_order o | c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,3 attribute from wx_order o | ||||
| left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | ||||
| left join wx_coupon c on o.product_id=c.id | left join wx_coupon c on o.product_id=c.id | ||||
| where o.tenant_id=#{tenantId} and c.type=8 and o.payment=c.sale_price | |||||
| where o.tenant_id=#{tenantId} and c.type=8 and press_current_num>0 | |||||
| union all | union all | ||||
| select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, | select o.id,o.order_number,o.tenant_id,o.product_id,o.payment, | ||||
| case o.order_status when 10 then 1 when 11 then 1 | case o.order_status when 10 then 1 when 11 then 1 | ||||
| @@ -576,7 +577,7 @@ | |||||
| c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,4 attribute from wx_order o | c.title,cubi.`name` c_user_name,cubi.phone,o.create_date,4 attribute from wx_order o | ||||
| left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | left join wx_c_user_basic_info cubi on o.c_user_id=cubi.id | ||||
| left join wx_coupon c on o.product_id=c.id | left join wx_coupon c on o.product_id=c.id | ||||
| where o.tenant_id=#{tenantId} and c.type=9 and o.payment=c.sale_price | |||||
| where o.tenant_id=#{tenantId} and c.type=9 and order_group_id>0 | |||||
| ) o | ) o | ||||
| <where> | <where> | ||||
| <if test="tenantId!=null"> | <if test="tenantId!=null"> | ||||