exit return agentList

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileAgentController.java

@@ -30,8 +30,8 @@ public class SmileAgentController {
     @PostMapping("/list")
     @ApiOperation("根据PerId获取票提")
     @ResponseBody
-    public AjaxResult organizationList(@RequestParam(name = "performancesId", required = true)String performancesId){
-        return AjaxResult.success(smileAgentService.getAgent(performancesId));
+    public AjaxResult getAgent(@RequestParam(name = "performancesId", required = true)String performancesId){
+        return smileAgentService.getAgent(performancesId);
     }
 
     @PostMapping("/create")

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

@@ -2,6 +2,8 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.service.kylin.dao.ShowAgentDao;
 import com.liquidnet.service.smile.entity.SmileAgent;
 
 import java.util.List;
@@ -20,5 +22,5 @@ public interface ISmileAgentService extends IService<SmileAgent> {
 
     boolean create(List<SmileAgent> smileAgents);
 
-    String getAgent(String performancesId);
+    AjaxResult getAgent(String performancesId);
 }

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

@@ -4,11 +4,13 @@ package com.liquidnet.client.admin.zhengzai.smile.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.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.dao.ShowAgentDao;
 import com.liquidnet.service.kylin.entity.KylinTickets;
 import com.liquidnet.service.kylin.mapper.KylinTicketsMapper;
 import com.liquidnet.service.smile.entity.SmileAgent;
@@ -18,6 +20,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;
 
 /**
@@ -100,20 +103,20 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
     }
 
     @Override
-    public String getAgent(String performancesId) {
+    public AjaxResult getAgent(String performancesId) {
         //从redis取出开启代理的票id
-//        smileRedisUtils.lSet(SmileRedisConst.SMILE_SHOW.concat(":performancesId"),ticketId);
         List<Object> ticketsList = smileRedisUtils.lGet(SmileRedisConst.SMILE_SHOW.concat(":").concat(performancesId), 0, -1);
         if (StringUtils.isNotEmpty(ticketsList)) {
+            List<ShowAgentDao> smileAgentDaoList = new ArrayList<>(ticketsList.size());
             for (Object tickets : ticketsList) {
-                //根据票id查询票名及其
+                //根据票id查询票名
                 LambdaQueryWrapper<KylinTickets> queryWrapper = Wrappers.lambdaQuery(KylinTickets.class);
                 queryWrapper.eq(KylinTickets::getTicketsId,tickets);
-                KylinTickets kylinTickets = kylinTicketsMapper.selectOne(queryWrapper);
-
+                ShowAgentDao showAgentDao = kylinTicketsMapper.selectOneByPerIdAndTicketId((String) tickets);
+                smileAgentDaoList.add(showAgentDao);
             }
+            return AjaxResult.success(smileAgentDaoList);
         }
-
-        return null;
+        return AjaxResult.success();
     }
 }

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

+package com.liquidnet.service.kylin.dao;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author TT
+ */
+@Data
+public class ShowAgentDao {
+
+    private Integer id;
+
+    /**
+     * 演出id
+     */
+    private String performanceId;
+
+    /**
+     * 票id
+     */
+    private String ticketId;
+
+    /**
+     * 票种名称
+     */
+    private String title;
+
+
+    /**
+     * 总代票提
+     */
+    private BigDecimal totalCarry;
+
+    /**
+     * 普代票提
+     */
+    private BigDecimal ordCarry;
+}

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

 package com.liquidnet.service.kylin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.kylin.dao.PerformancesTicketListDao;
-import com.liquidnet.service.kylin.dao.TicketAgentDao;
-import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
-import com.liquidnet.service.kylin.dao.TicketDamaiDao;
+import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.entity.KylinTickets;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -28,4 +26,5 @@ public interface KylinTicketsMapper extends BaseMapper<KylinTickets> {
 
     List<TicketAndStatusDao> selectTicketsByIds(List<String> ticketsIdList);
 
+    ShowAgentDao selectOneByPerIdAndTicketId(@Param("ticketId")String ticketId);
 }

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

@@ -85,6 +85,15 @@
         <collection column="total_general" property="totalGeneral" />
     </resultMap>
 
+    <resultMap id="showAgentDao" type="com.liquidnet.service.kylin.dao.ShowAgentDao">
+        <collection column="id" property="id"/>
+        <collection column="performance_id" property="performanceId"/>
+        <collection column="ticket_id" property="ticketId"/>
+        <collection column="title" property="title"/>
+        <collection column="total_carry" property="totalCarry"/>
+        <collection column="ord_carry" property="ordCarry"/>
+    </resultMap>
+
     <select id="selectTicketsByIds" resultMap="ticketAndStatusDao">
         select
         kt.mid,
@@ -102,4 +111,15 @@
             #{ticketsId}
         </foreach>
     </select>
+
+    <select id="selectOneByPerIdAndTicketId" resultMap="showAgentDao">
+        SELECT sa.id,
+               sa.performance_id,
+               sa.ticket_id,
+               sa.total_carry,
+               sa.ord_carry,
+               kt.title
+        FROM smile_agent sa RIGHT JOIN kylin_tickets kt ON sa.ticket_id = kt.tickets_id
+        WHERE kt.tickets_id = #{ticketId}
+    </select>
 </mapper>