exit

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java

@@ -23,4 +23,8 @@ public class SmileRedisConst {
 
     public static final String SELL_TEST = PREFIX.concat("test");  //用户总营收  SELL_USER_REVENUE+uid
 
+    public static final String SELL_SHOW_POEN = PREFIX.concat("show:poen:");  //代理总销售数量
+
+    public static final String SELL_SHOW_TOTAL_SALE_PRICE = PREFIX.concat("show:total:sale:price:");  //代理总销售金额  TotalSalePrice
+
 }

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

 package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
@@ -12,8 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @author TT
  */
@@ -29,11 +28,11 @@ public class SmileShowController {
     @ApiOperation("演出列表")
     @ResponseBody
     public TableDataInfo schoolList(SmileShowParam smileShowParam) {
-        List<ShowVo> list = smileShowService.listShow(smileShowParam);
+        PageInfo<ShowVo> list = smileShowService.listShow(smileShowParam);
         TableDataInfo rspData = new TableDataInfo();
-//        rspData.setCode(0);
-//        rspData.setRows(list.getList());
-//        rspData.setTotal(list.getTotal());
+        rspData.setCode(0);
+        rspData.setRows(list.getList());
+        rspData.setTotal(list.getTotal());
         return rspData;
     }
 

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

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 @Data
 public class ShowAgentVo {
 
-    private Long id;
+    private Integer id;
 
     /**
      * 演出id
@@ -25,7 +25,7 @@ public class ShowAgentVo {
     /**
      * 票种名称
      */
-    private String ticketName;
+    private String title;
 
 
     /**

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

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
+import lombok.Data;
+
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
+@Data
 public class ShowTicketVo {
 
     /**
      * 票种名
      */
-    private String ticketName;
+    private String title;
 
     /**
      * 单价
@@ -15,7 +19,33 @@ public class ShowTicketVo {
     private BigDecimal price;
 
     /**
-     * 类型 票类型 1单日票 2通票
+     * 类型 票类型 1.单日票 2.通票
      */
     private int type;
+
+    /**
+     * 适用开始时间
+     */
+    private LocalDateTime useStart;
+
+    /**
+     * 适用结束时间
+     */
+    private LocalDateTime useEnd;
+
+    /**
+     * 票总库存     正式库存
+     */
+    private Integer totalGeneral;
+
+    /**
+     * 代理销售数量  总代销售数量+普代销售数量
+     */
+    private Integer agentSaleNum;
+
+    /**
+     * 总销售金额  总代销售金额+普代销售金额
+     */
+    private BigDecimal totalPrice;
+
 }

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

@@ -34,7 +34,7 @@ public class ShowVo {
     /**
      * 总销售金额  totalSalePrice
      */
-    private BigDecimal totalAmount;
+    private BigDecimal totalSalePrice;
 
     /**
      * 总销售代理

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

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -13,62 +14,73 @@ public class ShowVoById {
     /**
      * 演出id
      */
+    @ApiModelProperty(value ="演出id")
     private String performancesId;
 
     /**
      * 演出图片
      */
+    @ApiModelProperty(value ="演出图片")
     private String imgPoster;
 
     /**
      * 演出名
      */
+    @ApiModelProperty(value ="演出名")
     private String title;
 
     /**
      * 演出开始时间
      */
+    @ApiModelProperty(value ="演出开始时间")
     private String timeStart;
 
     /**
      * 演出结束时间
      */
+    @ApiModelProperty(value ="演出结束时间")
     private String timeEnd;
 
     /**
      * 城市id
      */
+    @ApiModelProperty(value ="城市id")
     private Integer cityId;
 
     /**
      * 城市
      */
+    @ApiModelProperty(value ="城市")
     private String cityName;
 
     /**
      * 场地id
      */
+    @ApiModelProperty(value ="场地id")
     private String fieldId;
 
     /**
      * 场地名称
      */
+    @ApiModelProperty(value ="场地名称")
     private String fieldName;
 
     /**
-     * 票提设置
+     * 票提设置集合
      */
+    @ApiModelProperty(value ="票提设置集合")
     private List<ShowAgentVo> showAgentVoList;
 
     /**
-     * 代理票种
+     * 代理票种集合
      */
-
-
+    @ApiModelProperty(value ="代理票种集合")
+    private List<ShowTicketVo> showTicketVoList;
 
     /**
      * 演出详情
      */
+    @ApiModelProperty(value ="演出详情")
     private String details;
 
 

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

@@ -2,14 +2,13 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
 import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
 import com.liquidnet.service.smile.entity.SmileSchool;
 
-import java.util.List;
-
 /**
  * <p>
  *  服务类
@@ -20,7 +19,7 @@ import java.util.List;
  */
 public interface ISmileShowService extends IService<SmileSchool> {
 
-    List<ShowVo> listShow(SmileShowParam smileShowParam);
+    PageInfo<ShowVo> listShow(SmileShowParam smileShowParam);
 
     AjaxResult sort(ShowSort showSort);
 

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

 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.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.zhengzai.smile.dto.ShowSort;
-import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo;
-import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
+import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
-import com.liquidnet.service.goblin.dto.vo.SellDataVO;
+import com.liquidnet.service.kylin.dao.KylinOrderTicketAndAgentVo;
+import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
-import com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper;
-import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
-import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
-import com.liquidnet.service.kylin.mapper.KylinTicketStatusMapper;
+import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
+import com.liquidnet.service.smile.entity.SmileAgent;
 import com.liquidnet.service.smile.entity.SmileSchool;
+import com.liquidnet.service.smile.mapper.SmileAgentMapper;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
+import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -30,7 +30,10 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -69,13 +72,21 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
     @Autowired
     KylinOrderTicketsMapper kylinOrderTicketsMapper;
 
+    @Autowired
+    SmileAgentMapper smileAgentMapper;
+
+    @Autowired
+    KylinTicketsMapper kylinTicketsMapper;
+
+    @Autowired
+    SmileUserMapper smileUserMapper;
+
     @Override
-    public List<ShowVo> listShow(SmileShowParam smileShowParam) {
-        PageInfo<KylinPerformances> pageInfo;
+    public PageInfo<ShowVo> listShow(SmileShowParam smileShowParam) {
+        PageInfo<ShowVo> pageInfo;
         //查询所有代理的演出id
         List<KylinPerformances> kylinPerformancesList = kylinPerformancesMapper.selectPerIdByAgent();
-
-        return kylinPerformancesList.stream().map(kylinPerformances -> {
+        List<ShowVo> showVoList = kylinPerformancesList.stream().map(kylinPerformances -> {
             ShowVo vo = new ShowVo();
             //演出id
             vo.setPerformancesId(kylinPerformances.getPerformancesId());
@@ -84,18 +95,26 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             //城市
             vo.setCityName(kylinPerformances.getCityName());
             //根据演出id  查询所有订单
-            List<KylinOrderTickets> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(kylinPerformances.getPerformancesId());
+            List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(kylinPerformances.getPerformancesId());
 
             int open = 0;
-            BigDecimal totalAmount = BigDecimal.valueOf(0);
-            for (KylinOrderTickets kylinOrderTickets : kylinOrderTicketsList) {
+            BigDecimal totalSalePrice = BigDecimal.valueOf(0);
+            for (KylinOrderTicketAndAgentVo kylinOrderTicketAndAgentVo : kylinOrderTicketsList) {
                 //演出张数
-                open = open + (kylinOrderTickets.getNumber() - kylinOrderTickets.getRefundNumber());
-                //总销售金额
-                totalAmount = totalAmount.add(kylinOrderTickets.getPriceActual()).subtract(kylinOrderTickets.getPriceRefund());
+                int num = kylinOrderTicketAndAgentVo.getNumber() - kylinOrderTicketAndAgentVo.getRefundNumber();
+                if (num > 0){
+                    open +=num;
+                    totalSalePrice = totalSalePrice.add((kylinOrderTicketAndAgentVo.getPriceActual()).subtract(kylinOrderTicketAndAgentVo.getPriceRefund()).multiply(BigDecimal.valueOf(num)));
+                }
+
             }
             vo.setOpen(open);
-            vo.setTotalAmount(totalAmount);
+            //缓存redis
+            smileRedisUtils.set(SmileRedisConst.SELL_SHOW_POEN.concat(kylinPerformances.getPerformancesId()), open);
+
+            vo.setTotalSalePrice(totalSalePrice);
+            //缓存redis
+            smileRedisUtils.set(SmileRedisConst.SELL_SHOW_TOTAL_SALE_PRICE.concat(kylinPerformances.getPerformancesId()), totalSalePrice);
 
             //根据演出id查询销售代理
             vo.setTotalOutAgent(kylinOrderTicketRelationsMapper.concatByAgentDed(kylinPerformances.getPerformancesId()));
@@ -104,6 +123,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
             return vo;
         }).collect(Collectors.toList());
+        pageInfo = new PageInfo<ShowVo>(showVoList);
+        return pageInfo;
     }
 
     @Override
@@ -132,27 +153,101 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
     @Override
     public AjaxResult getShowById(String performancesId) {
-        if (StringUtils.isEmpty(performancesId)){
+        if (StringUtils.isEmpty(performancesId)) {
+            ShowVoById showVoById = new ShowVoById();
             //根据演出ID查询演出数据演出数据
             KylinPerformanceVo kylinPerformanceVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+            try {
+                assert kylinPerformanceVo != null;
+            } catch (Exception e) {
+                return null;
+            }
+            showVoById.setPerformancesId(kylinPerformanceVo.getPerformancesId());
+            showVoById.setImgPoster(kylinPerformanceVo.getImgPoster());
+            showVoById.setTitle(kylinPerformanceVo.getTitle());
+            showVoById.setTimeStart(kylinPerformanceVo.getTimeStart());
+            showVoById.setTimeEnd(kylinPerformanceVo.getTimeEnd());
+            showVoById.setCityId(kylinPerformanceVo.getCityId());
+            showVoById.setCityName(kylinPerformanceVo.getCityName());
+            showVoById.setFieldId(kylinPerformanceVo.getFieldId());
+            showVoById.setFieldName(kylinPerformanceVo.getFieldName());
+            //票提集合  根据演出id查询票提id
+            List<ShowAgentVo> showAgentVoList = new ArrayList<>();
+            List<ShowTicketVo> showTicketVoList = new ArrayList<>();
+
+            LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
+            queryWrapper.eq(SmileAgent::getPerformanceId, performancesId);
+            List<SmileAgent> smileAgents = smileAgentMapper.selectList(queryWrapper);
+            Map<String, SmileAgent> map = new HashMap<>();
+            smileAgents.forEach(smileAgent -> {
+                map.put(smileAgent.getTicketId(), smileAgent);
+            });
+            List<String> ticketsIdList = smileAgents.stream().map(SmileAgent::getTicketId).collect(Collectors.toList());
+
+            //根据票提IDs查询票信息
+            List<TicketAndStatusDao> ticketAndStatusDaoList = kylinTicketsMapper.selectTicketsByIds(ticketsIdList);
+
+            for (TicketAndStatusDao ticketAndStatusDao : ticketAndStatusDaoList) {
+                SmileAgent smileAgent = map.get(ticketAndStatusDao.getTicketsId());
+
+                ShowAgentVo showAgentVo = new ShowAgentVo();
+                showAgentVo.setId(ticketAndStatusDao.getMid());
+                showAgentVo.setPerformanceId(performancesId);
+                showAgentVo.setTicketId(ticketAndStatusDao.getTicketsId());
+                showAgentVo.setTitle(ticketAndStatusDao.getTitle());
+                //总代票提
+                showAgentVo.setTotalCarry(smileAgent.getTotalCarry());
+                //普代票提
+                showAgentVo.setOrdCarry(smileAgent.getOrdCarry());
+
+                ShowTicketVo showTicketVo = new ShowTicketVo();
+                showTicketVo.setTitle(ticketAndStatusDao.getTitle());
+                //单价
+                showTicketVo.setPrice(ticketAndStatusDao.getPrice());
+                showTicketVo.setType(ticketAndStatusDao.getType());
+                showTicketVo.setUseEnd(ticketAndStatusDao.getUseEnd());
+                showTicketVo.setUseStart(ticketAndStatusDao.getUseStart());
+                showTicketVo.setTotalGeneral(ticketAndStatusDao.getTotalGeneral());
+
+                //根据演出id查询处所有订单
+                List<KylinOrderTicketAndAgentVo> kylinOrderTicketsList = kylinOrderTicketsMapper.selectListByPerformanceId(performancesId);
+                //代理销售数量
+                int agentSaleNum = 0;
+                //总销售金额
+                BigDecimal totalPrice = BigDecimal.valueOf(0);
+                //总代票提
+                for (KylinOrderTicketAndAgentVo kylinOrderTicketAndAgentVo : kylinOrderTicketsList) {
+                    int num = kylinOrderTicketAndAgentVo.getNumber() - kylinOrderTicketAndAgentVo.getRefundNumber();
+                    if (num > 0) {
+                        agentSaleNum+=num;
+                        totalPrice = totalPrice.add(
+                                (ticketAndStatusDao.getPrice().multiply(kylinOrderTicketAndAgentVo.getAgentDistributions()))
+                                        .multiply(BigDecimal.valueOf(num)));
+                    }
+                }
+                showTicketVo.setAgentSaleNum(agentSaleNum);
+                showAgentVo.setTotalCarry(totalPrice);
+
+                showAgentVoList.add(showAgentVo);
+                showTicketVoList.add(showTicketVo);
 
+            }
 
+            ShowTicketVo showTicketVo = new ShowTicketVo();
+            //代理销售总张数
+            showTicketVo.setTitle("总计");
+            //总
+            showTicketVo.setAgentSaleNum((int) smileRedisUtils.get(SmileRedisConst.SELL_SHOW_POEN.concat(performancesId)));
+            showTicketVo.setTotalPrice((BigDecimal) smileRedisUtils.get(SmileRedisConst.SELL_SHOW_TOTAL_SALE_PRICE.concat(performancesId)));
 
+            showTicketVoList.add(showTicketVo);
 
+            showVoById.setShowAgentVoList(showAgentVoList);
+            showVoById.setShowTicketVoList(showTicketVoList);
 
-            //根据演出id查询代理用户
-            List<String> agentIds = kylinOrderTicketsMapper.getAgentIdListByPerId(performancesId);
-            for (String agentId : agentIds) {
-
-
-                SellDataVO sellDataVO = (SellDataVO) smileRedisUtils.get(SmileRedisConst.SELL_DATA.concat(agentId).concat(performancesId));
-
-
-            }
-
+            return AjaxResult.success(showVoById);
         }
 
-
         return null;
     }
 

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

+package com.liquidnet.service.kylin.dao;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author TT
+ */
+@Data
+public class KylinOrderTicketAndAgentVo {
+
+    /**
+     * order_tickets_id
+     */
+    private String orderTicketsId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 演出名称
+     */
+    private String performanceTitle;
+
+    /**
+     * 数量
+     */
+    private Integer number;
+
+    /**
+     * 退款张数
+     */
+    private Integer refundNumber;
+
+    /**
+     * 实付价格
+     */
+    private BigDecimal priceActual;
+
+    /**
+     * 退款价格
+     */
+    private BigDecimal priceRefund;
+
+    /**
+     * 代理id
+     */
+    private String agentId;
+
+    /**
+     * 代理分销比例
+     */
+    private BigDecimal agentDistributions;
+
+}

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

+package com.liquidnet.service.kylin.dao;
+
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author TT
+ */
+@Data
+public class TicketAndStatusDao {
+
+    private Integer mid;
+
+    /**
+     * 票id
+     */
+    private String ticketsId;
+
+
+    /**
+     * 票种名
+     */
+    private String title;
+
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 类型 票类型 1.单日票 2.通票
+     */
+    private int type;
+
+    /**
+     * 适用开始时间
+     */
+    private LocalDateTime useStart;
+
+    /**
+     * 适用结束时间
+     */
+    private LocalDateTime useEnd;
+
+    /**
+     * 票总库存
+     */
+    private Integer totalGeneral;
+
+    /**
+     * 道理销售数量
+     */
+    private Integer agentSaleNum;
+
+    /**
+     * 总销售金额
+     */
+    private BigDecimal totalPrice;
+}

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

@@ -51,7 +51,7 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
     List<Map> getUserSellDetail(@Param("agentId")String agentId,@Param("ticketId")String ticketId);
     List<Map> getUserPerformance(@Param("agentId")String userId);
 
-    List<KylinOrderTickets> selectListByPerformanceId(@Param("performancesId") String performancesId);
+    List<KylinOrderTicketAndAgentVo> selectListByPerformanceId(@Param("performancesId") String performancesId);
 
     List<String> getAgentIdListByPerId(@Param("performancesId") String performancesId);
 }

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.entity.KylinTickets;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
 
@@ -23,4 +24,8 @@ public interface KylinTicketsMapper extends BaseMapper<KylinTickets> {
     List<TicketDamaiDao> ticketDamai(String performanceIs);
 
     List<PerformancesTicketListDao> getPerformancesTicketList(String performanceId);
+
+
+    List<TicketAndStatusDao> selectTicketsByIds(List<String> ticketsIdList);
+
 }

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

@@ -459,7 +459,7 @@
             where kots.status in (1) and kot.user_id =  #{uid} ;
     </select>
 
-    <select id="selectListByPerformanceId" resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets">
+    <select id="selectListByPerformanceId" resultType="com.liquidnet.service.kylin.dao.KylinOrderTicketAndAgentVo">
         SELECT
             kot.order_tickets_id,
             kot.user_id,
@@ -467,14 +467,17 @@
             kot.number,
             kot.refund_number,
             kot.price_actual,
-            kot.price_refund
+            kot.price_refund,
+            kk.agent_id,
+            kk.agent_distributions
         FROM
             kylin_order_tickets AS kot
                 LEFT JOIN (
                 SELECT
                     kotr.order_id,
                     kotr.agent_id,
-                    kotr.performance_id
+                    kotr.performance_id,
+                    kotr.agent_distributions
                 FROM
                     kylin_order_ticket_relations AS kotr
                         LEFT JOIN kylin_order_ticket_status AS kots ON kotr.order_id = kots.order_id

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

@@ -15,6 +15,8 @@
     </resultMap>
 
 
+
+
     <!-- 票分销情况-->
     <select id="ticketAgent" parameterType="java.lang.String" resultMap="ticketAgentResult">
         SELECT
@@ -71,4 +73,33 @@
         and b.is_express = 1
         and b.status IN (2, 3, 6, 7, 8, 9, 10)*/
     </select>
+
+    <resultMap id="ticketAndStatusDao" type="com.liquidnet.service.kylin.dao.TicketAndStatusDao">
+        <collection column="mid" property="mid" />
+        <collection column="tickets_id" property="ticketsId" />
+        <collection column="title" property="title" />
+        <collection column="type" property="type" />
+        <collection column="price" property="price" />
+        <collection column="use_start" property="useStart" />
+        <collection column="use_end" property="useEnd" />
+        <collection column="total_general" property="totalGeneral" />
+    </resultMap>
+
+    <select id="selectTicketsByIds" resultMap="ticketAndStatusDao">
+        select
+        kt.mid,
+        kt.tickets_id,
+        kt.title,
+        kt.`type`,
+        kt.price,
+        kt.use_start,
+        kt.use_end,
+        kts.total_general
+        from kylin_tickets as kt
+        LEFT JOIN kylin_ticket_status as kts ON kt.tickets_id = kts.ticket_id
+        where kt.tickets_id in
+        <foreach collection="ticketsIdList" item="ticketsId" open="(" separator="," close=")">
+            #{ticketsId}
+        </foreach>
+    </select>
 </mapper>