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

Commit 94db0dfb authored by zhengfuxin's avatar zhengfuxin

修改bug

parent b8b22826
...@@ -84,14 +84,14 @@ ...@@ -84,14 +84,14 @@
LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
LEFT JOIN kylin_performances as kp ON r.performance_id= kp.performances_id LEFT JOIN kylin_performances as kp ON r.performance_id= kp.performances_id
where r.agent_id=#{agentId} and s.status='1' GROUP BY r.performance_id where r.agent_id=#{agentId} and s.pay_status='1' GROUP BY r.performance_id
UNION ALL UNION ALL
select o.performance_title as 'title',r.performance_id as 'performanceId' ,SUM(r.agent_distributions_master * (o.price_actual-o.price_refund)) as 'commiss',kp.time_end as 'timeEnd' select o.performance_title as 'title',r.performance_id as 'performanceId' ,SUM(r.agent_distributions_master * (o.price_actual-o.price_refund)) as 'commiss',kp.time_end as 'timeEnd'
from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
LEFT JOIN kylin_performances as kp ON r.performance_id= kp.performances_id LEFT JOIN kylin_performances as kp ON r.performance_id= kp.performances_id
where r.agent_id_master=#{agentId} and s.status='1' GROUP BY r.performance_id where r.agent_id_master=#{agentId} and s.pay_status='1' GROUP BY r.performance_id
) as c GROUP BY c.performanceId ) as c GROUP BY c.performanceId
</select> </select>
<select id="getUserOrder" parameterType="String" resultType="java.util.Map"> <select id="getUserOrder" parameterType="String" resultType="java.util.Map">
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
where r.agent_id=#{agentId} and s.status='1' where r.agent_id=#{agentId} and s.pay_status='1'
</select> </select>
<select id="getUserSellOneDate" parameterType="String" resultType="java.util.Map"> <select id="getUserSellOneDate" parameterType="String" resultType="java.util.Map">
select t.title as 'title',ticket_id as 'ticketId',(SUM(number)-SUM(refund_number)) as 'number',(SUM(o.price_actual)-SUM(o.price_refund)) as 'price',SUM(r.agent_distributions * (o.price_actual-o.price_refund)) as 'commiss',r.agent_distributions as 'paioTi' select t.title as 'title',ticket_id as 'ticketId',(SUM(number)-SUM(refund_number)) as 'number',(SUM(o.price_actual)-SUM(o.price_refund)) as 'price',SUM(r.agent_distributions * (o.price_actual-o.price_refund)) as 'commiss',r.agent_distributions as 'paioTi'
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
LEFT JOIN kylin_tickets as t ON r.ticket_id=t.tickets_id LEFT JOIN kylin_tickets as t ON r.ticket_id=t.tickets_id
where r.agent_id=#{agentId} and r.performance_id=#{performanceId} and s.status='1' GROUP BY r.ticket_id where r.agent_id=#{agentId} and r.performance_id=#{performanceId} and s.pay_status='1' GROUP BY r.ticket_id
</select> </select>
<select id="getUserSellAllDate" parameterType="String" resultType="java.util.Map"> <select id="getUserSellAllDate" parameterType="String" resultType="java.util.Map">
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
LEFT JOIN kylin_tickets as t ON r.ticket_id=t.tickets_id LEFT JOIN kylin_tickets as t ON r.ticket_id=t.tickets_id
where r.agent_id=#{agentId} and r.performance_id=#{performanceId} and s.status='1' GROUP BY r.ticket_id where r.agent_id=#{agentId} and r.performance_id=#{performanceId} and s.pay_status='1' GROUP BY r.ticket_id
) as c ) as c
</select> </select>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
select o.user_mobile as 'mobile',o.order_tickets_id as 'orderId',(o.number-refund_number) as 'number',o.created_at as 'createTime' from kylin_order_tickets as o select o.user_mobile as 'mobile',o.order_tickets_id as 'orderId',(o.number-refund_number) as 'number',o.created_at as 'createTime' from kylin_order_tickets as o
LEFT JOIN kylin_order_ticket_status as s ON o.order_tickets_id=s.order_id LEFT JOIN kylin_order_ticket_status as s ON o.order_tickets_id=s.order_id
LEFT JOIN kylin_order_ticket_relations as r on o.order_tickets_id=r.order_id LEFT JOIN kylin_order_ticket_relations as r on o.order_tickets_id=r.order_id
where r.agent_id=#{agentId} and s.status='1' and r.ticket_id=#{ticketId} and (o.number-refund_number)>0 where r.agent_id=#{agentId} and s.pay_status='1' and r.ticket_id=#{ticketId} and (o.number-refund_number)>0
</select> </select>
<select id="getCanRefundOrderList" parameterType="java.lang.String" <select id="getCanRefundOrderList" parameterType="java.lang.String"
......
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