|
|
|
@@ -560,7 +560,7 @@ |
|
|
|
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 |
|
|
|
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 |
|
|
|
and ifnull(press_current_num,0)=0 and ifnull(order_group_id)=0 |
|
|
|
union all |
|
|
|
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 |
|
|
|
|