Merge branch 'dev-smile' into dev_kid

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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowTicketVo.java

@@ -41,7 +41,7 @@ public class ShowTicketVo {
     /**
      * 代理销售数量  总代销售数量+普代销售数量
      */
-    private Integer agentSaleNum;
+    private BigDecimal agentSaleNum;
 
     /**
      * 总销售金额  总代销售金额+普代销售金额

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserData.java

@@ -37,6 +37,14 @@ public class UserData {
     @ApiModelProperty(value = "身份   1。总代  2.普代", example = "")
     private Integer type;
 
+    /**
+     * 用户代理票信息
+     */
+    @ApiModelProperty(value = "用户代理票信息", example = "")
+    List<UserDataAgentVo> dataAgentVos;
+
+
+
     /**
      * 打款状态
      */

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserDataAgentVo.java

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class UserDataAgentVo {
+
+    /**
+     * 票提id
+     */
+    @ApiModelProperty(value = "票提id", example = "")
+    private String ticketsId;
+
+    /**
+     * 票名称
+     */
+    @ApiModelProperty(value = "票名称", example = "")
+    private String ticketName;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty(value = "售出张数", example = "")
+    private BigDecimal number;
+
+    /**
+     * 单价
+     */
+    @ApiModelProperty(value = "单价", example = "")
+    private BigDecimal price;
+
+    /**
+     * 票提
+     */
+    @ApiModelProperty(value = "票提", example = "")
+    private BigDecimal agent;
+
+    /**
+     * 提成
+     */
+    @ApiModelProperty(value = "提成", example = "")
+    private BigDecimal commission;
+
+    /**
+     * 打款状态
+     */
+    @ApiModelProperty(value = "打款状态", example = "")
+    private String status;
+}

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

@@ -58,7 +58,7 @@ public class KylinOrderTicketAndAgentVo {
     /**
      * 总代id
      */
-    private BigDecimal agentIdMaster;
+    private String agentIdMaster;
 
     /**
      * 总代抽成票提

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

@@ -59,4 +59,6 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
     Map selectByPerformanceId(@Param("performancesId") String performancesId);
 
     List<String> getAgentIdListByPerId(@Param("performancesId") String performancesId);
+
+    Map selectNumAndPrice(@Param("performancesId") String performancesId,@Param("ticketsId") String ticketsId);
 }

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

@@ -564,4 +564,30 @@
         GROUP BY
             agent_id;
     </select>
+
+    <select id="selectNumAndPrice" resultType="java.util.Map">
+        SELECT
+            SUM(kot.number-kot.refund_number) agentSaleNum,
+            SUM((kot.number-kot.refund_number) * kt.price) totalPrice
+        FROM
+            kylin_order_tickets AS kot
+                LEFT JOIN (
+                SELECT
+                    kotr.order_id,
+                    kotr.agent_id,
+                    kotr.performance_id,
+                    kotr.agent_distributions,
+                    kotr.agent_id_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
+                LEFT JOIN kylin_tickets AS kt ON kt.tickets_id = kk.ticket_id
+        WHERE
+            kk.agent_id != 0
+	AND kk.performance_id = #{performancesId}
+	AND kk.ticket_id = #{ticketsId}
+    </select>
 </mapper>