exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -318,7 +318,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     userDataAgentVo.setPrice(new BigDecimal(0));
                     userDataAgentVo.setAgent(showBaseVoDto.getType() == 1 ? tidMap.get(smileAgent.getTicketsId()).getTotalCarry() : tidMap.get(smileAgent.getTicketsId()).getOrdCarry());
                     userDataAgentVo.setCommission(new BigDecimal("0.00"));
-                    log.debug("saleData：演出id:{},用户id:{},票提id:{}", performancesId, showBaseVoDto.getAgentId(), smileAgent.getTicketsId());
                 }
                 //判断是否为总代
                 if (showBaseVoDto.getType() == 1) {
@@ -326,8 +325,6 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, showBaseVoDto.getAgentId(), smileAgent.getTicketsId());
                     if (orgMap != null) {
                         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());
                     }
                 }
 

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -62,37 +62,32 @@
     </select>
 
     <select id="getUserOrgByPerIdAndUidAndAgentMaster" resultType="java.util.Map">
-        SELECT *,
-               SUM(kk.price * kk.agent_distributions_master * ( kk.number - kk.refund_number )) totalPrice
-        FROM (SELECT kote.mid,
-                     kote.order_id,
-                     kote.ticket_id           tid,
-                     kt.title,
-                     kote.user_id,
-                     kote.performance_id      perId,
-                     kote.is_payment,
-                     kote.status,
-                     kot.number,
-                     kot.refund_number,
-                     kot.price,
-                     kotr.agent_id            agentId,
-                     kotr.agent_id_master,
-                     kotr.agent_distributions `use`,
-                     kotr.agent_distributions_master,
-                     su.type
-              FROM kylin_order_ticket_entities kote
-                       LEFT JOIN kylin_order_tickets kot ON kote.order_id = kot.order_tickets_id
-                       LEFT JOIN kylin_order_ticket_relations kotr ON kotr.order_id = kot.order_tickets_id
-                       LEFT JOIN kylin_order_ticket_status kots ON kots.order_id = kotr.order_id
-                       LEFT JOIN smile_user su ON su.uid = kotr.agent_id
-                       LEFT JOIN kylin_tickets kt ON kote.ticket_id = kt.tickets_id
-              WHERE kote.performance_id = #{performancesId}
-                AND kote.ticket_id = #{ticketId}
-                AND kotr.agent_id_master = #{uid}
-                AND kotr.agent_status = 1
-                AND kots.status = 1
-                AND kots.pay_status = 1
-              GROUP BY kote.order_id) kk
+        SELECT
+            SUM(
+                kot.price * sukotr.agent_distributions_master * ( kot.number - kot.refund_number )) totalPrice
+        FROM
+            kylin_order_tickets AS kot
+                INNER JOIN (
+                SELECT
+                    su.uid,
+                    su.`name`,
+                    su.city,
+                    su.type,
+                    kotr.order_id,
+                    kotr.performance_id,
+                    kotr.agent_id_master,
+                    kotr.ticket_id,
+                    kotr.agent_distributions,
+                    kotr.agent_distributions_master
+                FROM
+                    smile_user AS su
+                        INNER JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid
+                WHERE
+                    kotr.performance_id = #{performancesId} AND kotr.agent_id_master = #{uid}
+            ) AS sukotr ON sukotr.order_id = kot.order_tickets_id
+                INNER JOIN kylin_order_ticket_entities AS kote ON kote.order_id = kot.order_tickets_id
+        WHERE
+            kote.is_payment = 1  AND sukotr.ticket_id = #{ticketId}
     </select>
 
     <select id="selectAgentList" resultType="com.liquidnet.service.smile.entity.dao.SmileAgentDao">