演出列表，票提列表，组织列表新加各名称字段

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileAgentVo.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileAgentDao.java

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
  * @author TT
  */
 @Data
-public class SmileAgentVo {
+public class SmileAgentDao {
 
     private Long id;
 
@@ -22,6 +22,10 @@ public class SmileAgentVo {
      */
     private String ticketId;
 
+    /**
+     * 票提名称
+     */
+    private String ticketName;
 
     /**
      * 总代票提

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

@@ -70,6 +70,12 @@ public class SmileOrganizationVo{
     @ApiModelProperty(value = "总代理", example = "")
     private String agentId;
 
+    /**
+     * 总代理人名
+     */
+    @ApiModelProperty(value = "总代理人名")
+    private String agentName;
+
     /**
      * 人数
      */

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

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.utils.StringUtils;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileAgentDao;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileAgentService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
+import com.liquidnet.service.kylin.entity.KylinTickets;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.mapper.KylinTicketsMapper;
 import com.liquidnet.service.smile.entity.SmileAgent;
@@ -19,6 +21,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -120,7 +123,18 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
             LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
             queryWrapper.eq(SmileAgent::getPerformanceId, performancesId);
             queryWrapper.eq(SmileAgent::getDelTag,0);
-            return AjaxResult.success(smileAgentMapper.selectList(queryWrapper));
+            List<SmileAgent> agents = smileAgentMapper.selectList(queryWrapper);
+            List<SmileAgentDao> smileAgentDaoList = new ArrayList<>(agents.size());
+            agents.forEach(s -> {
+                SmileAgentDao smileAgentDao = new SmileAgentDao();
+                BeanUtils.copyProperties(s, smileAgentDao);
+                //根据票提ID查询票种名称
+                LambdaQueryWrapper<KylinTickets> kylinTicketsQueryWrapper = Wrappers.lambdaQuery(KylinTickets.class);
+                kylinTicketsQueryWrapper.eq(KylinTickets::getTicketsId,s.getTicketId());
+                smileAgentDao.setTicketName(kylinTicketsMapper.selectOne(kylinTicketsQueryWrapper).getTitle());
+                smileAgentDaoList.add(smileAgentDao);
+            });
+            return AjaxResult.success(smileAgentDaoList);
         }
 
         /*//查询该演出id 开启代理的票

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

@@ -6,13 +6,17 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrgAndUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileOrganizationService;
+import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
+import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.smile.entity.SmileOrganization;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileOrganizationMapper;
@@ -45,6 +49,9 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
     @Autowired
     SmileUserMapper smileUserMapper;
 
+    @Autowired
+    SmileRedisUtils smileRedisUtils;
+
     @Override
     public PageInfo<SmileOrganizationVo> organizationList(SmileOrganizationParam smileOrganizationParam) {
         PageInfo<SmileOrganizationVo> pageInfo;
@@ -55,6 +62,13 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
                 SmileOrganizationVo smileOrganizationVo = new SmileOrganizationVo();
                 BeanUtils.copyProperties(smileOrganization, smileOrganizationVo);
                 log.info("organizationList orgId:{}", smileOrganization.getId());
+                //根据代理id  用户uid查询用户名称
+                if (StringUtils.isNotEmpty(smileOrganization.getAgentId())){
+                    SmileUserVO smileUserVO = (SmileUserVO) smileRedisUtils.get(SmileRedisConst.SMILE_USER + smileOrganization.getAgentId());
+                    if (smileUserVO != null) {
+                        smileOrganizationVo.setAgentName(smileUserVO.getName());
+                    }
+                }
                 //关联查询人数
                 smileOrganizationVo.setProper(smileUserMapper.strip(smileOrganization.getId()));
                 return smileOrganizationVo;