代理数据修改

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 phone;
+
     /**
      * 城市名称
      */

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

@@ -21,6 +21,7 @@ import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.service.galaxy.utils.ObjectUtil;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
+import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
 import com.liquidnet.service.kylin.dao.report.KylinPerformancesDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -431,6 +432,7 @@ 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());
+                userData.setPhone(showBaseVoList.get(0).getPhone());
                 if (userData.getType() != 2) {
                     userData.setAgentName(showBaseVoDtoList.get(0).getName());
                 } else {
@@ -467,7 +469,18 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     userData.setUsername(smileUser.getName());
                     userData.setCityName(smileUser.getCity());
                     userData.setType(smileUser.getType());
+                    userData.setPhone(smileUser.getPhone());
+                    //判断用户是否为总代
+                    if (userData.getType() == 1) {
                         userData.setAgentName(smileUser.getName());
+                    } else {
+                        if (!StringUtils.isEmpty(smileUser.getAgentId())) {
+                            SmileUserVO smileUserVO = smileRedisUtils.getSmileUserVO(smileUser.getAgentId());
+                            userData.setAgentName(smileUserVO.getName());
+                        } else {
+                            userData.setAgentName(null);
+                        }
+                    }
                     userData.setDataAgentVos(userDataAgentVos);
                     //设置打款状态
                     userData.setPriceStatus(smileRedisUtils.getShowPriceUid(performancesId, smileUser.getUid()));
@@ -616,6 +629,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, "手机号"));
         headTitles.add(Lists.newArrayList(basicInfo, basicInfo, "总代姓名"));
 
         //做表
@@ -650,6 +664,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             } else {
                 arrayList.add("未知");
             }
+            arrayList.add(userData.getPhone());
             arrayList.add(userData.getAgentName());
             //便利票数据
             List<UserDataAgentVo> dataAgentVos = userData.getDataAgentVos();

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

@@ -21,6 +21,11 @@ public class ShowBaseVoDto implements Serializable, Cloneable{
      */
     private String city;
 
+    /**
+     * 手机号码
+     */
+    private String phone;
+
     /**
      * agentId
      */

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.phone,
             sukotr.agentName,
             kot.price,
             SUM(kot.price_actual - kot.price_refund) price_real,
@@ -92,6 +93,7 @@
                     su.`name`,
                     su.city,
                     su.type,
+                    su.phone,
                     agentSu.name agentName,
                     kotr.order_id,
                     kotr.performance_id,

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

@@ -176,7 +176,9 @@
         SELECT su.uid,
                su.name,
                su.type,
-               su.city
+               su.city,
+               su.phone,
+               su.agent_id
         FROM smile_user AS su
                  INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master
                              FROM kylin_order_ticket_relations AS kotr