记得上下班打卡 | git大法好,push需谨慎

Commit 4d75ac91 authored by limingyang's avatar limingyang

Merge branch 'lmy_start' into pre

parents f9ca0721 1fc712ac
......@@ -811,7 +811,7 @@ GROUP BY user_mobile;
inner join kylin_order_ticket_relations kr on kot.order_tickets_id = kr.order_id
inner join kylin_tickets kt on kt.tickets_id = kr.ticket_id
inner join kylin_performances kp on kp.performances_id = kr.performance_id
inner join dragon_orders do on do.order_code = kot.order_code
inner join dragon_orders do on do.order_code = kot.order_code and do.status = 1
left join dragon_order_refunds dor on dor.order_refund_id = do.code
left join kylin_ticket_times ktt on ktt.ticket_times_id = kr.time_id
where ks.status in (1, 3)
......@@ -843,7 +843,7 @@ GROUP BY user_mobile;
inner join kylin_order_ticket_relations kr on kot.order_tickets_id = kr.order_id
inner join kylin_tickets kt on kt.tickets_id = kr.ticket_id
inner join kylin_performances kp on kp.performances_id = kr.performance_id
inner join dragon_orders do on do.order_code = kot.order_code
inner join dragon_orders do on do.order_code = kot.order_code and do.status = 1
inner join dragon_order_refunds dor on dor.order_refund_id = do.code
left join kylin_ticket_times ktt on ktt.ticket_times_id = kr.time_id
where ks.status in (1, 3, 4, 6)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment