提交 partner列表

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/pom.xml

@@ -31,13 +31,6 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-api-feign-sequence</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceListParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class PerformanceListParam {
+    @ApiModelProperty(value = "演出名称", example = "")
+    private String title;
+    @ApiModelProperty(value = "-2全部(不包括未提交)0未发布演出列表;3审核通过;6上线;7下架;8已结束;", example = "0")
+    private int status;
+    @ApiModelProperty(value = "-2全部,-1未提交审核，0审核中，1审核通过，2审核拒绝", example = "0")
+    private int auditStatus;
+    @ApiModelProperty(value = "演出开始时间", example = "2000-01-01 12:00:00")
+    private String timeStart;
+    @ApiModelProperty(value = "演出结束时间", example = "2000-01-01 12:00:00")
+    private String timeEnd;
+    @ApiModelProperty(value = "排序类型 1创建时间倒序 2创建时间正序 3演出时间倒序 4演出时间正序", example = "0")
+    private int orderType;
+    @ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00")
+    private String stopSellTime;
+    @ApiModelProperty(value = "页数", example = "0")
+    private int page;
+    @ApiModelProperty(value = "数量", example = "20")
+    private int size;
+    @ApiModelProperty(value = "排序字段", hidden = true)
+    private String orderItem;
+    @ApiModelProperty(value = "排序方式", hidden = true)
+    private String orderSc;
+
+    public void setOrderType(int orderType) {
+        this.orderType = orderType;
+        switch (orderType) {
+            case 1: {
+                orderItem = "created_at";
+                orderSc = "desc";
+            }
+            case 2: {
+                orderItem = "created_at";
+                orderSc = "asc";
+            }
+            case 3: {
+                orderItem = "time_start";
+                orderSc = "desc";
+            }
+            case 4: {
+                orderItem = "time_start";
+                orderSc = "asc";
+            }
+
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep1Param.java

@@ -16,6 +16,9 @@ public class PerformanceStep1Param implements Serializable {
     @ApiModelProperty(value = "封面图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
     private String imgPoster;
 
+    @ApiModelProperty(value = "第三方id", example = "0")
+    private String merchantId;
+
     @ApiModelProperty(value = "演出名称", example = "测试演出")
     private String title;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep2Param.java

@@ -23,9 +23,6 @@ public class PerformanceStep2Param implements Serializable {
     @ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
     private int isSubmit;
 
-    @ApiModelProperty(value = "第三方id", example = "0")
-    private String merchantId;
-
     @ApiModelProperty(value = "场次数据",hidden = true)
     private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/BannersVo.java

 package com.liquidnet.service.kylin.dto.vo;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -17,6 +18,7 @@ import java.util.List;
  */
 
 @Data
+@ApiModel
 public class BannersVo implements Serializable {
     @ApiModelProperty(value = "Banner主键ID")
     private String bannersId;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PagerVo.java

 package com.liquidnet.service.kylin.dto.vo;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
+@ApiModel
 public class PagerVo<T> {
 
     @ApiModelProperty(value = "返回记录集合")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceVo.java

@@ -3,15 +3,16 @@ package com.liquidnet.service.kylin.dto.vo;
 import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
 import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 
+@ApiModel
 @Data
 public class PerformanceVo {
 
@@ -29,7 +30,6 @@ public class PerformanceVo {
     private String price;
     @ApiModelProperty(value = "开售时间")
     private String sellTime;
-
     @ApiModelProperty(value = "城市id")
     private String cityId;
     @ApiModelProperty(value = "场地id")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/TicketTimesVo.java

 package com.liquidnet.service.kylin.dto.vo;
 
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,6 +9,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Data
+@ApiModel
 public class TicketTimesVo {
 
     @ApiModelProperty(value = "主键")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/TicketVo.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.vo;
 import com.liquidnet.service.kylin.entity.KylinTicketRelations;
 import com.liquidnet.service.kylin.entity.KylinTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinTickets;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,6 +11,7 @@ import java.math.BigDecimal;
 import java.time.format.DateTimeFormatter;
 
 @Data
+@ApiModel
 public class TicketVo {
 
     @ApiModelProperty(value = "主键")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformancePartnerListVo.java

+package com.liquidnet.service.kylin.dto.vo.partner;
+
+import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PerformancePartnerListVo {
+
+    //演出数据
+    @ApiModelProperty(value = "主键id")
+    private String performancesId;
+    @ApiModelProperty(value = "标题")
+    private String title;
+    @ApiModelProperty(value = "开演时间")
+    private String timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "总库存")
+    private int totalGeneral;
+    @ApiModelProperty(value = "销售库存")
+    private int saleGeneral;
+    @ApiModelProperty(value = "总销售金额")
+    private int totalSalePrice;
+    @ApiModelProperty(value = "剩余库存")
+    private int surplusGeneral;
+    @ApiModelProperty(value = "演出状态")
+    private int status;
+    @ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
+    private int auditStatus;
+    @ApiModelProperty(value = "拒绝理由")
+    private String rejectTxt;
+    @ApiModelProperty(value = "创建时间")
+    private String createdAt;
+
+    @ApiModelProperty(value = "返回数据赋值",hidden = true)
+    public void setStatus0Data(PerformanceCreateParam item){
+        this.performancesId=item.getPerformancesId();
+        this.title=item.getTitle();
+        this.timeStart=item.getTimeStart();
+        this.timeEnd=item.getTimeEnd();
+        this.totalGeneral=0;
+        this.saleGeneral=0;
+        this.totalSalePrice=0;
+        this.status=0;
+        this.auditStatus=-1;
+        this.rejectTxt="";
+        this.createdAt=item.getCreatedAt();
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinPerformancesPartnerService.java

 package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
+import com.liquidnet.service.kylin.dto.param.PerformanceListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerListVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  * 演出 服务类
@@ -20,11 +28,13 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
 
     boolean createStep2(PerformanceStep2Param step1Param);
 
-    PerformanceStep1Param getStep1(String performancesId);
+    PerformanceCreateParam getStep1(String performancesId);
 
     PerformanceStep2Param getStep2(String performancesId);
 
     boolean onLinePerformance(String performancesId);
 
     boolean outLinePerformance(String performancesId);
+
+    PageInfo<PerformancePartnerListDao> getList(PerformanceListParam performanceListParam);
 }

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

+package com.liquidnet.service.kylin.dao;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PerformancePartnerListDao {
+
+    //演出数据
+    @ApiModelProperty(value = "主键id")
+    private String performancesId;
+    @ApiModelProperty(value = "标题")
+    private String title;
+    @ApiModelProperty(value = "开演时间")
+    private String timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "总库存")
+    private int totalGeneral;
+    @ApiModelProperty(value = "销售库存")
+    private int saleGeneral;
+    @ApiModelProperty(value = "总销售金额")
+    private int totalSalePrice;
+    @ApiModelProperty(value = "总销售金额")
+    private int surplusGeneral;
+    @ApiModelProperty(value = "演出状态")
+    private int status;
+    @ApiModelProperty(value = "提交审核状态 -1未提交审核，0提交审核，1审核通过，2审核拒绝")
+    private int auditStatus;
+    @ApiModelProperty(value = "拒绝理由")
+    private String rejectTxt;
+    @ApiModelProperty(value = "创建时间")
+    private String createdAt;
+}

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

 package com.liquidnet.service.kylin.mapper;
 
+import com.liquidnet.service.kylin.dao.FieldMisListDao;
+import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 演出 Mapper 接口
@@ -13,4 +18,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
 
+    //列表
+    List<PerformancePartnerListDao> partnerPerformanceList(Map<String,Object> map);
+
 }

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

@@ -2,4 +2,90 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.kylin.mapper.KylinPerformancesMapper">
 
+    <resultMap id="partnerPerformanceListResult" type="com.liquidnet.service.kylin.dao.PerformancePartnerListDao">
+        <result column="performances_id" property="performancesId"/>
+        <result column="title" property="title"/>
+        <result column="time_start" property="timeStart"/>
+        <result column="time_end" property="timeEnd"/>
+        <result column="total_general" property="totalGeneral"/>
+        <result column="sale_general" property="saleGeneral"/>
+        <result column="total_sale_price" property="totalSalePrice"/>
+        <result column="surplus_general" property="surplusGeneral"/>
+        <result column="status" property="status"/>
+        <result column="audit_status" property="auditStatus"/>
+        <result column="reject_txt" property="rejectTxt"/>
+        <result column="created_at" property="createdAt"/>
+    </resultMap>
+
+    <!-- 列表封装 -->
+    <sql id="partner_performance_list_Column">
+
+    </sql>
+
+    <!-- 第三方演出列表 (不包含退票信息) -->
+    <select id="partnerPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
+        SELECT
+        p.performances_id ,
+        p.title ,
+        p.time_start ,
+        p.time_end ,
+        t.total_general ,
+        IFNULL(ot.sale_general , 0) AS 'sale_general' ,
+        IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' ,
+        IFNULL(
+        (
+        t.total_general - ot.sale_general
+        ) ,
+        0
+        ) AS 'surplus_general' ,
+        ps.`status` ,
+        ps.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 kylin_performance_relations AS pr ON p.performances_id = pr.performance_id
+        LEFT JOIN(
+        SELECT
+        ttr.performance_id ,
+        ts.ticket_id ,
+        sum(ts.total_general) AS 'total_general'
+        FROM
+        kylin_ticket_status AS ts
+        LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
+        LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
+        ) AS t ON p.performances_id = t.performance_id
+        LEFT JOIN(
+        SELECT
+        sum(ot.number) AS 'sale_general' ,
+        sum(ot.price_actual) AS 'total_sale_price' ,
+        ote.performance_id AS 'performance_id'
+        FROM
+        kylin_order_tickets AS ot
+        LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
+        LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
+        WHERE
+        ots.`status` = 0
+        OR ots.`status` = 1
+        ) AS ot ON ot.performance_id = p.performances_id
+        <where>
+            <if test="title!=''">
+                AND title LIKE LIKE concat('%', #{title}, '%')
+            </if>
+            <if test="status!='-2'">
+                AND ps.STATUS = #{status}
+            </if>
+            <if test="auditStatus!='-2'">
+                AND ps.audit_status = #{auditStatus}
+            </if>
+            <if test="timeStart!=''">
+                AND p.time_start BETWEEN #{timeStart} AND #{timeEnd}
+            </if>
+            <if test="stopSellTime!=''">
+                AND p.time_end LIKE concat('%', #{stopSellTime}, '%')
+            </if>
+        </where>
+        ORDER BY #{orderItem} #{orderSc}
+    </select>
 </mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -18,14 +18,6 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <!-- api -->
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-api-feign-sequence</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
         <!-- common -->
         <dependency>
             <groupId>com.liquidnet</groupId>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java

 package com.liquidnet.service.kylin.controller.partner;
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
+import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
+import com.liquidnet.service.kylin.dto.param.PerformanceListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerListVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -10,6 +15,8 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+
 @Api(tags = "第三方-演出")
 @RestController
 @RequestMapping("partner/performance")
@@ -18,6 +25,19 @@ public class PerformancePartnerController {
     @Autowired
     private KylinPerformancesPartnerServiceImpl performancesPartnerService;
 
+    @PostMapping(value = "list")
+    @ApiOperation(value = "演出列表")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PageInfo<PerformancePartnerListDao>> getList(@RequestBody PerformanceListParam performanceListParam) {
+        PageInfo<PerformancePartnerListDao> result = null;
+        result = performancesPartnerService.getList(performanceListParam);
+        if (null == result) {
+            return ResponseDto.failure("列表获取失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
     @PostMapping(value = "step1")
     @ApiOperation(value = "创建演出第一步")
     @ApiResponse(code = 200, message = "接口返回对象参数")
@@ -45,8 +65,8 @@ public class PerformancePartnerController {
     @GetMapping(value = "step1")
     @ApiOperation(value = "获取演出第一步数据")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PerformanceStep1Param> createStep1(@RequestParam("performancesId") String performancesId) {
-        PerformanceStep1Param result = performancesPartnerService.getStep1(performancesId);
+    public ResponseDto<PerformanceCreateParam> createStep1(@RequestParam("performancesId") String performancesId) {
+        PerformanceCreateParam result = performancesPartnerService.getStep1(performancesId);
         if (result==null) {
             return ResponseDto.failure("获取数据失败");
         } else {