exit

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

@@ -63,7 +63,8 @@
 
     <select id="getUserOrgByPerIdAndUidAndAgentMaster" resultType="java.util.Map">
         SELECT
-            SUM(kot.price * kotr.agent_distributions_master * ( kot.number - kot.refund_number )) totalPrice
+            SUM(
+                        ( kot.price_actual - kot.price_refund )* kotr.agent_distributions_master) totalPrice
         FROM
             kylin_order_ticket_relations AS kotr
                 INNER JOIN kylin_order_tickets AS kot ON kot.order_tickets_id = kotr.order_id
@@ -73,10 +74,10 @@
                     kotr.order_id
                 FROM
                     kylin_order_ticket_relations AS kotr
-                        INNER JOIN kylin_order_ticket_entities AS kote ON kote.order_id = kotr.order_id
+                        LEFT JOIN kylin_order_ticket_status AS kots ON kots.order_id = kotr.order_id
                 WHERE
                     kotr.agent_id IN ( SELECT uid FROM smile_user WHERE agent_id = #{uid} )
-                  AND kote.is_payment = 1 AND kotr.agent_id !=  #{uid}
+                  AND kots.status IN (1,6)
             ) AND kotr.performance_id = #{performancesId}  AND kotr.ticket_id = #{ticketId}
     </select>
 
@@ -117,7 +118,7 @@
             sukotr.agent_distributions AS `use`,
             SUM( kot.number - kot.refund_number ) number,
             SUM(
-                        kot.price * sukotr.agent_distributions * ( kot.number - kot.refund_number )) totalPrice
+                ( kot.price_actual - kot.price_refund ) * sukotr.agent_distributions ) totalPrice
         FROM
             kylin_order_tickets AS kot
                 INNER JOIN (
@@ -136,7 +137,8 @@
                 WHERE
                     kotr.performance_id = #{performancesId}
             ) 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
+                LEFT JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
+        WHERE kots.status IN (1,6)
         GROUP BY
             sukotr.uid,
             sukotr.ticket_id