提交 创建流程

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -4,7 +4,9 @@ public class KylinRedisConst {
     public static final String FIELDS = "kylin:fields:id";
 
     public static final String PERFORMANCES = "kylin:performances:id";
-    public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:id";
+    public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:";
+    public static final String SURPLUS_GENERAL = "surplusGeneral";
+    public static final String SURPLUS_EXCHANGE = "surplusExchange";
 
     public static final String TICKET = "kylin:ticket:id";
 

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

+package com.liquidnet.service.kylin.dto.param;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PerformanceParam implements Serializable {
+
+    @ApiModelProperty(value = "演出id", example = "")
+    @JsonIgnore
+    private String performancesId;
+
+    @ApiModelProperty(value = "封面图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")
+    private String imgPoster;
+
+    @ApiModelProperty(value = "演出名称", example = "测试演出")
+    private String title;
+
+    @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧", example = "3")
+    private int type;
+
+    @ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
+    private String timeStart;
+
+    @ApiModelProperty(value = "演出结束时间", example = "2021-05-04 12:00:00")
+    private String timeEnd;
+
+    @ApiModelProperty(value = "场地id", example = "1")
+    private String fieldId;
+
+    @ApiModelProperty(value = "场地id", example = "1")
+    private String fieldName;
+
+    @ApiModelProperty(value = "演出公告", example = "这是演出公告")
+    private String notice;
+
+    @ApiModelProperty(value = "主办方id", example = "1")
+    private String sponsorId;
+
+    @ApiModelProperty(value = "主办方类型", example = "1")
+    private String sponsorType;
+
+    @ApiModelProperty(value = "主办方名称", example = "主办方名称")
+    private String sponsor;
+
+    @ApiModelProperty(value = "联系人", example = "联系人")
+    private String contacts;
+
+    @ApiModelProperty(value = "联系方式", example = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "演出详情", example = "<p>演出详情</p>")
+    private String details;
+
+    @ApiModelProperty(value = "演出批文地址", example = "这是一个演出批文地址")
+    private String approvalUrl;
+
+    @ApiModelProperty(value = "待支付时间", example = "5")
+    private int payCountdownMinute;
+
+    @ApiModelProperty(value = "购票须知", example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
+    private String noticeImage;
+
+    @ApiModelProperty(value = "是否实名", example = "0")
+    private int isTrueName;
+
+    @ApiModelProperty(value = "限购数量 0为不限购", example = "0")
+    private int limitCount;
+
+    @ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
+    private int isSubmit;
+
+    @ApiModelProperty(value = "状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "0")
+    private int status;
+
+    @ApiModelProperty(value = "第三方id", example = "0")
+    private String merchantId;
+
+    @ApiModelProperty(value = "演出简介", example = "0")
+    private String describes;
+
+    @ApiModelProperty(value = "是否售卖", example = "0")
+    private int statusSell;
+
+    @ApiModelProperty(value = "巡演id", example = "0",hidden = true)
+    private String roadShowId;
+
+    @ApiModelProperty(value = "搭售id", example = "0",hidden = true)
+    private String projectId;
+
+    @ApiModelProperty(value = "", example = "")
+    private String createdAt;
+
+    @ApiModelProperty(value = "", example = "")
+    private String updatedAt;
+
+    @ApiModelProperty(value = "是否保存", example = "")
+    private int isCreateSave;
+}

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

@@ -10,7 +10,6 @@ import java.io.Serializable;
 public class PerformanceStep1Param implements Serializable {
 
     @ApiModelProperty(value = "演出id", example = "")
-    @JsonIgnore
     private String performancesId;
 
     @ApiModelProperty(value = "封面图", example = "https://img.zhengzai.tv/partner/2019/05/14/5cda2d0520177.png")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformanceCreatePartnerVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformanceMisVo.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class PerformanceCreatePartnerVo {
+public class PerformanceMisVo {
 
     //演出数据
     @ApiModelProperty(value = "主键id")

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 com.liquidnet.service.kylin.dto.param.PerformanceParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class PerformancePartnerListVo {
 
@@ -36,7 +34,7 @@ public class PerformancePartnerListVo {
     private String createdAt;
 
     @ApiModelProperty(value = "返回数据赋值",hidden = true)
-    public void setStatus0Data(PerformanceCreateParam item){
+    public void setStatus0Data(PerformanceParam item){
         this.performancesId=item.getPerformancesId();
         this.title=item.getTitle();
         this.timeStart=item.getTimeStart();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceCreateParam.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformancePartnerVo.java

-package com.liquidnet.service.kylin.dto.param;
+package com.liquidnet.service.kylin.dto.vo.partner;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
-public class PerformanceCreateParam implements Serializable {
+public class PerformancePartnerVo implements Serializable {
 
     @ApiModelProperty(value = "演出id", example = "")
     @JsonIgnore
@@ -94,4 +93,7 @@ public class PerformanceCreateParam implements Serializable {
 
     @ApiModelProperty(value = "", example = "")
     private String createdAt;
+
+    @ApiModelProperty(value = "是否保存", example = "")
+    private int isCreateSave;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketCreatePartnerVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketPartnerVo.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * 修改场地全部显示数据参数
  */
 @Data
-public class TicketCreatePartnerVo implements Serializable {
+public class TicketPartnerVo implements Serializable {
     @ApiModelProperty(value = "主键")
     private String ticketsId;
 
@@ -62,7 +62,7 @@ public class TicketCreatePartnerVo implements Serializable {
     private String describes;
 
     @ApiModelProperty(value = "票状态 -1删除;0未提交;1审核中;2审核中（自动在售）;3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束", example = "0")
-    private int status;
+    private Integer status;
 
     @ApiModelProperty(value = "是否展示二维码 0否 1是", example = "0")
     private int isShowCode;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesCreatePartnerVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesPartnerVo.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 //返回
 
 @Data
-public class TicketTimesCreatePartnerVo implements Serializable {
+public class TicketTimesPartnerVo implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String ticketTimesId;
 
@@ -24,8 +24,8 @@ public class TicketTimesCreatePartnerVo implements Serializable {
     @ApiModelProperty(value = "场次适用结束时间")
     private String useEnd;
 
-    @ApiModelProperty(value = "状态 0不可见 1可见")
-    private int status;
+    @ApiModelProperty(value = "状态 -1新增 0不可见 1可见")
+    private Integer status;
 
     @ApiModelProperty(value = "状态 1单日票 2通票")
     private int type;

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

@@ -39,5 +39,5 @@ public class TicketTimesTicketCreatePartnerVo implements Serializable {
 
     //票
     @ApiModelProperty(value = "票数据")
-    private List<TicketCreatePartnerVo> ticket;
+    private List<TicketPartnerVo> ticket;
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -3,11 +3,9 @@ package com.liquidnet.service.kylin.service.admin;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
-import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
-import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
-import com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformanceMisVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 import java.util.List;
@@ -22,7 +20,11 @@ import java.util.List;
  */
 public interface IKylinPerformancesAdminService extends IService<KylinPerformances> {
 
-    PerformanceCreatePartnerVo performanceDetails(String performancesId);
+    PerformanceMisVo performanceDetails(String performancesId);
+
+    PerformanceMisVo performanceCreateDetails(String performancesId);
+
+    PerformanceMisVo performanceUpdateDetails(String performancesId);
 
     boolean performanceAudit(String performancesId,int status ,String rejectTxt);
 

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

@@ -3,10 +3,8 @@ 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.PerformancePartnerListParam;
-import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
-import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.param.*;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 /**
@@ -19,14 +17,76 @@ import com.liquidnet.service.kylin.entity.KylinPerformances;
  */
 public interface IKylinPerformancesPartnerService extends IService<KylinPerformances> {
 
+
+    /**
+     * 演出第一步
+     * @param step1Param
+     * @return
+     */
+    String step1(PerformanceStep1Param step1Param);
+    /**
+     * 创建演出第一步
+     * @param step1Param
+     * @return
+     */
     String createStep1(PerformanceStep1Param step1Param);
 
-    boolean createStep2(PerformanceStep2Param step1Param);
+    /**
+     * 修改演出第一步
+     * @param step1Param
+     * @return
+     */
+    String updateStep1(PerformanceStep1Param step1Param);
+
+    /**
+     * 获取演出第一步数据
+     * @param performancesId
+     * @return
+     */
+    PerformancePartnerVo getStep1(String performancesId);
+
+    /**
+     * 获取创建演出第一步数据
+     * @param performancesId
+     * @return
+     */
+    PerformanceParam getCreateStep1(String performancesId);
+
+    /**
+     * 获取修改演出第一步数据
+     * @param performancesId
+     * @return
+     */
+    PerformanceParam getUpdateStep1(String performancesId);
+
 
-    PerformanceCreateParam getStep1(String performancesId);
+    /**
+     * 演出第二步
+     * @param step2Param
+     * @return
+     */
+    boolean step2(PerformanceStep2Param step2Param);
+
+    /**
+     * 演出第二步创建
+     * @param step2Param
+     * @return
+     */
+    boolean createStep2(PerformanceStep2Param step2Param);
+
+    /**
+     * 演出第二步修改
+     * @param step2Param
+     * @return
+     */
+    boolean updateStep2(PerformanceStep2Param step2Param);
 
     PerformanceStep2Param getStep2(String performancesId);
 
+    PerformanceStep2Param getCreateStep2(String performancesId);
+
+    PerformanceStep2Param getUpdateStep2(String performancesId);
+
     boolean onLinePerformance(String performancesId);
 
     boolean outLinePerformance(String performancesId);

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

@@ -2,7 +2,7 @@ package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 
 import java.util.List;
@@ -17,13 +17,38 @@ import java.util.List;
  */
 public interface IKylinTicketTimesPartnerService extends IService<KylinTicketTimes> {
 
-    TicketTimesCreatePartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam);
 
+    /**
+     * 创建场次汇总
+     * @param createTicketTimesParam
+     * @return
+     */
+    TicketTimesPartnerVo createTimesSummary(CreateTicketTimesParam createTicketTimesParam);
+
+    /**
+     * 未通过审核创建场次
+     * @param createTicketTimesParam
+     * @return
+     */
+    TicketTimesPartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam);
+
+    /**
+     * 通过审核后创建场次
+     * @param createTicketTimesParam
+     * @return
+     */
+    TicketTimesPartnerVo addNewTimes(CreateTicketTimesParam createTicketTimesParam);
+
+    /**
+     * 删除 场次(只有未审核通过可删除)
+     * @param ticketTimesId
+     * @return
+     */
     Boolean deleteTimes(String ticketTimesId);
 
-    TicketTimesCreatePartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam);
+    TicketTimesPartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam);
 
-    List<TicketTimesCreatePartnerVo> getTimesMongoList(String performancesId);
+    List<TicketTimesPartnerVo> getTimesMongoList(String performancesId);
 
-    TicketTimesCreatePartnerVo getTimesMongo(String timesId);
+    TicketTimesPartnerVo getTimesMongo(String timesId);
 }

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

@@ -2,7 +2,7 @@ package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
 import com.liquidnet.service.kylin.entity.KylinTickets;
 
 import java.util.List;
@@ -17,17 +17,41 @@ import java.util.List;
  */
 public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
 
-    TicketCreatePartnerVo createTicket(TicketCreateParam ticketCreateParam);
-
-    TicketCreatePartnerVo updateTicket(TicketCreateParam ticketCreateParam);
-
+    /**
+     * 创建票汇总
+     * @param ticketCreateParam
+     * @return
+     */
+    TicketPartnerVo createTicketSummary(TicketCreateParam ticketCreateParam);
+
+    /**
+     * 未通过审核创建票
+     * @param ticketCreateParam
+     * @return
+     */
+    TicketPartnerVo createTicket(TicketCreateParam ticketCreateParam);
+
+    /**
+     * 通过审核后创建场次
+     * @param ticketCreateParam
+     * @return
+     */
+    TicketPartnerVo addNewTicket(TicketCreateParam ticketCreateParam);
+
+    TicketPartnerVo updateTicket(TicketCreateParam ticketCreateParam);
+
+    /**
+     * 删除 票(只有未审核通过可删除)
+     * @param ticketsId
+     * @return
+     */
     boolean deleteTicket(String ticketsId);
 
-    TicketCreatePartnerVo copyTicket(String ticketsId);
+    TicketPartnerVo copyTicket(String ticketsId);
 
     boolean submitTicketByTimes(String timesId);
 
-    List<TicketCreatePartnerVo> getTicketMongoList(String timesId);
+    List<TicketPartnerVo> getTicketMongoList(String timesId);
 
-    TicketCreatePartnerVo getTicketsMongo(String ticketsId);
+    TicketPartnerVo getTicketsMongo(String ticketsId);
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -279,7 +279,7 @@ CREATE TABLE `kylin_ticket_status`
     `is_student`        tinyint      NOT NULL DEFAULT 0 COMMENT '是否学生票 0否 1是',
     `is_electronic`     tinyint      NOT NULL DEFAULT 0 COMMENT '是否电子票 0否 1是',
     `is_express`        tinyint      NOT NULL DEFAULT 0 COMMENT '是否快递票 0否 1是',
-    `status`            tinyint      NOT NULL DEFAULT 0 COMMENT '票状态 -1删除;0未提交;1审核中;2审核中（自动在售）;3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束',
+    `status`            tinyint      NOT NULL DEFAULT 0 COMMENT '票状态 -2新建 -1删除;0未提交;1审核中;2审核中（自动在售）;3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束',
     `counts`            int(11)      NOT NULL DEFAULT 1 COMMENT '可验证次数',
     `status_exchange`   tinyint      NOT NULL DEFAULT 0 COMMENT '兑换状态 6可兑换 7不可兑换',
     `is_show_code`      tinyint      NOT NULL DEFAULT 0 COMMENT '是否显示二维码 0否 1是',

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinPerformancesAdminController.java

@@ -4,11 +4,9 @@ package com.liquidnet.service.kylin.controller.admin;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
-import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
-import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
-import com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformanceMisVo;
 import com.liquidnet.service.kylin.service.impl.admin.KylinPerformancesAdminServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -49,9 +47,9 @@ public class KylinPerformancesAdminController {
 
     @GetMapping(value = "details")
     @ApiOperation(value = "获取演出详情")
-    @ApiResponse(response = PerformanceCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<PerformanceCreatePartnerVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
-        PerformanceCreatePartnerVo result = null;
+    @ApiResponse(response = PerformanceMisVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<PerformanceMisVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
+        PerformanceMisVo result = null;
         result = performancesAdminService.performanceDetails(performancesId);
         if (null != result) {
             return ResponseDto.success(result);

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

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.controller.partner;
 
 import com.liquidnet.service.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinTicketTimesPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,10 +29,10 @@ public class KylinTicketTimesPartnerController {
 
     @PostMapping(value = "")
     @ApiOperation(value = "创建场次")
-    @ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesCreatePartnerVo> createTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
-        TicketTimesCreatePartnerVo result = null;
-        result = ticketTimesPartnerService.createTimes(createTicketTimesParam);
+    @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketTimesPartnerVo> createTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
+        TicketTimesPartnerVo result = null;
+        result = ticketTimesPartnerService.createTimesSummary(createTicketTimesParam);
         if (null == result) {
             return ResponseDto.failure("创建失败");
         } else {
@@ -42,7 +42,7 @@ public class KylinTicketTimesPartnerController {
 
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除场次")
-    @ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
+    @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
     public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") String ticketTimesId) {
         boolean result = ticketTimesPartnerService.deleteTimes(ticketTimesId);
         if (result) {
@@ -54,9 +54,9 @@ public class KylinTicketTimesPartnerController {
 
     @PutMapping(value = "")
     @ApiOperation(value = "修改场次")
-    @ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesCreatePartnerVo> deleteTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
-        TicketTimesCreatePartnerVo result = null;
+    @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketTimesPartnerVo> deleteTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
+        TicketTimesPartnerVo result = null;
         result = ticketTimesPartnerService.changeTimes(createTicketTimesParam);
         if (null == result) {
             return ResponseDto.failure("修改失败");
@@ -67,9 +67,9 @@ public class KylinTicketTimesPartnerController {
 
     @GetMapping(value = "/details")
     @ApiOperation(value = "获取场次详情")
-    @ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesCreatePartnerVo> getTimesMongo(@RequestParam("ticketTimesId") String ticketTimesId) {
-        TicketTimesCreatePartnerVo result = null;
+    @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketTimesPartnerVo> getTimesMongo(@RequestParam("ticketTimesId") String ticketTimesId) {
+        TicketTimesPartnerVo result = null;
         result = ticketTimesPartnerService.getTimesMongo(ticketTimesId);
         if (null == result) {
             return ResponseDto.failure("查询场次信息失败");

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

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.controller.partner;
 
 import com.liquidnet.service.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,10 +29,10 @@ public class KylinTicketsPartnerController {
 
     @PostMapping(value = "")
     @ApiOperation(value = "创建票务")
-    @ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketCreatePartnerVo> createTicket(@RequestBody TicketCreateParam ticketCreateParam) {
-        TicketCreatePartnerVo result = null;
-        result = ticketsPartnerService.createTicket(ticketCreateParam);
+    @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketPartnerVo> createTicket(@RequestBody TicketCreateParam ticketCreateParam) {
+        TicketPartnerVo result = null;
+        result = ticketsPartnerService.createTicketSummary(ticketCreateParam);
         if (null == result) {
             return ResponseDto.failure("创建票务失败");
         } else {
@@ -42,9 +42,9 @@ public class KylinTicketsPartnerController {
 
     @PutMapping(value = "")
     @ApiOperation(value = "修改票务")
-    @ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketCreatePartnerVo> updateTicket(@RequestBody TicketCreateParam ticketCreateParam) {
-        TicketCreatePartnerVo result = null;
+    @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketPartnerVo> updateTicket(@RequestBody TicketCreateParam ticketCreateParam) {
+        TicketPartnerVo result = null;
         result = ticketsPartnerService.updateTicket(ticketCreateParam);
         if (null == result) {
             return ResponseDto.failure("修改票务失败");
@@ -67,9 +67,9 @@ public class KylinTicketsPartnerController {
 
     @PostMapping(value = "/copy")
     @ApiOperation(value = "复制票务")
-    @ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketCreatePartnerVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
-        TicketCreatePartnerVo result = null;
+    @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketPartnerVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
+        TicketPartnerVo result = null;
         result = ticketsPartnerService.copyTicket(ticketsId);
         if (null == result) {
             return ResponseDto.failure("复制票务失败");
@@ -80,9 +80,9 @@ public class KylinTicketsPartnerController {
 
     @GetMapping(value = "/details")
     @ApiOperation(value = "获取票务详情")
-    @ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketCreatePartnerVo> getTicketsMongo(@RequestParam("ticketsId") String ticketsId) {
-        TicketCreatePartnerVo result = null;
+    @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketPartnerVo> getTicketsMongo(@RequestParam("ticketsId") String ticketsId) {
+        TicketPartnerVo result = null;
         result = ticketsPartnerService.getTicketsMongo(ticketsId);
         if (null == result) {
             return ResponseDto.failure("查询票务信息失败");

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

@@ -3,10 +3,8 @@ 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.PerformancePartnerListParam;
-import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
-import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.param.*;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,23 +33,36 @@ public class PerformancePartnerController {
         }
     }
 
+    @GetMapping(value = "step1")
+    @ApiOperation(value = "获取演出第一步数据")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PerformancePartnerVo> getStep1(@RequestParam("performancesId") String performancesId) {
+        PerformancePartnerVo result = performancesPartnerService.getStep1(performancesId);
+        if (result == null) {
+            return ResponseDto.failure("获取数据失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
     @PostMapping(value = "step1")
-    @ApiOperation(value = "创建演出第一步")
+    @ApiOperation(value = "操作演出第一步")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> createStep1(@RequestBody PerformanceStep1Param performanceStep1Param) {
-        String result = performancesPartnerService.createStep1(performanceStep1Param);
+    public ResponseDto<String> Step1(@RequestBody PerformanceStep1Param performanceStep1Param) {
+        String result = performancesPartnerService.step1(performanceStep1Param);
         if (result.isEmpty()) {
-            return ResponseDto.failure("创建失败");
+            return ResponseDto.failure("操作失败");
         } else {
             return ResponseDto.success(result);
         }
     }
 
+
     @PostMapping(value = "step2")
-    @ApiOperation(value = "创建演出第二步")
+    @ApiOperation(value = "操作演出第二步")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> createStep2(@RequestBody PerformanceStep2Param performanceStep2Param) {
-        boolean result = performancesPartnerService.createStep2(performanceStep2Param);
+    public ResponseDto<String> step2(@RequestBody PerformanceStep2Param performanceStep2Param) {
+        boolean result = performancesPartnerService.step2(performanceStep2Param);
         if (!result) {
             return ResponseDto.failure("提交失败");
         } else {
@@ -59,22 +70,10 @@ public class PerformancePartnerController {
         }
     }
 
-    @GetMapping(value = "step1")
-    @ApiOperation(value = "获取演出第一步数据")
-    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PerformanceCreateParam> createStep1(@RequestParam("performancesId") String performancesId) {
-        PerformanceCreateParam result = performancesPartnerService.getStep1(performancesId);
-        if (result==null) {
-            return ResponseDto.failure("获取数据失败");
-        } else {
-            return ResponseDto.success(result);
-        }
-    }
-
     @GetMapping(value = "step2")
     @ApiOperation(value = "获取演出第二步数据")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PerformanceStep2Param> createStep2(@RequestParam("performancesId") String performancesId) {
+    public ResponseDto<PerformanceStep2Param> getStep2(@RequestParam("performancesId") String performancesId) {
         PerformanceStep2Param result = performancesPartnerService.getStep2(performancesId);
         if (result == null) {
             return ResponseDto.failure("获取数据失败");