exit

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

@@ -6,21 +6,19 @@ 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.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;
+import com.liquidnet.service.smile.entity.dao.SmileAgentDao;
 import com.liquidnet.service.smile.mapper.SmileAgentMapper;
 import lombok.extern.slf4j.Slf4j;
 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;
 
 /**
@@ -100,40 +98,10 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
 
     @Override
     public AjaxResult getAgent(String performancesId) {
-        if (StringUtils.isNotEmpty(performancesId)){
-            LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
-            queryWrapper.eq(SmileAgent::getPerformanceId, performancesId);
-            queryWrapper.eq(SmileAgent::getDelTag,0);
-            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);
-            });
+        List<SmileAgentDao> smileAgentDaoList = smileAgentMapper.selectAgentList(performancesId);
+        if (smileAgentDaoList != null && smileAgentDaoList.size() > 0){
             return AjaxResult.success(smileAgentDaoList);
         }
-
-        /*//查询该演出id 开启代理的票
-        List<KylinPerformancesDao> kylinPerformancesDaoList = kylinPerformancesMapper.selectTicketIdByPerId(performancesId);
-
-        if (StringUtils.isNotEmpty(kylinPerformancesDaoList)) {
-            List<ShowAgentDao> smileAgentDaoList = new ArrayList<>(kylinPerformancesDaoList.size());
-            for (KylinPerformancesDao kylinPerformancesDao : kylinPerformancesDaoList) {
-                //根据票id查询票名
-                LambdaQueryWrapper<KylinTickets> queryWrapper = Wrappers.lambdaQuery(KylinTickets.class);
-                queryWrapper.eq(KylinTickets::getTicketsId, kylinPerformancesDao.getTicketId());
-                ShowAgentDao showAgentDao = kylinTicketsMapper.selectOneByPerIdAndTicketId(kylinPerformancesDao.getTicketId());
-                showAgentDao.setTicketId(kylinPerformancesDao.getTicketId());
-                showAgentDao.setPerformancesId(performancesId);
-                smileAgentDaoList.add(showAgentDao);
-            }
-            return AjaxResult.success(smileAgentDaoList);
-        }*/
         return AjaxResult.warn("演出未开启代理");
     }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileAgentDao.java → liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dao/SmileAgentDao.java

-package com.liquidnet.client.admin.zhengzai.smile.dto;
+package com.liquidnet.service.smile.entity.dao;
 
 import lombok.Data;
 

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

@@ -3,9 +3,11 @@ package com.liquidnet.service.smile.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.smile.entity.SmileAgent;
+import com.liquidnet.service.smile.entity.dao.SmileAgentDao;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,4 +27,6 @@ public interface SmileAgentMapper extends BaseMapper<SmileAgent> {
     Map getUserDataByPerIdAndTicketsId(@Param("performancesId")String performancesId,@Param("uid") String uid,@Param("ticketId") String ticketId);
 
     Map getUserOrgByPerIdAndUidAndAgentMaster(@Param("performancesId") String performancesId,@Param("uid") String uid,@Param("ticketId") String ticketId);
+
+    List<SmileAgentDao> selectAgentList(@Param("performancesId") String performancesId);
 }

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

@@ -139,4 +139,19 @@
             ) ss ON kk.ticket_id = ss.ticket_id
     </select>
 
+    <select id="selectAgentList" resultType="com.liquidnet.service.smile.entity.dao.SmileAgentDao">
+        SELECT
+            sa.id,
+            sa.performance_id,
+            sa.ticket_id,
+            sa.ord_carry,
+            sa.total_carry,
+            kt.title ticket_name
+        FROM
+            smile_agent sa LEFT JOIN kylin_tickets kt ON kt.tickets_id = sa.ticket_id
+        WHERE
+            sa.performance_id =  #{performancesId}
+          AND sa.del_tag = 0
+    </select>
+
 </mapper>