Merge remote-tracking branch 'origin/master' into container-prod

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -10,6 +10,8 @@ import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.KylinPerformanceSubscribeTicketStatisticalExportDao;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceOrderStatisCountResp;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceTicketSalesDto;
+import com.liquidnet.client.admin.zhengzai.kylin.service.IOpenDataService;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
@@ -52,6 +54,8 @@ public class KylinPerformancesController extends BaseController {
 
     @Autowired
     private DamaiService damaiService;
+    @Autowired
+    private IOpenDataService openDataService;
 
     //@RequiresPermissions("kylin:performances:view")
     @GetMapping()
@@ -145,12 +149,47 @@ public class KylinPerformancesController extends BaseController {
     //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/performanceStatic/{performancesId}")
     public String performanceStatic(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
+
+        PerformanceOrderStatisCountResp perCountResp = new PerformanceOrderStatisCountResp();
+        List<PerformanceOrderStatisticalDao> result = new ArrayList<>();
+
+        PerformanceTicketSalesDto ticketSalesInfo = openDataService.getPerformanceTicketSalesInfo(performancesId);
+        if (ticketSalesInfo != null) {
+            perCountResp.setPerformanceTitle(ticketSalesInfo.getPerformanceTitle());
+            perCountResp.setTotalSalePrice(new BigDecimal(ticketSalesInfo.getFullSalesAmountTotal()));
+            perCountResp.setSaleGeneral(new BigDecimal(ticketSalesInfo.getFullAudienceTicketTotal()));
+            perCountResp.setTotalGeneral(new BigDecimal(ticketSalesInfo.getFullTotalGeneral()));
+            perCountResp.setTotalRefundGeneral(new BigDecimal(ticketSalesInfo.getFullRefundTicketTotal()));
+            perCountResp.setTotalBuyUsers(new BigDecimal(ticketSalesInfo.getFullBuyTotal()));
+
+            List<PerformanceTicketSalesDto.TicketSales> fullTicketDataList = ticketSalesInfo.getFullTicketDataList();
+            if (!fullTicketDataList.isEmpty()) {
+                for (PerformanceTicketSalesDto.TicketSales ticketSales : fullTicketDataList) {
+                    PerformanceOrderStatisticalDao statisticalDao = new PerformanceOrderStatisticalDao();
+                    statisticalDao.setPerformancesId(ticketSalesInfo.getPerformanceId());
+                    statisticalDao.setTicketsId(ticketSales.getTicketId());
+                    statisticalDao.setTitle(ticketSales.getTicketTitle());
+                    statisticalDao.setPrice(new BigDecimal(ticketSales.getTicketPrice()));
+                    statisticalDao.setType(ticketSales.getTicketType());
+                    statisticalDao.setTotalGeneral(new BigDecimal(ticketSales.getTotalGeneral()));
+                    statisticalDao.setSaleGeneral(new BigDecimal(ticketSales.getAudienceTicketTotal()));
+                    statisticalDao.setTotalRefundGeneral(new BigDecimal(ticketSales.getRefundTicketTotal()));
+                    statisticalDao.setTotalPayingNumber(new BigDecimal(ticketSales.getPayingTotal()));
+                    statisticalDao.setTimeId(ticketSales.getTimeId());
+                    statisticalDao.setTimeTitle(ticketSales.getTimeTitle());
+                    statisticalDao.setVipBuyTotal(ticketSales.getVipBuyTotal());
+                    statisticalDao.setFullRefundTicketTotal(ticketSales.getFullRefundTicketTotal());
+                    statisticalDao.setHandlingFeeRefundTicketTotal(ticketSales.getHandlingFeeRefundTicketTotal());
+                    statisticalDao.setRefundFeeRevenueTotal(new BigDecimal(ticketSales.getRefundFeeRevenueTotal()));
+                    statisticalDao.setAudienceSalesAmountTotal(new BigDecimal(ticketSales.getAudienceSalesAmountTotal()));
+                    result.add(statisticalDao);
+                }
+            }
+        }else {
             //获取演出详情
             KylinPerformanceMisVo performanceMisVo = kylinPerformancesService.performanceDetails(performancesId);
 
-        List<PerformanceOrderStatisticalDao> result = kylinPerformancesService.getPerformanceOrderStatisticalList(performancesId);
-        //构造top统计数据
-        PerformanceOrderStatisCountResp perCountResp = new PerformanceOrderStatisCountResp();
+            result = kylinPerformancesService.getPerformanceOrderStatisticalList(performancesId);
             perCountResp.setPerformanceTitle(performanceMisVo.getTitle());
             if (result.size() >= 2) {
                 PerformanceOrderStatisticalDao resdao = result.get(result.size() - 1);
@@ -163,6 +202,7 @@ public class KylinPerformancesController extends BaseController {
                 perCountResp.setTotalDisPrice(BigDecimal.ONE);
                 perCountResp.setTotalRefundGeneral(resdao.getTotalRefundGeneral());
             }
+        }
 
         mmap.put("perCountResp", perCountResp);
         mmap.put("perOrderStaticList", result);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performancesStatic.html

@@ -53,12 +53,12 @@
                         <div th:text="*{totalBuyUsers}">39</div>
                     </div>
                 </div>
-                <div class="col-lg-1">
-                    <div>
-                        <div>小家伙分销(元)</div>
-                        <div th:text="*{totalDisPrice}">0</div>
-                    </div>
-                </div>
+<!--                <div class="col-lg-1">-->
+<!--                    <div>-->
+<!--                        <div>小家伙分销(元)</div>-->
+<!--                        <div th:text="*{totalDisPrice}">0</div>-->
+<!--                    </div>-->
+<!--                </div>-->
                 <div class="col-lg-1">
                     <div>
                         <div>退票数量(张)</div>
@@ -71,65 +71,68 @@
             <thead>
             <tr>
                 <th>
-                    <div class="cell">票种名</div>
+                    <div class="cell">场次</div>
                 </th>
                 <th>
-                    <div class="cell">单价</div>
+                    <div class="cell">票种类型</div>
                 </th>
                 <th>
-                    <div class="cell">类型</div>
+                    <div class="cell">票种名称</div>
                 </th>
                 <th>
-                    <div class="cell">适用时间</div>
+                    <div class="cell">票种价格</div>
                 </th>
                 <th>
-                    <div class="cell">销售总数量</div>
+                    <div class="cell">库存数量</div>
                 </th>
                 <th>
-                    <div class="cell">会员销售数量</div>
+                    <div class="cell">销售数量</div>
                 </th>
                 <th>
-                    <div class="cell">库存数量</div>
+                    <div class="cell">登登登VIP购票数量</div>
                 </th>
                 <th>
                     <div class="cell">正在支付数量</div>
                 </th>
                 <th>
-                    <div class="cell">退票数量</div>
+                    <div class="cell">退票总数量</div>
+                </th>
+                <th>
+                    <div class="cell">全额退票数量</div>
+                </th>
+                <th>
+                    <div class="cell">手续费退票数量</div>
                 </th>
                 <th>
-                    <div class="cell">羊毛券数量</div>
+                    <div class="cell">退票手续费收益</div>
                 </th>
                 <th>
-                    <div class="cell">销售额（元）</div>
+                    <div class="cell">票面销售金额</div>
                 </th>
-<!--                <th>-->
-<!--                    <div class="cell">兑换数量</div>-->
-<!--                </th>-->
             </tr>
             </thead>
             <tbody>
             <tr th:each="respBean,respBeanStat:${perOrderStaticList}">
                 <td>
-                    <div class="cell" th:text="${respBean.title}">180元区</div>
+                    <div class="cell" th:text="${respBean.timeTitle}">180元区</div>
                 </td>
                 <td>
-                    <div class="cell" th:text="${respBean.price}">180.00</div>
+                    <div class="cell" th:text="${@dict.getLabel('zhengzai_ticket_type',respBean.type)}">0</div>
                 </td>
                 <td>
-                    <div class="cell" th:text="${@dict.getLabel('zhengzai_ticket_type',respBean.type)}">0</div>
+                    <div class="cell" th:text="${respBean.title}">0</div>
                 </td>
                 <td>
-                    <div class="cell" >[[${respBean.useStart}]] - [[${respBean.useEnd}]]</div>
+                    <div class="cell" th:text="${respBean.price}">0</div>
                 </td>
                 <td>
-                    <div class="cell" th:text="${respBean.saleGeneral}">0</div>
+                    <div class="cell" th:text="${respBean.totalGeneral}">0</div>
                 </td>
                 <td>
-                    <div class="cell" th:text="${respBean.totalMemberNumber}">0</div>
+                    <div class="cell" th:text="${respBean.saleGeneral}">0</div>
                 </td>
                 <td>
-                    <div class="cell" th:text="${respBean.surplusGeneral}">0</div>
+                    <div class="cell" th:text="${respBean.vipBuyTotal}">0</div>
                 </td>
                 <td>
                     <div class="cell" th:text="${respBean.totalPayingNumber}">0</div>
@@ -138,10 +141,16 @@
                     <div class="cell" th:text="${respBean.totalRefundGeneral}">0</div>
                 </td>
                 <td>
-                    <div class="cell" th:text="${respBean.totalVoucherCount}">0</div>
+                    <div class="cell" th:text="${respBean.fullRefundTicketTotal}">0</div>
+                </td>
+                <td>
+                    <div class="cell" th:text="${respBean.handlingFeeRefundTicketTotal}">0</div>
+                </td>
+                <td>
+                    <div class="cell" th:text="${respBean.refundFeeRevenueTotal}">0</div>
                 </td>
                 <td>
-                    <div class="cell" th:text="${respBean.totalSalePrice}">0</div>
+                    <div class="cell" th:text="${respBean.audienceSalesAmountTotal}">0</div>
                 </td>
 <!--                <td>-->
 <!--                    <div class="cell" th:text="${respBean.totalExchange}">0</div>-->

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OpenDataBaseResponse.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import lombok.Data;
+
+@Data
+public class OpenDataBaseResponse<T> {
+
+    private Integer code;
+
+    private String msg;
+
+    private T data;
+
+
+    public boolean isSucc(){
+        return this.code != null && this.code == 0;
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OpenDataSalesResponse.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class OpenDataSalesResponse extends OpenDataBaseResponse<List<PerformanceSalesDto>>{
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OpenDataTicketSalesResponse.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class OpenDataTicketSalesResponse extends OpenDataBaseResponse<PerformanceTicketSalesDto>{
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/PerformanceSalesDto.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import lombok.Data;
+
+
+@Data
+public class PerformanceSalesDto {
+
+    /**
+     * 演出ID
+     */
+    private String performanceId;
+
+    /**
+     * 总库存
+     */
+    private Integer totalGeneral;
+
+    /**
+     * 观众购票数
+     */
+    private Integer audienceTicketTotal;
+
+    /**
+     * 剩余库存
+     */
+    private Integer surplusGeneral;
+
+    /**
+     * 总销售额
+     */
+    private String salesAmountTotal;
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/PerformanceTicketSalesDto.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PerformanceTicketSalesDto {
+
+    /**
+     * 演出ID
+     */
+    private String performanceId;
+
+    /**
+     * 演出名称
+     */
+    private String performanceTitle;
+
+    /**
+     * 总销售票款(元)
+     */
+    private String fullSalesAmountTotal;
+
+    /**
+     * 观众购票数
+     */
+    private String fullAudienceTicketTotal;
+
+    /**
+     * 总库存
+     */
+    private String fullTotalGeneral;
+
+    /**
+     * 退票数量(张)
+     */
+    private String fullRefundTicketTotal;
+
+    /**
+     * 购买人数
+     */
+    private String fullBuyTotal;
+
+    /**
+     * 票种销售数据
+     */
+    private List<TicketSales> fullTicketDataList;
+
+
+    @Data
+    public static class TicketSales {
+        // 票ID
+        private String ticketId;
+
+        // 场次ID
+        private String timeId;
+
+        // 场次名称
+        private String timeTitle;
+
+        // 票种名称
+        private String ticketTitle;
+
+        // 票种金额
+        private String ticketPrice;
+
+        // 销售总金额
+        private String salesAmountTotal;
+
+        // 退票手续费总收益
+        private String refundFeeRevenueTotal;
+
+        // 观众购票总数[销售总票量-兑换码票总数] 销售数量
+        private String audienceTicketTotal;
+
+        // 观众购票销售总金额[票种金额* 观众购票总数] 票面销售金额
+        private String audienceSalesAmountTotal;
+
+        // 全额退票总数
+        private Integer fullRefundTicketTotal;
+
+        // 手续费退票总数
+        private Integer handlingFeeRefundTicketTotal;
+
+        // 退票总数量
+        private String refundTicketTotal;
+
+        // 票种类型 1：单日票 2：通票
+        private Integer ticketType;
+
+        // 库存数量
+        private String totalGeneral;
+
+        // 登登登VIP购买数量
+        private Integer vipBuyTotal;
+
+        // 正在支付数量
+        private String payingTotal;
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/IOpenDataService.java

+package com.liquidnet.client.admin.zhengzai.kylin.service;
+
+import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceSalesDto;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceTicketSalesDto;
+
+import java.util.List;
+
+/**
+ * 数据查询服务
+ */
+public interface IOpenDataService {
+
+
+    /**
+     * 获取演出销售数据
+     * @param performanceIdList
+     * @return
+     */
+    List<PerformanceSalesDto> getPerformanceSalesInfo(List<String> performanceIdList);
+
+    /**
+     * 获取演出票销售数据
+     * @param performanceId
+     * @return
+     */
+    PerformanceTicketSalesDto getPerformanceTicketSalesInfo(String performanceId);
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -7,14 +7,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.client.admin.common.utils.StringUtils;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceSalesDto;
+import com.liquidnet.client.admin.zhengzai.kylin.service.IOpenDataService;
 import com.liquidnet.client.admin.zhengzai.kylin.service.InnerService;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
 import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeAuthorizationRecordsAdminService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
@@ -104,6 +104,10 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     @Autowired
     KylinPerformancesMapper kylinPerformancesMapper;
 
+    @Autowired
+    private IOpenDataService openDataService;
+
+
     @Override
     public void test() {
 //        //同步演出
@@ -293,8 +297,31 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         List<PerformanceAdminListDao> newList = new ArrayList();
         try {
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
-            List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
+            List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceListV2(map);
+            List<String> performanceIdList = voList.stream().map(PerformanceAdminListDao::getPerformancesId)
+                    .collect(Collectors.toList());
+            Map<String, PerformanceSalesDto> salesDtoMap = new HashMap<>();
+            if (!performanceIdList.isEmpty()) {
+                // 获取演出销售数据
+                List<PerformanceSalesDto> performanceSalesInfoList = openDataService.getPerformanceSalesInfo(performanceIdList);
+                if (!performanceSalesInfoList.isEmpty()) {
+                    salesDtoMap = performanceSalesInfoList.stream()
+                            .collect(Collectors.toMap(
+                                    PerformanceSalesDto::getPerformanceId,
+                                    performanceSalesDto -> performanceSalesDto
+                            ));
+                }
+            }
             for (PerformanceAdminListDao item : voList) {
+                // 修改售卖数据
+                PerformanceSalesDto performanceSalesDto = salesDtoMap.get(item.getPerformancesId());
+                if (performanceSalesDto != null) {
+                    item.setTotalGeneral(performanceSalesDto.getTotalGeneral());
+                    item.setTotalSalePrice(new BigDecimal(performanceSalesDto.getSalesAmountTotal()));
+                    item.setSaleGeneral(performanceSalesDto.getAudienceTicketTotal());
+                    item.setSurplusGeneral(performanceSalesDto.getSurplusGeneral());
+                }
+
                 if (item.getTimeSell() == null || item.getTimeStop() == null) {
                     continue;
                 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/OpenDataServiceImpl.java

+package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
+
+import com.liquidnet.client.admin.zhengzai.kylin.dto.OpenDataSalesResponse;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.OpenDataTicketSalesResponse;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceSalesDto;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceTicketSalesDto;
+import com.liquidnet.client.admin.zhengzai.kylin.service.IOpenDataService;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+@Slf4j
+@Service
+public class OpenDataServiceImpl implements IOpenDataService {
+
+    @Value("${liquidnet.openData.host}")
+    private String openDataHost;
+
+    @Value("${liquidnet.openData.auth}")
+    private String openDataAuth;
+
+    @Override
+    public List<PerformanceSalesDto> getPerformanceSalesInfo(List<String> performanceIdList) {
+        HashMap<String, List<String>> map = new HashMap<>();
+        map.put("performanceIds", performanceIdList);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.set(HttpHeaders.AUTHORIZATION, openDataAuth);
+
+        try {
+            String postJson = HttpUtil.postJson(openDataHost + "/api/performance/sales", JsonUtils.toJson(map), headers);
+            log.info("response: {}", postJson);
+            if (StringUtil.isBlank(postJson)) {
+                return Collections.emptyList();
+            }
+            OpenDataSalesResponse openDataSalesResponse = JsonUtils.fromJson(postJson, OpenDataSalesResponse.class);
+            if (!openDataSalesResponse.isSucc()) {
+                return Collections.emptyList();
+            }
+            return openDataSalesResponse.getData();
+        } catch (Exception e) {
+            log.error("error", e);
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public PerformanceTicketSalesDto getPerformanceTicketSalesInfo(String performanceId) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.set(HttpHeaders.AUTHORIZATION, openDataAuth);
+
+        try {
+            String responseStr = HttpUtil.getByUri(openDataHost + "/api/performance/ticket/sales?performanceId=" + performanceId, headers);
+            log.info("response: {}", responseStr);
+            if (StringUtil.isBlank(responseStr)) {
+                return null;
+            }
+            OpenDataTicketSalesResponse openDataSalesResponse = JsonUtils.fromJson(responseStr, OpenDataTicketSalesResponse.class);
+            if (!openDataSalesResponse.isSucc()) {
+                return null;
+            }
+            return openDataSalesResponse.getData();
+        } catch (Exception e) {
+            log.error("error", e);
+        }
+        return null;
+    }
+}

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-dev.yml

@@ -22,5 +22,8 @@ liquidnet:
     mongodb:
         sslEnabled: false
         database: dev_ln_scene
+    openData:
+        host: http://localhost:8091
+        auth: t-gI1wT4kM4qF2bB4mJ4zQ1gM6cU6dC9uB
 
 # end-dev-这里是配置信息基本值
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-test.yml

@@ -22,5 +22,8 @@ liquidnet:
     mongodb:
         sslEnabled: false
         database: test_ln_scene
+    openData:
+        host: https://testopen.zhengzai.tv
+        auth: t-gI1wT4kM4qF2bB4mJ4zQ1gM6cU6dC9uB
 
 # end-test-这里是配置信息基本值
\ No newline at end of file

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

@@ -3,7 +3,6 @@ package com.liquidnet.service.kylin.dao;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -18,23 +17,46 @@ import java.time.LocalDateTime;
 public class PerformanceOrderStatisticalDao implements Cloneable{
     private String performancesId;
     private String ticketsId;
-    private String title;
-    private BigDecimal price;
-    private Integer type;
+    private String title;// 票种名称
+    private BigDecimal price;// 票种价格
+    private Integer type;// 票种类型
     private String useStart;
     private String useEnd;
-    private BigDecimal totalGeneral = BigDecimal.ZERO;
-    private BigDecimal saleGeneral = BigDecimal.ZERO;
+    private BigDecimal totalGeneral = BigDecimal.ZERO;// 库存数量
+    private BigDecimal saleGeneral = BigDecimal.ZERO;// 销售数量
     private BigDecimal surplusGeneral = BigDecimal.ZERO;
     private BigDecimal totalSalePrice = BigDecimal.ZERO;
     private BigDecimal totalExchange = BigDecimal.ZERO;
-    private BigDecimal totalRefundGeneral = BigDecimal.ZERO;
+    private BigDecimal totalRefundGeneral = BigDecimal.ZERO; // 退票总数量
     private BigDecimal totalRefundPrice = BigDecimal.ZERO;
     private BigDecimal totalMemberNumber = BigDecimal.ZERO;
-    private BigDecimal totalPayingNumber = BigDecimal.ZERO;
+    private BigDecimal totalPayingNumber = BigDecimal.ZERO;// 正在支付数量
     private BigDecimal totalBuyUsers = BigDecimal.ZERO;
     private BigDecimal totalVoucherCount = BigDecimal.ZERO;
 
+    // 场次ID
+    private String timeId;
+    // 场次名称
+    private String timeTitle;
+    // vip购票数量
+    private Integer vipBuyTotal = 0;
+    // 全额退票总数
+    private Integer fullRefundTicketTotal = 0;
+    // 手续费退票总数
+    private Integer handlingFeeRefundTicketTotal = 0;
+    // 退票手续费总收益
+    private BigDecimal refundFeeRevenueTotal = BigDecimal.ZERO;
+    // 票面销售金额
+    private BigDecimal audienceSalesAmountTotal = BigDecimal.ZERO;
+
+
+
+
+
+
+
+
+
     private static final PerformanceOrderStatisticalDao obj = new PerformanceOrderStatisticalDao();
     public static PerformanceOrderStatisticalDao getNew() {
         try {

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

@@ -28,6 +28,8 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
     //列表
     List<PerformanceAdminListDao> misPerformanceList(Map<String,Object> map);
 
+    List<PerformanceAdminListDao> misPerformanceListV2(Map<String,Object> map);
+
     //根据巡演查询 通过审核演出列表
     List<PerformanceTitleDao> misTitleByRoadShowIdList(String roadShowId);
 

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

@@ -376,6 +376,74 @@
             ORDER BY ${orderItem} ${orderSc}
         </if>
     </select>
+
+    <select id="misPerformanceListV2" parameterType="java.util.Map" resultMap="misPerformanceListResult">
+        SELECT
+        p.performances_id ,
+        p.sponsor,
+        p.audit_time,
+        p.sort,
+        p.title ,
+        p.type,
+        p.time_start ,
+        p.time_end ,
+        ps.sync_damai ,
+        t.time_sell,
+        t.time_stop,
+        ps.`status` ,
+        ps.audit_status ,
+        ps.field_audit_status,
+        p.reject_txt ,
+        p.created_at
+        FROM
+        kylin_performances AS p
+        LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
+        LEFT JOIN(
+        SELECT
+        ttr.performance_id ,
+        MIN(
+        DATE_SUB(
+        t.time_start ,
+        INTERVAL pay_countdown_minute MINUTE
+        )
+        ) AS 'time_sell' ,
+        MAX(t.time_end) AS 'time_stop'
+        FROM
+        kylin_ticket_status AS ts
+        LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
+        LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
+        LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
+        GROUP BY
+        ttr.performance_id
+        ) AS t ON p.performances_id = t.performance_id
+        <where>
+            <if test="title!=''">
+                AND title LIKE concat('%', #{title}, '%')
+            </if>
+            <if test="cityName!=''">
+                AND city_name LIKE concat('%', #{cityName}, '%')
+            </if>
+            <if test="status!='-2'">
+                AND ps.STATUS = #{status}
+            </if>
+            <if test="status=='-2'">
+                AND (ps.STATUS >= 3 or ps.STATUS = 1)
+            </if>
+            <if test="auditStatus!='-2'">
+                AND ps.audit_status = #{auditStatus}
+            </if>
+            <!--            <if test="auditStatus=='-2'">-->
+            <!--                AND (ps.audit_status = 0 or ps.audit_status = 1 or ps.audit_status = 2)-->
+            <!--            </if>-->
+            <if test="stopSellDay!=-2">
+                AND p.time_end BETWEEN #{stopSellTime} AND NOW()
+            </if>
+        </where>
+        <if test="orderItem!=''">
+            ORDER BY ${orderItem} ${orderSc}
+        </if>
+    </select>
+
     <!-- Mis 根据巡演查询演出列表 -->
     <select id="misTitleByRoadShowIdList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult">
         SELECT performances_id,