演出列表，演出数据，销售数据返回处理异常

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

@@ -105,7 +105,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             //城市
             vo.setCityName(kylinPerformances.getCityName());
             //根据演出id  查询所有订单
-            List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(kylinPerformances.getPerformancesId());
+            List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(kylinPerformances.getPerformancesId(),null);
 
             int open = 0;
             BigDecimal totalSalePrice = BigDecimal.valueOf(0);
@@ -226,7 +226,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     showTicketVo.setTotalGeneral(ticketAndStatusDao.getTotalGeneral());
 
                     //根据演出id查询处所有订单
-                    List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(performancesId);
+                    List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(performancesId,ticketAndStatusDao.getTicketsId());
                     //代理销售数量
                     int agentSaleNum = 0;
                     //总销售金额

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/KylinOrderTicketAndAgentVo.java

@@ -65,4 +65,6 @@ public class KylinOrderTicketAndAgentVo {
      */
     private BigDecimal agentDistributionsMaster;
 
+    private String ticketId;
+
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketsMapper.java

@@ -52,7 +52,7 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
     List<Map> getUserSellDetail(@Param("agentId")String agentId,@Param("ticketId")String ticketId);
     List<Map> getUserPerformance(@Param("agentId")String userId);
 
-    List<KylinOrderTicketAndAgentVo> selectListByPerformanceId(@Param("performancesId") String performancesId);
+    List<KylinOrderTicketAndAgentVo> selectListByPerformanceId(@Param("performancesId") String performancesId,@Param("ticketId")String ticketId);
 
     List<String> getAgentIdListByPerId(@Param("performancesId") String performancesId);
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -482,7 +482,8 @@
             kk.agent_id,
             kk.agent_distributions,
             kk.agent_id_master,
-            kk.agent_distributions_master
+            kk.agent_distributions_master,
+            kk.ticket_id
         FROM
             kylin_order_tickets AS kot
                 LEFT JOIN (
@@ -492,13 +493,22 @@
                     kotr.performance_id,
                     kotr.agent_distributions,
                     kotr.agent_id_master,
-                    kotr.agent_distributions_master
+                    kotr.agent_distributions_master,
+                    kotr.ticket_id
                 FROM
                     kylin_order_ticket_relations AS kotr
                         LEFT JOIN kylin_order_ticket_status AS kots ON kotr.order_id = kots.order_id
             ) AS kk ON kot.order_tickets_id = kk.order_id
-        WHERE
-            kk.agent_id != 0 AND kk.performance_id = #{performancesId};
+        <where>
+            kk.agent_id != 0
+            <if test="performancesId!=''">
+                AND kk.performance_id = #{performancesId}
+            </if>
+            <if test="ticketId!=''">
+                AND kk.ticket_id = #{ticketId}
+            </if>
+        </where>
+
     </select>
 
     <select id="getAgentIdListByPerId" resultType="String">

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

@@ -132,11 +132,22 @@
 
     <select id="getAllUidByPerId"  parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileUser">
         SELECT
-            uid
+            uid,
+            `name`,
+            `type`,
+            province_id,
+            province,
+            city_id,
+            city,
+            area_id,
+            area,
+            address
+
         FROM
             smile_user su
                 LEFT JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid
         WHERE
-            kotr.performance_id = #{performancesId};
+            kotr.performance_id = #{performancesId}
+        group by uid
     </select>
 </mapper>