销售数据新增总代姓名

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/saleData.html

@@ -48,6 +48,7 @@
                     <td>姓名</td>
                     <td>所属地区</td>
                     <td>身份</td>
+                    <td>总代姓名</td>
                     <div th:each="item : *{showAgentVoList}">
                         <td th:text="${item.title}"></td>
                     </div>
@@ -65,6 +66,7 @@
                         <td th:if="${item.type==1}" th:text="总代"></td>
                         <td th:if="${item.type==2}" th:text="普代"></td>
                         <td th:if="${item.type==5}" th:text="特邀代理"></td>
+                        <td th:text="${item.agentName}"></td>
                         <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.number}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![number])}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![priceReal])}"></td>

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

@@ -39,6 +39,12 @@ public class UserData implements Serializable, Cloneable {
     @ApiModelProperty(value = "身份   1。总代  2.普代", example = "")
     private Integer type;
 
+    /**
+     * 城市名称
+     */
+    @ApiModelProperty(value = "总代姓名", example = "")
+    private String agentName;
+
     /**
      * 用户代理票信息
      */

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

@@ -430,6 +430,11 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 userData.setUsername(showBaseVoDtoList.get(0).getName());
                 userData.setCityName(showBaseVoDtoList.get(0).getCity());
                 userData.setType(showBaseVoDtoList.get(0).getType());
+                if (userData.getType() != 2) {
+                    userData.setAgentName(showBaseVoDtoList.get(0).getName());
+                } else {
+                    userData.setAgentName(showBaseVoDtoList.get(0).getAgentName());
+                }
                 userData.setDataAgentVos(userDataAgentVos);
                 //设置打款状态
                 userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, showBaseVoDtoList.get(0).getAgentId()));
@@ -461,6 +466,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     userData.setUsername(smileUser.getName());
                     userData.setCityName(smileUser.getCity());
                     userData.setType(smileUser.getType());
+                    userData.setAgentName(smileUser.getName());
                     userData.setDataAgentVos(userDataAgentVos);
                     //设置打款状态
                     userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, smileUser.getUid()));
@@ -580,6 +586,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "姓名"));
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "所属地区"));
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "身份"));
+        headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "总代姓名"));
 
         //做表
         ticketList.forEach(title -> headTitles.add(Lists.newArrayList(ticket, ticket, title)));
@@ -613,6 +620,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             } else {
                 arrayList.add("未知");
             }
+            arrayList.add(userData.getAgentName());
             //便利票数据
             List<UserDataAgentVo> dataAgentVos = userData.getDataAgentVos();
             Map<String, UserDataAgentVo> agentVoMap = dataAgentVos.stream().collect(Collectors.toMap(UserDataAgentVo::getTicketsId, Function.identity()));

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/ShowBaseVoDto.java

@@ -26,6 +26,11 @@ public class ShowBaseVoDto implements Serializable, Cloneable{
      */
     private String agentId;
 
+    /**
+     * 总代姓名
+     */
+    private String agentName;
+
     /**
      * 票提id
      */

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

@@ -78,6 +78,7 @@
             sukotr.uid AS agent_id,
             sukotr.ticket_id AS tid,
             sukotr.type,
+            sukotr.agentName,
             kot.price,
             SUM(kot.price_actual - kot.price_refund) price_real,
             sukotr.agent_distributions AS `use`,
@@ -91,6 +92,7 @@
                     su.`name`,
                     su.city,
                     su.type,
+                    agentSu.name agentName,
                     kotr.order_id,
                     kotr.performance_id,
                     kotr.ticket_id,
@@ -99,6 +101,7 @@
                     smile_user AS su
                         INNER JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid
                         INNER JOIN kylin_order_ticket_status AS kots ON kots.order_id = kotr.order_id
+                        INNER JOIN smile_user AS agentSu ON agentSu.uid = su.agent_id
                 WHERE
                         su.uid IN (
                         SELECT kotr.agent_id