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

Commit 1c85f6c0 authored by GaoHu's avatar GaoHu

exit

parent cb90bbbc
...@@ -318,7 +318,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -318,7 +318,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
userDataAgentVo.setPrice(new BigDecimal(0)); userDataAgentVo.setPrice(new BigDecimal(0));
userDataAgentVo.setAgent(showBaseVoDto.getType() == 1 ? tidMap.get(smileAgent.getTicketsId()).getTotalCarry() : tidMap.get(smileAgent.getTicketsId()).getOrdCarry()); userDataAgentVo.setAgent(showBaseVoDto.getType() == 1 ? tidMap.get(smileAgent.getTicketsId()).getTotalCarry() : tidMap.get(smileAgent.getTicketsId()).getOrdCarry());
userDataAgentVo.setCommission(new BigDecimal("0.00")); userDataAgentVo.setCommission(new BigDecimal("0.00"));
log.debug("saleData:演出id:{},用户id:{},票提id:{}", performancesId, showBaseVoDto.getAgentId(), smileAgent.getTicketsId());
} }
//判断是否为总代 //判断是否为总代
if (showBaseVoDto.getType() == 1) { if (showBaseVoDto.getType() == 1) {
...@@ -326,8 +325,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -326,8 +325,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, showBaseVoDto.getAgentId(), smileAgent.getTicketsId()); Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, showBaseVoDto.getAgentId(), smileAgent.getTicketsId());
if (orgMap != null) { if (orgMap != null) {
userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).setScale(2, RoundingMode.HALF_UP)); userDataAgentVo.setCommission((userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))).setScale(2, RoundingMode.HALF_UP));
} else {
log.debug("saleData:演出id:{},用户id:{},票提id:{}", performancesId, showBaseVoDto.getAgentId(), smileAgent.getTicketsId());
} }
} }
......
...@@ -62,37 +62,32 @@ ...@@ -62,37 +62,32 @@
</select> </select>
<select id="getUserOrgByPerIdAndUidAndAgentMaster" resultType="java.util.Map"> <select id="getUserOrgByPerIdAndUidAndAgentMaster" resultType="java.util.Map">
SELECT *, SELECT
SUM(kk.price * kk.agent_distributions_master * ( kk.number - kk.refund_number )) totalPrice SUM(
FROM (SELECT kote.mid, kot.price * sukotr.agent_distributions_master * ( kot.number - kot.refund_number )) totalPrice
kote.order_id, FROM
kote.ticket_id tid, kylin_order_tickets AS kot
kt.title, INNER JOIN (
kote.user_id, SELECT
kote.performance_id perId, su.uid,
kote.is_payment, su.`name`,
kote.status, su.city,
kot.number, su.type,
kot.refund_number, kotr.order_id,
kot.price, kotr.performance_id,
kotr.agent_id agentId,
kotr.agent_id_master, kotr.agent_id_master,
kotr.agent_distributions `use`, kotr.ticket_id,
kotr.agent_distributions_master, kotr.agent_distributions,
su.type kotr.agent_distributions_master
FROM kylin_order_ticket_entities kote FROM
LEFT JOIN kylin_order_tickets kot ON kote.order_id = kot.order_tickets_id smile_user AS su
LEFT JOIN kylin_order_ticket_relations kotr ON kotr.order_id = kot.order_tickets_id INNER JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid
LEFT JOIN kylin_order_ticket_status kots ON kots.order_id = kotr.order_id WHERE
LEFT JOIN smile_user su ON su.uid = kotr.agent_id kotr.performance_id = #{performancesId} AND kotr.agent_id_master = #{uid}
LEFT JOIN kylin_tickets kt ON kote.ticket_id = kt.tickets_id ) AS sukotr ON sukotr.order_id = kot.order_tickets_id
WHERE kote.performance_id = #{performancesId} INNER JOIN kylin_order_ticket_entities AS kote ON kote.order_id = kot.order_tickets_id
AND kote.ticket_id = #{ticketId} WHERE
AND kotr.agent_id_master = #{uid} kote.is_payment = 1 AND sukotr.ticket_id = #{ticketId}
AND kotr.agent_status = 1
AND kots.status = 1
AND kots.pay_status = 1
GROUP BY kote.order_id) kk
</select> </select>
<select id="selectAgentList" resultType="com.liquidnet.service.smile.entity.dao.SmileAgentDao"> <select id="selectAgentList" resultType="com.liquidnet.service.smile.entity.dao.SmileAgentDao">
......
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