Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

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

@@ -4,7 +4,10 @@ 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_RECOMMEND = "kylin:performances:recommend";
+    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/CreateRoadShowParam.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -12,6 +13,7 @@ public class CreateRoadShowParam implements Serializable {
     @ApiModelProperty(value = "巡演主键", example = "")
     private String roadShowsId;
     @ApiModelProperty(value = "标题", example = "")
+    @NotNull(message = "不能为空")
     private String title;
 //    @ApiModelProperty(value = "场地主键", example = "测试场地")
 //    private String imgPoster;

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -14,6 +15,7 @@ public class CreateTicketTimesParam implements Serializable {
     private String ticketTimesId;
 
     @ApiModelProperty(value = "演出Id", example = "1")
+    @NotNull(message = "不能为空")
     private String PerformancesId;
 
     @ApiModelProperty(value = "场次标题", example = "测试标题")
@@ -21,12 +23,15 @@ public class CreateTicketTimesParam implements Serializable {
     private String title;
 
     @ApiModelProperty(value = "场次适用开始时间", example = "2020-12-01T12:00:00")
+    @NotNull(message = "不能为空")
     private LocalDateTime useStart;
 
     @ApiModelProperty(value = "场次适用结束时间", example = "2020-12-01T12:00:00")
+    @NotNull(message = "不能为空")
     private LocalDateTime useEnd;
 
     @ApiModelProperty(value = "类型 1单日票 2通票", example = "1")
+    @NotNull(message = "不能为空")
     private int type;
 
     @ApiModelProperty(value = "", example = "")

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

@@ -3,21 +3,27 @@ package com.liquidnet.service.kylin.dto.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @Data
 public class PerformanceAdminListParam {
     @ApiModelProperty(value = "演出名称", example = "")
     private String title;
     @ApiModelProperty(value = "-2全部状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "-2")
+    @NotNull(message = "不能为空")
     private int status;
     @ApiModelProperty(value = "城市名称", example = "")
     private String cityName;
     @ApiModelProperty(value = "-2全部,0审核中，2审核拒绝", example = "0")
+    @NotNull(message = "不能为空")
     private int auditStatus;
     @ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00")
     private String stopSellTime;
     @ApiModelProperty(value = "页数", example = "0")
+    @NotNull(message = "不能为空")
     private int page;
     @ApiModelProperty(value = "数量", example = "20")
+    @NotNull(message = "不能为空")
     private int size;
     @ApiModelProperty(value = "排序字段", hidden = true)
     private String orderItem;

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/PerformancePartnerListParam.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 @Data
@@ -10,20 +11,25 @@ public class PerformancePartnerListParam {
     @ApiModelProperty(value = "演出名称", example = "")
     private String title;
     @ApiModelProperty(value = "-2全部(不包括未提交)0未发布演出列表;3审核通过;6上线;7下架;8已结束;", example = "0")
+    @NotNull(message = "不能为空")
     private int status;
     @ApiModelProperty(value = "-2全部,-1未提交审核，0审核中，1审核通过，2审核拒绝", example = "0")
+    @NotNull(message = "不能为空")
     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")
+    @NotNull(message = "不能为空")
     private int orderType;
     @ApiModelProperty(value = "停售时间", example = "2000-01-01 12:00:00")
     private String stopSellTime;
     @ApiModelProperty(value = "页数", example = "0")
+    @NotNull(message = "不能为空")
     private int page;
     @ApiModelProperty(value = "数量", example = "20")
+    @NotNull(message = "不能为空")
     private int size;
     @ApiModelProperty(value = "排序字段", hidden = true)
     private String orderItem;

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

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class PerformanceRecommendAdminParam {
+
+    @ApiModelProperty(value = "演出id")
+    private String performanceId;
+    @ApiModelProperty(value = "推荐位")
+    private int isRecommend;
+}

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

@@ -4,34 +4,40 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data
 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")
+    @NotNull(message = "不能为空")
     private String imgPoster;
 
     @ApiModelProperty(value = "第三方id", example = "0")
     private String merchantId;
 
     @ApiModelProperty(value = "演出名称", example = "测试演出")
+    @NotNull(message = "不能为空")
     private String title;
 
-    @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧", example = "3")
+    @ApiModelProperty(value = "1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演", example = "3")
+    @NotNull(message = "不能为空")
     private int type;
 
     @ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
+    @NotNull(message = "不能为空")
     private String timeStart;
 
     @ApiModelProperty(value = "演出结束时间", example = "2021-05-04 12:00:00")
+    @NotNull(message = "不能为空")
     private String timeEnd;
 
     @ApiModelProperty(value = "场地id", example = "1")
+    @NotNull(message = "不能为空")
     private String fieldId;
 
     @ApiModelProperty(value = "场地名称", example = "")
@@ -41,6 +47,7 @@ public class PerformanceStep1Param implements Serializable {
     private String notice;
 
     @ApiModelProperty(value = "主办方id", example = "1")
+    @NotNull(message = "不能为空")
     private String sponsorId;
 
     @ApiModelProperty(value = "主办方类型", example = "1")
@@ -50,21 +57,27 @@ public class PerformanceStep1Param implements Serializable {
     private String sponsor;
 
     @ApiModelProperty(value = "联系人", example = "联系人")
+    @NotNull(message = "不能为空")
     private String contacts;
 
     @ApiModelProperty(value = "联系方式", example = "手机号")
+    @NotNull(message = "不能为空")
     private String mobile;
 
     @ApiModelProperty(value = "演出详情", example = "<p>演出详情</p>")
+    @NotNull(message = "不能为空")
     private String details;
 
     @ApiModelProperty(value = "演出批文地址", example = "这是一个演出批文地址")
+    @NotNull(message = "不能为空")
     private String approvalUrl;
 
     @ApiModelProperty(value = "待支付时间", example = "5")
+    @NotNull(message = "不能为空")
     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}]")
+    @NotNull(message = "不能为空")
     private String noticeImage;
 
     @ApiModelProperty(value = "演出简介", example = "")

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

@@ -5,6 +5,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartner
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
@@ -12,15 +13,19 @@ import java.util.List;
 public class PerformanceStep2Param implements Serializable {
 
     @ApiModelProperty(value = "演出id", example = "")
+    @NotNull(message = "不能为空")
     private String performancesId;
 
     @ApiModelProperty(value = "是否实名", example = "0")
+    @NotNull(message = "不能为空")
     private int isTrueName;
 
     @ApiModelProperty(value = "限购数量 0为不限购", example = "0")
+    @NotNull(message = "不能为空")
     private int limitCount;
 
     @ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
+    @NotNull(message = "不能为空")
     private int isSubmit;
 
     @ApiModelProperty(value = "场次数据",hidden = true)

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -21,42 +22,53 @@ public class TicketCreateParam implements Serializable {
     private String ticketsId;
 
     @ApiModelProperty(value = "场次Id")
+    @NotNull(message = "不能为空")
     private String timesId;
 
     @ApiModelProperty(value = "票种名称", example = "测试票")
+    @NotNull(message = "不能为空")
     private String title;
 
 //    @ApiModelProperty(value = "类型", example = "2")
 //    private int type;
 
     @ApiModelProperty(value = "是否学生票 0否 1是", example = "0")
+    @NotNull(message = "不能为空")
     private int isStudent;
 
     @ApiModelProperty(value = "是否电子票", example = "0")
+    @NotNull(message = "不能为空")
     private int isElectronic;
 
     @ApiModelProperty(value = "是否快递票", example = "0")
+    @NotNull(message = "不能为空")
     private int isExpress;
 
     @ApiModelProperty(value = "价格", example = "100.00")
+    @NotNull(message = "不能为空")
     private BigDecimal price;
 
     @ApiModelProperty(value = "快递票截止日期", example = "2020-12-01T12:00:00")
     private LocalDateTime timeEndExpress;
 
     @ApiModelProperty(value = "总库存", example = "100")
+    @NotNull(message = "不能为空")
     private int totalGeneral;
 
     @ApiModelProperty(value = "总兑换库存", example = "100")
+    @NotNull(message = "不能为空")
     private int totalExchange;
 
     @ApiModelProperty(value = "限购数量", example = "0")
+    @NotNull(message = "不能为空")
     private int limitCount;
 
     @ApiModelProperty(value = "票种开售时间", example = "2020-12-01T12:00:00")
+    @NotNull(message = "不能为空")
     private LocalDateTime timeStart;
 
     @ApiModelProperty(value = "票种结售时间", example = "2020-12-01T14:00:00")
+    @NotNull(message = "不能为空")
     private LocalDateTime timeEnd;
 
     @ApiModelProperty(value = "票种说明", example = "这是票种说明")
@@ -69,6 +81,7 @@ public class TicketCreateParam implements Serializable {
     private LocalDateTime qrCodeShowTime;
 
     @ApiModelProperty(value = "是否开启缺票登记", example = "1")
+    @NotNull(message = "不能为空")
     private int isLackRegister;
 
     @ApiModelProperty(value = "", hidden = true)

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

@@ -20,6 +20,8 @@ public class PerformanceVo {
     private String performancesId;
     @ApiModelProperty(value = "演出名称")
     private String title;
+    @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
+    private int type;
     @ApiModelProperty(value = "演出开始时间")
     private String timeStart;
     @ApiModelProperty(value = "演出结束时间")
@@ -42,7 +44,7 @@ public class PerformanceVo {
     private String roadShowId;
 
 //@ApiModelProperty(value = "巡演相关")
-//    private String roadShow;
+//    private String roadShowId;
     // OSS
 //    @ApiModelProperty(value = "演出详情")
 //    private String details;
@@ -50,6 +52,8 @@ public class PerformanceVo {
 //    @ApiModelProperty(value = "购票须知")
 //    private String noticeImage;
 
+    @ApiModelProperty(value = "推荐顺序 0为不推荐")
+    private int isRecommend;
     @ApiModelProperty(value = "状态")
     private int appStatus;
     @ApiModelProperty(value = "是否可买")
@@ -69,6 +73,7 @@ public class PerformanceVo {
         this.title = performance.getTitle();
         this.timeStart = performance.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         this.timeEnd = performance.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        this.type = performance.getType();
     }
 
     public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime) {
@@ -86,14 +91,15 @@ public class PerformanceVo {
 
     public void setPerformanceStatus(KylinPerformanceStatus performanceStatus) {
         this.statusSell = performanceStatus.getStatusSell();
+        this.isRecommend = performanceStatus.getIsRecommend();
     }
 
     //TODO 巡演 搭售 场地
     public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
-        this.fieldId = "";
+        this.fieldId = performanceRelations.getFieldId();
         this.fieldName = "";
         this.cityId = "";
-        this.projectId = "";
-        this.roadShowId = "";
+        this.projectId = performanceRelations.getProjectId();
+        this.roadShowId = performanceRelations.getRoadShowId();
     }
 }

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

@@ -17,6 +17,8 @@ public class PerformanceIgnoreVo {
     private String performancesId;
     @ApiModelProperty(value = "演出名称")
     private String title;
+    @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
+    private int type;
     @ApiModelProperty(value = "演出开始时间")
     private String timeStart;
     @ApiModelProperty(value = "演出结束时间")

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")
@@ -111,6 +111,12 @@ public class PerformanceCreatePartnerVo {
     @ApiModelProperty(value = "第三方id")
     private String merchantId;
 
+    @ApiModelProperty(value = "巡演id")
+    private String roadShowId;
+
+    @ApiModelProperty(value = "搭售id")
+    private String projectId;
+
     //场次数据
     @ApiModelProperty(value = "场次数据")
     private List<TicketTimesTicketCreatePartnerVo> ticketTimes;

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
@@ -86,6 +85,15 @@ public class PerformanceCreateParam implements Serializable {
     @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 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,11 @@ 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.PerformanceRecommendAdminDao;
 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.param.PerformanceRecommendAdminParam;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformanceMisVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 import java.util.List;
@@ -22,7 +22,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);
 
@@ -31,4 +35,10 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
     List<PerformanceTitleDao> getListByRoadShowId(String roadShowId);
 
     List<PerformanceTitleDao> getListByStatus(String status);
+
+    boolean changeRoadShowId(String performancesId,String roadShowId);
+
+    boolean setRecommend(List<PerformanceRecommendAdminParam> performancesId);
+
+    PageInfo<PerformanceRecommendAdminDao> listRecommend();
 }

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,17 +17,81 @@ 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);
 
+    String copyPerformance(String performancesId);
+
     PageInfo<PerformancePartnerListDao> getList(PerformancePartnerListParam performancePartnerListParam);
 }

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);
+    /**
+     * 创建票汇总
+     * @param ticketCreateParam
+     * @return
+     */
+    TicketPartnerVo createTicketSummary(TicketCreateParam ticketCreateParam);
+
+    /**
+     * 未通过审核创建票
+     * @param ticketCreateParam
+     * @return
+     */
+    TicketPartnerVo createTicket(TicketCreateParam ticketCreateParam);
 
-    TicketCreatePartnerVo updateTicket(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-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceRecommendAdminDao.java

+package com.liquidnet.service.kylin.dao;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class PerformanceRecommendAdminDao {
+
+    @ApiModelProperty(value = "演出id")
+    private String performancesId;
+    @ApiModelProperty(value = "演出名称")
+    private String title;
+    @ApiModelProperty(value = "演出开始时间")
+    private String timeStart;
+    @ApiModelProperty(value = "演出状态")
+    private int status;
+    @ApiModelProperty(value = "排序位")
+    private int isRecommend;
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java

@@ -42,7 +42,7 @@ public class KylinPerformanceStatus implements Serializable {
     /**
      * 状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退
      */
-    private int status;
+    private Integer status;
 
     /**
      * 是否售卖 0停止 1正常
@@ -74,6 +74,10 @@ public class KylinPerformanceStatus implements Serializable {
      */
     private Integer limitCount;
 
+    /**
+     * 推荐顺序 0不推荐
+     */
+    private Integer isRecommend;
 
     /**
      * 创建时间

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformances.java

@@ -35,7 +35,7 @@ public class KylinPerformances implements Serializable {
     private String title;
 
     /**
-     * 1音乐节 2演唱会 3小型演出 4展览 6舞台剧
+     * 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演
      */
     private Integer type;
 

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.PerformanceAdminListDao;
-import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
-import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
+import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -31,4 +28,7 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
 
     //根据巡演查询 通过审核演出列表
     List<PerformanceTitleDao> misTitleByStatusList(String status);
+
+    //推荐列表
+    List<PerformanceRecommendAdminDao> reCommendPerformanceList();
 }

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

@@ -40,11 +40,13 @@
         <result column="title" property="title"/>
     </resultMap>
 
-
-    <!-- 列表封装 -->
-    <sql id="partner_performance_list_Column">
-
-    </sql>
+    <resultMap id="PerformanceRecommendAdminDaoResult" type="com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao">
+        <result column="performances_id" property="performancesId"/>
+        <result column="title" property="title"/>
+        <result column="time_start" property="timeStart"/>
+        <result column="status" property="status"/>
+        <result column="is_recommend" property="isRecommend"/>
+    </resultMap>
 
     <!-- 第三方演出列表 (不包含退票信息) -->
     <select id="partnerPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
@@ -112,7 +114,6 @@
         </where>
         ORDER BY #{orderItem} #{orderSc}
     </select>
-
     <!-- Mis演出列表 (不包含退票信息) -->
     <select id="misPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
         SELECT
@@ -174,7 +175,7 @@
                 AND ps.STATUS = #{status}
             </if>
             <if test="status=='-2'">
-                AND ps.STATUS >= 3
+                AND ps.STATUS >= 3 or ps.STATUS = 1
             </if>
             <if test="auditStatus!='-2'">
                 AND ps.audit_status = #{auditStatus}
@@ -188,7 +189,6 @@
         </where>
         ORDER BY #{orderItem} #{orderSc}
     </select>
-
     <!-- Mis 根据巡演查询演出列表 -->
     <select id="misTitleByRoadShowIdList" parameterType="java.lang.String" resultMap="performanceTitleDaoResult">
         SELECT performances_id,
@@ -209,4 +209,17 @@
                  LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
         WHERE ps.status = ${roadShowId}
     </select>
+    <!-- Mis演出推荐列表 -->
+    <select id="reCommendPerformanceList" resultMap="PerformanceRecommendAdminDaoResult">
+        SELECT performances_id,
+               title,
+               time_start,
+               status,
+               is_recommend
+        FROM kylin_performances AS p
+                 LEFT JOIN kylin_performance_status AS ps ON ps.performance_id = p.performances_id
+        WHERE is_recommend > 0
+        ORDER BY is_recommend DESC
+
+    </select>
 </mapper>

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

@@ -158,6 +158,7 @@ CREATE TABLE `kylin_performance_status`
     `audit_status`          tinyint      NOT NULL DEFAULT -1 COMMENT '-1未提交审核，0提交审核，1审核通过，2审核拒绝',
     `is_true_name`          tinyint      NOT NULL DEFAULT 0 COMMENT '是否实名 0不需要 1需要',
     `limit_count`           int(11)      NOT NULL DEFAULT 0 COMMENT '限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
+    `is_recommend`          tinyint(255) NOT NULL DEFAULT 0 COMMENT '是否推荐 0否 1是',
     `created_at`            datetime     NULL     DEFAULT NULL COMMENT '创建时间',
     `updated_at`            datetime     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_performance_status_uid_index` (`performance_status_id`),
@@ -279,7 +280,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/KylinBannersController.java

@@ -34,7 +34,7 @@ public class KylinBannersController {
     private KylinBannersServiceImpl kylinBannersServiceImpl;
 
     @GetMapping("")
-    @ApiOperation(value = "banner列表")
+    @ApiOperation("banner列表")
     public ResponseDto<List<BannersVo>> blist(
             @RequestParam(value = "position") String position,
             @RequestParam(value = "provinceCode", defaultValue = "") String provinceCode

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

 package com.liquidnet.service.kylin.controller;
 
 
+import com.liquidnet.service.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  * 演出 前端控制器
  * </p>
  *
- * @author liquidnet
- * @since 2021-05-05
+ * @author jiangxiulong
+ * @since 2021-05-11
  */
+@Api(tags = "前端-演出")
 @RestController
-@RequestMapping("kylin/user/performance")
+@RequestMapping("performance")
 public class KylinPerformancesController {
 
+    @Autowired
+    private KylinPerformancesServiceImpl kylinPerformancesService;
+
+    @GetMapping("localList")
+    @ApiOperation("本地演出列表")
+    public ResponseDto<HashMap<String, Object>> localList(
+            @RequestParam(value = "sellTime", defaultValue = "") String sellTime, //开票时间
+            @RequestParam(value = "title", defaultValue = "") String title, //演出名称
+            @RequestParam(value = "cityId", defaultValue = "") String cityId, //省份id
+            @RequestParam(value = "type", defaultValue = "") Integer type, //演出类型
+            @RequestParam(value = "page", defaultValue = "1") Integer page,
+            @RequestParam(value = "size", defaultValue = "10") Integer size,
+
+            // 排序
+            @RequestParam(value = "SortType", defaultValue = "1") Integer SortType // 1时间正序 2时间倒序
+    ) {
+        HashMap<String, Object> result = kylinPerformancesService.localList(sellTime, title, cityId, type, page, size, SortType);
+        if (result.size() > 0) {
+            return ResponseDto.success(result);
+        } else {
+            return ResponseDto.failure("获取本地演出列表失败");
+        }
+    }
+
+    @GetMapping("recommendList")
+    @ApiOperation("推荐演出列表")
+    public ResponseDto<List<PerformanceVo>> recommendList() {
+        List<PerformanceVo> result = kylinPerformancesService.recommendList();
+        if (result.size() > 0) {
+            return ResponseDto.success(result);
+        } else {
+            return ResponseDto.failure("获取演出列表失败");
+        }
+    }
+
+    @GetMapping("noticeList")
+    @ApiOperation("演出预告列表")
+    public ResponseDto<List<PerformanceVo>> noticeList() {
+        List<PerformanceVo> result = kylinPerformancesService.noticeList();
+        if (result.size() > 0) {
+            return ResponseDto.success(result);
+        } else {
+            return ResponseDto.failure("获取演出列表失败");
+        }
+    }
+
 }

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

@@ -10,12 +10,10 @@ import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.kylin.service.impl.admin.KylinBannersServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import net.bytebuddy.implementation.bytecode.constant.DefaultValue;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.groups.Default;
 import java.util.List;
 
 /**
@@ -36,7 +34,7 @@ public class KylinBannersAdminController {
     private KylinBannersServiceImpl kylinBannersServiceImpl;
 
     @PostMapping("")
-    @ApiOperation(value = "创建banner")
+    @ApiOperation("创建banner")
     public ResponseDto<Object> create(@RequestBody @Validated BannersParam bannersParam) {
         Boolean res = kylinBannersServiceImpl.create(bannersParam);
         if (res) {
@@ -47,7 +45,7 @@ public class KylinBannersAdminController {
     }
 
     @PutMapping("")
-    @ApiOperation(value = "修改banner")
+    @ApiOperation("修改banner")
     public ResponseDto<Object> update(@RequestBody BannersParam bannersParam) {
         boolean res = kylinBannersServiceImpl.update(bannersParam);
         if (res) {
@@ -58,7 +56,7 @@ public class KylinBannersAdminController {
     }
 
     @GetMapping("{bannersId}")
-    @ApiOperation(value = "banner详情")
+    @ApiOperation("banner详情")
     public ResponseDto<KylinBanners> detail(@PathVariable("bannersId") String bannersId) {
         KylinBanners result = null;
         result = kylinBannersServiceImpl.detail(bannersId);
@@ -70,7 +68,7 @@ public class KylinBannersAdminController {
     }
 
     @GetMapping("list")
-    @ApiOperation(value = "banner列表")
+    @ApiOperation("banner列表")
     public ResponseDto<PagerVo<BannerDetailsListDao>> bannerList(
             @RequestParam(value = "bannersName", defaultValue = "") String bannersName,
             @RequestParam(value = "isOnline", defaultValue = "1") Integer isOnline,
@@ -99,7 +97,7 @@ public class KylinBannersAdminController {
     }
 
     @DeleteMapping("{bannersId}")
-    @ApiOperation(value = "删除banner")
+    @ApiOperation("删除banner")
     public ResponseDto<Object> delete(@PathVariable("bannersId") String bannersId) {
         boolean result = kylinBannersServiceImpl.delete(bannersId);
         if (result) {

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

@@ -4,11 +4,11 @@ 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.PerformanceRecommendAdminDao;
 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.param.PerformanceRecommendAdminParam;
+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;
@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -37,7 +38,7 @@ public class KylinPerformancesAdminController {
     @PostMapping(value = "list")
     @ApiOperation(value = "获取列表")
     @ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<PerformanceAdminListDao>> performanceDetails(@RequestBody PerformanceAdminListParam performanceAdminListParam) {
+    public ResponseDto<PageInfo<PerformanceAdminListDao>> getList(@RequestBody @Valid PerformanceAdminListParam performanceAdminListParam) {
         PageInfo<PerformanceAdminListDao> result = null;
         result = performancesAdminService.getList(performanceAdminListParam);
         if (null != result) {
@@ -49,9 +50,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);
@@ -60,10 +61,10 @@ public class KylinPerformancesAdminController {
         }
     }
 
-    @GetMapping(value = "audit")
+    @PostMapping(value = "audit")
     @ApiOperation(value = "演出审核")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> performanceDetails(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam("rejectTxt") String rejectTxt) {
+    public ResponseDto<String> performanceAudit(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam(value = "rejectTxt", required = false) String rejectTxt) {
         boolean result = performancesAdminService.performanceAudit(performancesId, status, rejectTxt);
         if (result) {
             return ResponseDto.success("审核完成");
@@ -85,7 +86,7 @@ public class KylinPerformancesAdminController {
     }
 
     @GetMapping(value = "list/status")
-    @ApiOperation(value = "列表根据巡演id")
+    @ApiOperation(value = "列表根据演出状态")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<List<PerformanceTitleDao>> getListByStatus(@RequestParam("status") String status) {
         List<PerformanceTitleDao> result = performancesAdminService.getListByStatus(status);
@@ -96,4 +97,39 @@ public class KylinPerformancesAdminController {
         }
     }
 
+    @GetMapping(value = "roadShow/relation")
+    @ApiOperation(value = "修改演出巡演关联")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> changeRoadShowId(@RequestParam("performanceId") String performanceId, @RequestParam("roadShowId") String roadShowId) {
+        boolean result = performancesAdminService.changeRoadShowId(performanceId, roadShowId);
+        if (result) {
+            return ResponseDto.success("操作成功");
+        } else {
+            return ResponseDto.failure("操作失败");
+        }
+    }
+
+    @PutMapping(value = "performance/recommend")
+    @ApiOperation(value = "演出推荐编辑")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> setRecommend(@RequestBody @Valid List<PerformanceRecommendAdminParam> performanceRecommendAdminParam) {
+        boolean result = performancesAdminService.setRecommend(performanceRecommendAdminParam);
+        if (result) {
+            return ResponseDto.success("操作成功");
+        } else {
+            return ResponseDto.failure("操作失败");
+        }
+    }
+
+    @GetMapping(value = "performance/recommend/list")
+    @ApiOperation(value = "演出推荐列表")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PageInfo<PerformanceRecommendAdminDao>> listRecommend() {
+        PageInfo<PerformanceRecommendAdminDao> result = performancesAdminService.listRecommend();
+        if (result != null) {
+            return ResponseDto.success(result);
+        } else {
+            return ResponseDto.failure("获取失败");
+        }
+    }
 }

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

@@ -17,6 +17,9 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  * 巡演 前端控制器
@@ -36,7 +39,9 @@ public class KylinRoadShowsAdminController {
     @GetMapping(value = "list")
     @ApiOperation(value = "获取列表")
     @ApiResponse(response = RoadShowAdminListDao.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<RoadShowAdminListDao>> performanceDetails(@RequestParam("title") String title, int page, int size) {
+    public ResponseDto<PageInfo<RoadShowAdminListDao>> listRoadShow(@RequestParam(value = "title",required = false) String title,
+                                                                          @RequestParam(value = "page") int page,
+                                                                          @RequestParam(value = "size") int size) {
         PageInfo<RoadShowAdminListDao> result = null;
         result = roadShowsService.listRoadShow(title, page, size);
         if (null != result) {
@@ -49,10 +54,12 @@ public class KylinRoadShowsAdminController {
     @PostMapping(value = "")
     @ApiOperation(value = "创建")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
+    public ResponseDto<Map<String,String>> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
         String result = roadShowsService.createRoadShow(createRoadShowParam);
         if (!result.isEmpty()) {
-            return ResponseDto.success(result);
+            Map<String,String> map = new HashMap<>();
+            map.put("roadShowId",result);
+            return ResponseDto.success(map);
         } else {
             return ResponseDto.failure("创建失败");
         }
@@ -72,7 +79,7 @@ public class KylinRoadShowsAdminController {
 
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除")
-    @ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
+    @ApiResponse( code = 200, message = "接口返回对象参数")
     public ResponseDto<String> deleteRoadShow(@RequestParam("roadShowId") String roadShowId, @RequestParam("status") int status) {
         boolean result = roadShowsService.deleteRoadShow(roadShowId, status);
         if (result) {
@@ -84,7 +91,7 @@ public class KylinRoadShowsAdminController {
 
     @GetMapping(value = "details")
     @ApiOperation(value = "详情")
-    @ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
+    @ApiResponse(response = RoadShowAdminVo.class, code = 200, message = "接口返回对象参数")
     public ResponseDto<RoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
         RoadShowAdminVo result = null;
         result = roadShowsService.detailsRoadShow(roadShowId);

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> createTimesSummary(@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> changeTimes(@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> createTicketSummary(@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;
@@ -14,6 +12,9 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Api(tags = "第三方-演出")
 @RestController
 @RequestMapping("partner/performance")
@@ -35,46 +36,64 @@ public class PerformancePartnerController {
         }
     }
 
-    @PostMapping(value = "step1")
-    @ApiOperation(value = "创建演出第一步")
+    @PostMapping(value = "copy")
+    @ApiOperation(value = "复制演出")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> createStep1(@RequestBody PerformanceStep1Param performanceStep1Param) {
-        String result = performancesPartnerService.createStep1(performanceStep1Param);
-        if (result.isEmpty()) {
-            return ResponseDto.failure("创建失败");
+    public ResponseDto<Map<String,String>> copyPerformance(@RequestParam("performancesId") String performancesId) {
+        String result = performancesPartnerService.copyPerformance(performancesId);
+        if (null == result) {
+            return ResponseDto.failure("复制失败");
+        } else {
+            Map<String,String> map = new HashMap<>();
+            map.put("performancesId",result);
+            return ResponseDto.success(map);
+        }
+    }
+
+
+    @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 = "step2")
-    @ApiOperation(value = "创建演出第二步")
+    @PostMapping(value = "step1")
+    @ApiOperation(value = "操作演出第一步")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> createStep2(@RequestBody PerformanceStep2Param performanceStep2Param) {
-        boolean result = performancesPartnerService.createStep2(performanceStep2Param);
-        if (!result) {
-            return ResponseDto.failure("提交失败");
+    public ResponseDto<Map<String,String>> Step1(@RequestBody PerformanceStep1Param performanceStep1Param) {
+        String result = performancesPartnerService.step1(performanceStep1Param);
+        if (result.isEmpty()) {
+            return ResponseDto.failure("操作失败");
         } else {
-            return ResponseDto.success("提交完成");
+            Map<String,String> map = new HashMap<>();
+            map.put("performancesId",result);
+            return ResponseDto.success(map);
         }
     }
 
-    @GetMapping(value = "step1")
-    @ApiOperation(value = "获取演出第一步数据")
+
+    @PostMapping(value = "step2")
+    @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("获取数据失败");
+    public ResponseDto<String> step2(@RequestBody PerformanceStep2Param performanceStep2Param) {
+        boolean result = performancesPartnerService.step2(performanceStep2Param);
+        if (!result) {
+            return ResponseDto.failure("提交失败");
         } else {
-            return ResponseDto.success(result);
+            return ResponseDto.success("提交完成");
         }
     }
 
     @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("获取数据失败");

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

 package com.liquidnet.service.kylin.service.impl;
 
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.bson.Document;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.regex.Pattern;
+
 /**
  * <p>
- * 演出 服务实现类
+ * 前端 演出 服务实现类
  * </p>
  *
- * @author liquidnet
- * @since 2021-05-05
+ * @author jiangxiulong
+ * @since 2021-05-11
  */
 @Service
 public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> implements IKylinPerformancesService {
 
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    public HashMap<String, Object> localList(String sellTime, String title, String cityId, Integer type, Integer page, Integer size, Integer SortType) {
+        HashMap<String,Object> info = new HashMap<>();
+
+        // 排序 分页
+        Sort sortName = null; // 默认开票越早的在上面
+        if (SortType != null) {
+            switch (SortType) {
+                case 1:
+                    sortName = Sort.by(Sort.Direction.ASC, "sellTime");
+                    break;
+                case 2:
+                    sortName = Sort.by(Sort.Direction.DESC, "sellTime");
+                    break;
+                default:
+                    sortName = Sort.by(Sort.Direction.ASC, "sellTime");
+                    break;
+            }
+        }
+        Pageable pageable = PageRequest.of(page - 1, size, sortName);
+
+        //条件
+        Document queryObject = new Document();
+
+        if (!title.isEmpty()) {
+            queryObject.put("title", Pattern.compile(title, Pattern.CASE_INSENSITIVE));
+        }
+        if (!cityId.isEmpty()) {
+            queryObject.put("cityId", cityId);
+        }
+        if (type != null) {
+            queryObject.put("type", type);
+        }
+
+        Query query = new BasicQuery(queryObject);
+        if (!sellTime.isEmpty()) {
+            String sellTimeEnd = sellTime + " 23:59:59";
+            query.addCriteria(Criteria.where("sellTime").gte(sellTime).lte(sellTimeEnd));
+        }
+
+        // 固定查询条件
+        LocalDateTime nowTime = LocalDateTime.now();
+        String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        query.addCriteria(Criteria.where("stopSellTime").gte(nowTimeStr));
+        query.addCriteria(Criteria.where("statusSell").is(1));
+
+        // 要查询的字段
+        /*Document fieldsObject = new Document();
+        Query query = new BasicQuery(queryObject, fieldsObject);
+        fieldsObject.put("performancesId", true);*/
+
+        // 查询总数
+        long count = mongoTemplate.count(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+
+        query.with(pageable);
+
+        List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+
+        // 组合数据
+        info.put("total",count);
+        info.put("data", list);
+
+        return info;
+    }
+
+    public List<PerformanceVo> recommendList() {
+        // 固定查询条件
+        LocalDateTime nowTime = LocalDateTime.now();
+        String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        Query query = Query.query(
+                Criteria.where("stopSellTime").gte(nowTimeStr).and("statusSell").is(1)
+        );
+
+        List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+
+        return list;
+    }
+
+    public List<PerformanceVo> noticeList() {
+        // 固定查询条件
+        LocalDateTime nowTime = LocalDateTime.now();
+        LocalDateTime threeDaysLater = nowTime.plusDays(3);
+        String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        String threeDaysLaterStr = threeDaysLater.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        Query query = Query.query(
+                Criteria.where("sellTime").gte(nowTimeStr).lt(threeDaysLaterStr).and("statusSell").is(1)
+        );
+
+        List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+
+        return list;
+    }
+
 }

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

@@ -6,18 +6,18 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
-import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
+import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
 import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
-import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
-import com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.param.PerformanceRecommendAdminParam;
+import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformanceMisVo;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
@@ -27,8 +27,8 @@ import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -36,8 +36,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -51,6 +49,7 @@ import java.util.*;
  * @since 2021-05-05
  */
 @Service
+@Slf4j
 public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> implements IKylinPerformancesAdminService {
 
     @Autowired
@@ -96,15 +95,32 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     private KylinTicketsPartnerServiceImpl ticketsPartnerService;
 
     @Override
-    public PerformanceCreatePartnerVo performanceDetails(String performancesId) {
+    public PerformanceMisVo performanceDetails(String performancesId) {
+        PerformanceMisVo createMisVo = performanceUpdateDetails(performancesId);
+        if (createMisVo == null) {
+            createMisVo = performanceCreateDetails(performancesId);
+        }
+        log.info(" PERFORMANCE  mis演出详情");
+        return createMisVo;
+    }
 
+    @Override
+    public PerformanceMisVo performanceCreateDetails(String performancesId) {
         return mongoTemplate.findOne(
                 Query.query(Criteria.where("performancesId").is(performancesId)),
-                PerformanceCreatePartnerVo.class,
-                PerformanceCreatePartnerVo.class.getSimpleName()
+                PerformanceMisVo.class,
+                PerformanceMisVo.class.getSimpleName()
         );
     }
 
+    @Override
+    public PerformanceMisVo performanceUpdateDetails(String performancesId) {
+        return mongoTemplate.findOne(
+                Query.query(Criteria.where("performancesId").is(performancesId)),
+                PerformanceMisVo.class,
+                PerformanceMisVo.class.getSimpleName());
+    }
+
     @Override
     public boolean performanceAudit(String performancesId, int status, String rejectTxt) {
         try {
@@ -112,6 +128,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             HashMap<String, Object> map = new HashMap<>();
             int auditStatus = 0;
             if (status == 3) {
+                log.info(" PERFORMANCE  演出审核 通过");
                 rejectTxt = "";
                 auditStatus = 1;
                 //修改演出
@@ -120,25 +137,15 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 map.put("auditStatus", auditStatus);
                 map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 BasicDBObject objectPerformanceVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                mongoTemplate.getCollection(PerformanceCreatePartnerVo.class.getSimpleName()).updateOne(
+                Document doc = mongoTemplate.getCollection(PerformanceMisVo.class.getSimpleName()).findOneAndUpdate(
                         Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
-                        objectPerformanceVo
+                        objectPerformanceVo,
+                        new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
                 );
-            } else if (status == 4) {
-                auditStatus = 2;
-                map.put("rejectTxt", rejectTxt);
-                map.put("auditStatus", auditStatus);
-                map.put("status", status);
-                map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                mongoTemplate.getCollection(PerformanceCreatePartnerVo.class.getSimpleName()).updateOne(
-                        Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
-                        object
-                );
-            } else {
-                return false;
-            }
 
+                KylinPerformanceStatus sqlStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+                if (sqlStatus.getStatus() == 1) {
+                    log.info(" PERFORMANCE  演出审核 第一次");
                     //修改
                     KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
                     performanceStatus.setStatus(status);
@@ -150,11 +157,11 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     performances.setRejectTxt(rejectTxt);
                     performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
 
-            List<TicketTimesCreatePartnerVo> ticketTimesCreatePartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
-            for (TicketTimesCreatePartnerVo ticketTimeItem : ticketTimesCreatePartnerVos) {
-                for (TicketCreatePartnerVo ticketItem : ticketsPartnerService.getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
+                    List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
+                    for (TicketTimesPartnerVo ticketTimeItem : ticketTimesPartnerVos) {
+                        for (TicketPartnerVo ticketItem : ticketsPartnerService.getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
                             BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                    mongoTemplate.getCollection(TicketCreatePartnerVo.class.getSimpleName()).updateOne(
+                            mongoTemplate.getCollection(TicketPartnerVo.class.getSimpleName()).updateOne(
                                     Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(),
                                     objectTicketVo
                             );
@@ -167,6 +174,36 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                             ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId()));
                         }
                     }
+                } else { //只修改演出相关 场次 票 (不包括 库存 售卖时间 限购)
+                    log.info(" PERFORMANCE  演出审核 修改");
+                    HashMap<String, Object> mapSql = new HashMap<>();
+                    mapSql.put("status", 9);
+                    mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                    performanceVoTask.updatePerformanceMySql(performancesId, mapSql, JsonUtils.fromJson(doc.toJson(), PerformanceMisVo.class), updatedAt);
+                    if (sqlStatus.getStatus() == 6) {//若 演出上 则 线判断状态
+                        performanceVoTask.performanceVoStatus(performancesId);
+                    }
+                }
+
+            } else if (status == 4) {
+                log.info(" PERFORMANCE  演出审核 拒绝");
+                auditStatus = 2;
+                map.put("rejectTxt", rejectTxt);
+                map.put("auditStatus", auditStatus);
+                map.put("status", status);
+                map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
+                mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
+                        object
+                );
+                mongoTemplate.getCollection(PerformanceMisVo.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
+                        object
+                );
+            } else {
+                return false;
+            }
             return true;
         } catch (Exception e) {
             System.out.println("ERROR DATA = " + e.getMessage());
@@ -193,7 +230,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         try {
             List<PerformanceTitleDao> voList = performancesMapper.misTitleByRoadShowIdList(roadShowId);
             return voList;
-        }catch (Exception e){
+        } catch (Exception e) {
             return new ArrayList<>();
         }
     }
@@ -203,4 +240,80 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         List<PerformanceTitleDao> voList = performancesMapper.misTitleByStatusList(status);
         return voList;
     }
+
+    @Override
+    public boolean changeRoadShowId(String performancesId, String roadShowId) {
+        try {
+            //mysql
+            KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
+            performanceRelations.setRoadShowId(roadShowId);
+            performanceRelationsMapper.update(performanceRelations, new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
+
+            //redis TODO 演出缓存
+//        if(redisUtil.hHasKey(KylinRedisConst.PERFORMANCES,performancesId)){
+//            redisUtil.hset()
+//        }
+
+            //mongodb
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("roadShowId", roadShowId);
+            BasicDBObject object = new BasicDBObject("$set", map);
+            mongoTemplate.getCollection(PerformanceVo.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
+                    object
+            );
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean setRecommend(List<PerformanceRecommendAdminParam> performancesIdList) {
+        try {
+            KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
+            performanceStatus.setIsRecommend(0);
+            performanceStatus.setStatus(null);
+            performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().gt("is_recommend", 0));
+
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("isRecommend", 0);
+            BasicDBObject object = new BasicDBObject("$set", map);
+            mongoTemplate.getCollection(PerformanceVo.class.getSimpleName()).updateMany(
+                    Query.query(Criteria.where("isRecommend").gt(0)).getQueryObject(),
+                    object
+            );
+
+            for (PerformanceRecommendAdminParam item : performancesIdList) {
+                performanceStatus.setIsRecommend(item.getIsRecommend());
+                performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", item.getPerformanceId()));
+
+                HashMap<String, Object> map2 = new HashMap<>();
+                map2.put("isRecommend", item.getIsRecommend());
+                BasicDBObject object2 = new BasicDBObject("$set", map2);
+                mongoTemplate.getCollection(PerformanceVo.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("performancesId").is(item.getPerformanceId())).getQueryObject(),
+                        object2
+                );
+            }
+            redisUtil.del(KylinRedisConst.PERFORMANCES_RECOMMEND);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    @Override
+    public PageInfo<PerformanceRecommendAdminDao> listRecommend() {
+
+        PageInfo<PerformanceRecommendAdminDao> pageInfoTmp = null;
+        try {
+            PageHelper.startPage(1, 10);
+            List<PerformanceRecommendAdminDao> voList = performancesMapper.reCommendPerformanceList();
+            pageInfoTmp = new PageInfo(voList);
+        } catch (Exception e) {
+            return null;
+        }
+        return pageInfoTmp;
+    }
 }

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

@@ -10,10 +10,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.TicketInventoryDto;
-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.PerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.TicketVo;
@@ -26,6 +23,7 @@ import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.mongodb.BasicDBObject;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -54,6 +52,7 @@ import java.util.Map;
  * @since 2021-05-05
  */
 @Service
+@Slf4j
 public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> implements IKylinPerformancesPartnerService {
 
     @Autowired
@@ -98,6 +97,26 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     @Autowired
     private KylinTicketTimesPartnerServiceImpl ticketTimesPartnerService;
 
+    @Override
+    public String step1(PerformanceStep1Param step1Param) {
+        String result = null;
+        // 无 performancesId 则 创建
+        if (null == step1Param.getPerformancesId()) {
+            result = createStep1(step1Param);
+            log.info(" PERFORMANCE  演出第一步 创建");
+        } else { // 获取 create 数据 status = 0 或 无数据 创建
+            PerformanceParam createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformanceParam.class, PerformanceParam.class.getSimpleName());
+            if (createParam == null) {
+                result = createStep1(step1Param);
+                log.info(" PERFORMANCE  演出第一步 创建");
+            } else {// 修改
+                result = updateStep1(step1Param);
+                log.info(" PERFORMANCE  演出第一步 修改");
+            }
+        }
+        return result;
+    }
+
     @Override
     public String createStep1(PerformanceStep1Param step1Param) {
         // 获取 主键id
@@ -106,18 +125,19 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         LocalDateTime createdAt = LocalDateTime.now();
 
         try {
-            step1Param.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             step1Param.setPerformancesId(performanceId);
-            PerformanceCreateParam performanceCreateParam = new PerformanceCreateParam();
-            BeanUtils.copyProperties(step1Param, performanceCreateParam);
-            performanceCreateParam.setIsTrueName(0);
-            performanceCreateParam.setLimitCount(0);
-            performanceCreateParam.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            performanceCreateParam.setIsSubmit(0);
-            performanceCreateParam.setStatus(0);
-            performanceCreateParam.setStatusSell(1);
+            PerformanceParam performanceParam = new PerformanceParam();
+            BeanUtils.copyProperties(step1Param, performanceParam);
+            performanceParam.setIsTrueName(0);
+            performanceParam.setLimitCount(0);
+            performanceParam.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            performanceParam.setIsSubmit(0);
+            performanceParam.setStatus(0);
+            performanceParam.setStatusSell(1);
+            performanceParam.setRoadShowId("0");
+            performanceParam.setProjectId("0");
             mongoTemplate.insert(
-                    performanceCreateParam, PerformanceCreateParam.class.getSimpleName()
+                    performanceParam, PerformanceParam.class.getSimpleName()
             );
 
             return performanceId;
@@ -126,6 +146,106 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         }
     }
 
+    @Override
+    public String updateStep1(PerformanceStep1Param step1Param) {
+        // 获取 当前时间 -> 创建时间
+        LocalDateTime timeNow = LocalDateTime.now();
+        String performanceId = step1Param.getPerformancesId();
+        try {
+            step1Param.setPerformancesId(performanceId);
+            PerformanceParam performanceParam = new PerformanceParam();
+            BeanUtils.copyProperties(step1Param, performanceParam);
+            performanceParam.setCreatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            performanceParam.setUpdatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            performanceParam.setIsSubmit(0);
+            performanceParam.setStatus(0);
+            PerformanceParam data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)),
+                    PerformanceParam.class, PerformanceParam.class.getSimpleName());
+            if (data != null) { // 有修改记录
+                performanceParam.setIsTrueName(data.getIsTrueName());
+                performanceParam.setLimitCount(data.getLimitCount());
+                performanceParam.setStatusSell(data.getStatusSell());
+                performanceParam.setRoadShowId(data.getRoadShowId());
+                performanceParam.setProjectId(data.getProjectId());
+                BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(performanceParam));
+                mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
+                        object
+                );
+            } else { // 无修改记录
+                KylinPerformanceStatus statusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performanceId", performanceId));
+                KylinPerformanceRelations relationsData = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performancesId", performanceId));
+                performanceParam.setIsTrueName(statusData.getIsTrueName());
+                performanceParam.setLimitCount(statusData.getLimitCount());
+                performanceParam.setStatusSell(statusData.getStatusSell());
+                performanceParam.setRoadShowId(relationsData.getRoadShowId());
+                performanceParam.setProjectId(relationsData.getProjectId());
+                mongoTemplate.insert(
+                        performanceParam, PerformanceParam.class.getSimpleName()
+                );
+            }
+            return performanceId;
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    @Override
+    public PerformancePartnerVo getStep1(String performancesId) {
+        PerformancePartnerVo performancePartnerVo = new PerformancePartnerVo();
+//        PerformanceParam updateData = getUpdateStep1(performancesId);
+        PerformanceParam data = mongoTemplate.findOne(
+                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
+        );
+        if (data == null) {
+            return performancePartnerVo;
+        }
+        BeanUtils.copyProperties(data, performancePartnerVo);
+        log.info(" PERFORMANCE  演出第一步 获取");
+        return performancePartnerVo;
+    }
+
+//    @Override
+//    public PerformanceParam getCreateStep1(String performancesId) {
+//        PerformanceParam data = mongoTemplate.findOne(
+//                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
+//        );
+//        if (data == null) {
+//            return new PerformanceParam();
+//        }
+//        return data;
+//    }
+//
+//    @Override
+//    public PerformanceParam getUpdateStep1(String performancesId) {
+//
+//        PerformanceParam data = mongoTemplate.findOne(
+//                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
+//        );
+//        if (data == null) {
+//            return new PerformanceParam();
+//        }
+//        return data;
+//    }
+
+    @Override
+    public boolean step2(PerformanceStep2Param step2Param) {
+        boolean result = false;
+        // 无 performancesId 则 创建
+        if (step2Param.getPerformancesId().isEmpty()) {
+        } else { // 获取 create 数据 status = 0 或 无数据 创建
+            KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", step2Param.getPerformancesId()));
+            if (performanceStatus == null || performanceStatus.getStatus() == 0) {
+                result = createStep2(step2Param);
+                log.info(" PERFORMANCE  演出第二步 创建");
+            } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7) {// 修改
+                result = updateStep2(step2Param);
+                log.info(" PERFORMANCE  演出第二步 修改");
+            }
+        }
+        return result;
+    }
+
     @Override
     public boolean createStep2(PerformanceStep2Param step2Param) {
 
@@ -135,8 +255,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         LocalDateTime createdAt = LocalDateTime.now();
 
         boolean isExistsSubmit = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(1)),
-                PerformanceCreateParam.class,
-                PerformanceCreateParam.class.getSimpleName());
+                PerformanceParam.class,
+                PerformanceParam.class.getSimpleName());
 
         if (isExistsSubmit) {
             return false;
@@ -154,37 +274,38 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         if (step2Param.getIsSubmit() == 1) { // 提交
             map.put("status", 1);
             BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            mongoTemplate.getCollection(PerformanceCreateParam.class.getSimpleName()).updateOne(
+            mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
                     object
             );
             //提交 票
-            List<TicketTimesCreatePartnerVo> ticketTimesCreatePartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId);
-            for (TicketTimesCreatePartnerVo ticketTimes : ticketTimesCreatePartnerVoList) {
+            List<TicketTimesPartnerVo> ticketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId);
+            for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVoList) {
                 boolean boolResult = ticketsPartnerService.submitTicketByTimes(ticketTimes.getTicketTimesId());
                 if (boolResult) {
                     return false;
                 }
             }
-            if (ticketTimesCreatePartnerVoList.size() <= 0) {
+            if (ticketTimesPartnerVoList.size() <= 0) {
                 return false;
             } else {
-                PerformanceCreatePartnerVo performanceCreatePartnerVo = performanceVoTask.createPerformanceCreateParam(performanceId);
+                PerformanceMisVo performanceMisVo = performanceVoTask.createPerformanceCreateParam(performanceId);
 
                 HashMap<String, Object> mapSql = new HashMap<>();
+                mapSql.put("isCreateSave", 0);
                 mapSql.put("rejectTxt", "");
                 mapSql.put("status", 1);
                 mapSql.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-//                auditTime
-                performanceVoTask.createPerformanceMySql(performanceId, mapSql, performanceCreatePartnerVo, createdAt);
+                performanceVoTask.createPerformanceMySql(performanceId, mapSql, performanceMisVo, createdAt);
                 KylinPerformances performances = new KylinPerformances();
                 performances.setAuditTime(LocalDateTime.now());
-                performancesMapper.insert(performances);
+                performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
             }
         } else { //保存
             map.put("status", 0);
+            map.put("isCreateSave", 1);
             BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            mongoTemplate.getCollection(PerformanceCreateParam.class.getSimpleName()).updateMany(
+            mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateMany(
                     Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
                     object
             );
@@ -194,43 +315,181 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     }
 
     @Override
-    public PerformanceCreateParam getStep1(String performancesId) {
-        PerformanceCreateParam data = mongoTemplate.findOne(
-                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceCreateParam.class, PerformanceCreateParam.class.getSimpleName()
+    public boolean updateStep2(PerformanceStep2Param step2Param) {
+        // 获取 主键id
+        String performanceId = step2Param.getPerformancesId();
+        // 获取 当前时间 -> 创建时间
+        LocalDateTime createdAt = LocalDateTime.now();
+
+        boolean isExistsSubmit = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(1)),
+                PerformanceParam.class,
+                PerformanceParam.class.getSimpleName());
+
+        if (isExistsSubmit) {
+            return false;
+        }
+
+        //演出修改数据
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("isTrueName", step2Param.getIsTrueName());
+        map.put("limitCount", step2Param.getLimitCount());
+        map.put("createdAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        map.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        map.put("isSubmit", step2Param.getIsSubmit());
+
+        // 获取第一步数据
+        if (step2Param.getIsSubmit() == 1) { // 提交
+            map.put("status", 1);
+            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
+            mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
+                    object
+            );
+            //提交 票
+            List<TicketTimesPartnerVo> ticketTimesPartnerVoList = ticketTimesPartnerService.getTimesMongoList(performanceId);
+            for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVoList) {
+                boolean boolResult = ticketsPartnerService.submitTicketByTimes(ticketTimes.getTicketTimesId());
+                if (boolResult) {
+                    return false;
+                }
+            }
+            if (ticketTimesPartnerVoList.size() <= 0) {
+                return false;
+            } else {
+                PerformanceMisVo performanceMisVo = performanceVoTask.setPerformanceUpdateParam(performanceId);
+
+                HashMap<String, Object> mapSql = new HashMap<>();
+                mapSql.put("rejectTxt", "");
+                mapSql.put("status", 1);
+                mapSql.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                KylinPerformances performances = new KylinPerformances();
+                performances.setAuditTime(LocalDateTime.now());
+                performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
+
+                //提示：票种价格、售票时间、购票限制 直接生效
+                List<TicketTimesTicketCreatePartnerVo> timeList = performanceMisVo.getTicketTimes();
+                for (TicketTimesTicketCreatePartnerVo timesItem : timeList) {
+                    List<TicketPartnerVo> ticketList = timesItem.getTicket();
+                    for (TicketPartnerVo ticketItem : ticketList) {
+                        //修改 redis库存
+                        if (redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) {
+                            KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId()));
+                            int changeGeneral = ticketStatus.getTotalGeneral() - ticketItem.getTotalGeneral();
+                            int changeExchange = ticketStatus.getTotalGeneral() - ticketItem.getTotalExchange();
+                            redisUtil.hincr(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL, changeGeneral);
+                            redisUtil.hincr(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId(), KylinRedisConst.SURPLUS_EXCHANGE, changeExchange);
+                        }
+                        //修改 mysql 库存
+                        KylinTicketStatus inventory = new KylinTicketStatus();
+                        inventory.setTotalExchange(ticketItem.getTotalExchange());
+                        inventory.setTotalGeneral(ticketItem.getTotalGeneral());
+                        inventory.setIsTrueName(performanceMisVo.getIsTrueName());
+                        inventory.setLimitCount(ticketItem.getLimitCount());
+                        //修改 mysql 售卖时间
+                        KylinTickets ticketSellTime = new KylinTickets();
+                        ticketSellTime.setTimeEnd(LocalDateTime.parse(ticketItem.getTimeEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        ticketSellTime.setTimeEnd(LocalDateTime.parse(ticketItem.getTimeStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        ticketsMapper.update(ticketSellTime, new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketItem.getTicketsId()));
+                        //修改 mysql 购票限购
+                        ticketStatusMapper.update(inventory, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId()));
+                    }
+                }
+            }
+        } else { //保存
+            map.put("status", 0);
+            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
+            mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateMany(
+                    Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
+                    object
             );
-        if (data == null) {
-            return new PerformanceCreateParam();
         }
-        return data;
+
+        return true;
     }
 
     @Override
     public PerformanceStep2Param getStep2(String performancesId) {
-        PerformanceCreateParam data = mongoTemplate.findOne(
-                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceCreateParam.class, PerformanceCreateParam.class.getSimpleName()
+        PerformanceStep2Param performanceCreatePartnerVo = null;
+        PerformanceParam data = mongoTemplate.findOne(
+                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
         );
-
         if (data == null) {
             return new PerformanceStep2Param();
         }
-
-        List<TicketTimesCreatePartnerVo> ticketTimesCreatePartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
+        List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
         List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
 
-        for (TicketTimesCreatePartnerVo ticketTimes : ticketTimesCreatePartnerVos) {
+        for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVos) {
             TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
             BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
-            List<TicketCreatePartnerVo> ticketCreatePartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
-            ticketTimesTicketCreatePartnerVo.setTicket(ticketCreatePartnerVos);
+            List<TicketPartnerVo> ticketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
+            ticketTimesTicketCreatePartnerVo.setTicket(ticketPartnerVos);
             ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
         }
 
         PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param();
         BeanUtils.copyProperties(data, performanceStep2Param);
         performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
-
-        return performanceStep2Param;
-    }
+        performanceCreatePartnerVo = performanceStep2Param;
+        log.info(" PERFORMANCE  演出第二步 获取");
+        return performanceCreatePartnerVo;
+    }
+
+//    @Override
+//    public PerformanceStep2Param getCreateStep2(String performancesId) {
+//        PerformanceParam data = mongoTemplate.findOne(
+//                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
+//        );
+//
+//        if (data == null) {
+//            return new PerformanceStep2Param();
+//        }
+//
+//        List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
+//        List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList();
+//
+//        for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVos) {
+//            TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
+//            BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
+//            List<TicketPartnerVo> ticketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
+//            ticketTimesTicketCreatePartnerVo.setTicket(ticketPartnerVos);
+//            ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
+//        }
+//
+//        PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param();
+//        BeanUtils.copyProperties(data, performanceStep2Param);
+//        performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
+//
+//        return performanceStep2Param;
+//    }
+//
+//    @Override
+//    public PerformanceStep2Param getUpdateStep2(String performancesId) {
+//        PerformanceParam data = mongoTemplate.findOne(
+//                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
+//        );
+//
+//        if (data == null) {
+//            return new PerformanceStep2Param();
+//        }
+//
+//        List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
+//        List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
+//
+//        for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVos) {
+//            TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
+//            BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
+//            List<TicketPartnerVo> ticketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
+//            ticketTimesTicketCreatePartnerVo.setTicket(ticketPartnerVos);
+//            ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
+//        }
+//
+//        PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param();
+//        BeanUtils.copyProperties(data, performanceStep2Param);
+//        performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
+//
+//        return performanceStep2Param;
+//    }
 
     @Override
     public boolean onLinePerformance(String performancesId) {
@@ -277,7 +536,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 //票
                 List<KylinTicketRelations> ticketRelations = ticketRelationsMapper.selectList(new UpdateWrapper<KylinTicketRelations>().eq("times_id", ticketTimes.getTicketTimesId()));
                 for (KylinTicketRelations ticketRelationsItem : ticketRelations) {
-                    KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelationsItem.getTicketId()).between("status", 6, 10).ne("status", 7));
+                    KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelationsItem.getTicketId()).between("status", 1, 10).ne("status", 7));
                     KylinTickets tickets = ticketsMapper.selectOne(
                             new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketStatus.getTicketId()
                             )
@@ -291,22 +550,32 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     ticketVo.setTimeId(ticketRelationsItem.getTimesId());
                     ticketVo.setTicket(tickets);
                     ticketVo.setTicketStatus(ticketStatus);
+                    boolean ticketExists =
+                            mongoTemplate.exists(Query.query(Criteria.where("ticketsId").is(ticketVo.getTicketsId())), TicketVo.class, TicketVo.class.getSimpleName());
+                    if (!ticketExists) {
                         mongoTemplate.insert(
                                 ticketVo, TicketVo.class.getSimpleName()
                         );
+                    }
+
                     //票种 库存redis TODO 库存可能会丢
-                    TicketInventoryDto ticketInventoryRedis = (TicketInventoryDto) redisUtil.hget(KylinRedisConst.PERFORMANCES_INVENTORY, ticketVo.getTicketsId());
                     TicketInventoryDto ticketInventoryDto = new TicketInventoryDto();
-                    if (ticketInventoryRedis == null) {
+                    if (!redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) {
                         ticketInventoryDto.setSurplusExchange(ticketStatus.getSurplusExchange());
                         ticketInventoryDto.setSurplusGeneral(ticketStatus.getTotalGeneral());
                         ticketInventoryDto.setTicketsId(ticketVo.getTicketsId());
+                        redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL, ticketInventoryDto.getSurplusGeneral());
+                        redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL, ticketInventoryDto.getSurplusGeneral());
+
                     } else {
-                        ticketInventoryDto.setSurplusExchange(ticketStatus.getSurplusExchange() - ticketInventoryRedis.getSurplusExchange());
-                        ticketInventoryDto.setSurplusGeneral(ticketStatus.getTotalGeneral() - ticketInventoryRedis.getSurplusGeneral());
+                        int surplusGeneral = (int) redisUtil.hget(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL);
+                        int surplusExchange = (int) redisUtil.hget(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_EXCHANGE);
+                        ticketInventoryDto.setSurplusExchange(ticketStatus.getSurplusExchange() - surplusGeneral);
+                        ticketInventoryDto.setSurplusGeneral(ticketStatus.getTotalGeneral() - surplusExchange);
                         ticketInventoryDto.setTicketsId(ticketVo.getTicketsId());
+                        redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL, ticketInventoryDto.getSurplusGeneral());
+                        redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_EXCHANGE, ticketInventoryDto.getSurplusExchange());
                     }
-                    redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY, ticketVo.getTicketsId(), ticketInventoryDto);
 
                     if (ticketVo.getIsMember() == 1) {
                         isMember = 1;
@@ -327,19 +596,29 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         sellTime = tickets.getTimeStart().plusMinutes(-tickets.getAdvanceMinuteMember());
                     }
                 }
+                boolean ticketTimesExists =
+                        mongoTemplate.exists(Query.query(Criteria.where("ticketTimesId").is(ticketTimesVo.getTicketTimesId())), TicketTimesVo.class, TicketTimesVo.class.getSimpleName());
+                if (!ticketTimesExists) {
                     mongoTemplate.insert(
                             ticketTimesVo, TicketTimesVo.class.getSimpleName()
                     );
                 }
+
+            }
             performanceVoData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellTime);
+            performanceVoData.setPerformanceRelations(performanceRelationsData);
+            boolean performanceExists =
+                    mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceVoData.getPerformancesId())), PerformanceVo.class, PerformanceVo.class.getSimpleName());
+            if (!performanceExists) {
                 mongoTemplate.insert(
                         performanceVoData, PerformanceVo.class.getSimpleName()
                 );
+            }
             //修改 提审vo
             Map<String, Object> map = new HashMap<>();
             map.put("status", 3);
             BasicDBObject objectPerformance = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            mongoTemplate.getCollection(PerformanceCreatePartnerVo.class.getSimpleName()).updateOne(
+            mongoTemplate.getCollection(PerformanceMisVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
                     objectPerformance
             );
@@ -403,6 +682,34 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         }
     }
 
+    @Override
+    public String copyPerformance(String performancesId) {
+
+        PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performances_id").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
+        //复制演出
+        performancePartnerVo.setPerformancesId(IDGenerator.nextSnowId().toString());
+        performancePartnerVo.setStatus(0);
+        mongoTemplate.insert(performancePartnerVo, PerformancePartnerVo.class.getSimpleName());
+
+        List<TicketTimesPartnerVo> ticketTimesPartnerVos = mongoTemplate.find(Query.query(Criteria.where("performances_id").is(performancesId)), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
+        for (TicketTimesPartnerVo timeItem : ticketTimesPartnerVos) {
+            //复制场次
+            timeItem.setTicketTimesId(IDGenerator.nextSnowId().toString());
+            timeItem.setPerformancesId(performancePartnerVo.getPerformancesId());
+            mongoTemplate.insert(timeItem, TicketTimesPartnerVo.class.getSimpleName());
+
+            List<TicketPartnerVo> ticketPartnerVos = mongoTemplate.find(Query.query(Criteria.where("timesId").is(timeItem.getTicketTimesId())), TicketPartnerVo.class, TicketPartnerVo.class.getSimpleName());
+            for (TicketPartnerVo ticketItem : ticketPartnerVos) {
+                //复制票
+                ticketItem.setStatus(0);
+                ticketItem.setTimesId(ticketItem.getTimesId());
+                ticketItem.setTicketsId(IDGenerator.nextSnowId().toString());
+                mongoTemplate.insert(ticketItem, TicketPartnerVo.class.getSimpleName());
+            }
+        }
+        return performancePartnerVo.getPerformancesId();
+    }
+
     @Override
     public PageInfo<PerformancePartnerListDao> getList(PerformancePartnerListParam performancePartnerListParam) {
         int status = performancePartnerListParam.getStatus();
@@ -410,21 +717,22 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         int size = performancePartnerListParam.getSize();
         PageInfo<PerformancePartnerListDao> pageInfoTmp = null;
         if (status == 0) {//未发布演出
+            log.info(" PERFORMANCE  演出列表 未提交");
             // 排序 分页
             Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
             //条件
-            Criteria criteria = Criteria.where("status").is(status);
+            Criteria criteria = Criteria.where("status").is(status).and("isCreateSave").is(1);
             if (!performancePartnerListParam.getTitle().isEmpty()) {
                 criteria.and("title").regex(".*?\\" + performancePartnerListParam.getTitle());
             }
             Query query = Query.query(criteria);
             // 查询总数
-            long count = mongoTemplate.count(query, PerformanceCreateParam.class, PerformanceCreateParam.class.getSimpleName());
-            List<PerformanceCreateParam> performanceCreateParam = mongoTemplate.find(query, PerformanceCreateParam.class, PerformanceCreateParam.class.getSimpleName());
+            long count = mongoTemplate.count(query, PerformanceParam.class, PerformanceParam.class.getSimpleName());
+            List<PerformanceParam> performanceParam = mongoTemplate.find(query, PerformanceParam.class, PerformanceParam.class.getSimpleName());
             query.with(pageable);
             //处理Vo
             List<PerformancePartnerListVo> voList = new ArrayList<>();
-            for (PerformanceCreateParam item : performanceCreateParam) {
+            for (PerformanceParam item : performanceParam) {
                 PerformancePartnerListVo voData = new PerformancePartnerListVo();
                 voData.setStatus0Data(item);
                 voList.add(voData);
@@ -432,6 +740,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             pageInfoTmp = new PageInfo(voList);
             pageInfoTmp.setTotal(count);
         } else {//演出列表
+            log.info(" PERFORMANCE  演出列表 已提交");
             try {
                 PageHelper.startPage(performancePartnerListParam.getPage(), performancePartnerListParam.getSize());
                 List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam));

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

 package com.liquidnet.service.kylin.service.impl.partner;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
 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.KylinPerformanceStatus;
+import com.liquidnet.service.kylin.entity.KylinTicketTimeRelation;
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
+import com.liquidnet.service.kylin.mapper.KylinPerformanceStatusMapper;
 import com.liquidnet.service.kylin.mapper.KylinTicketTimeRelationMapper;
 import com.liquidnet.service.kylin.mapper.KylinTicketTimesMapper;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
+import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,13 +41,14 @@ import java.util.List;
  * @since 2021-05-06
  */
 @Service
+@Slf4j
 public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketTimesMapper, KylinTicketTimes> implements IKylinTicketTimesPartnerService {
 
     @Autowired
     private MongoTemplate mongoTemplate;
 
-//    @Autowired
-//    private RedisUtil redisUtil;
+    @Autowired
+    private MongoConverter mongoConverter;
 
     @Autowired
     private KylinTicketTimesMapper ticketTimesMapper;
@@ -53,10 +57,29 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     private KylinTicketTimeRelationMapper ticketTimeRelationMapper;
 
     @Autowired
-    private MongoConverter mongoConverter;
+    private KylinPerformanceStatusMapper performanceStatusMapper;
 
     @Override
-    public TicketTimesCreatePartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam) {
+    public TicketTimesPartnerVo createTimesSummary(CreateTicketTimesParam createTicketTimesParam) {
+        TicketTimesPartnerVo ticketTimesPartnerVo = null;
+        //获取演出状态
+        KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
+                new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",createTicketTimesParam.getPerformancesId()));
+        if(null == performanceStatus){
+            ticketTimesPartnerVo = createTimes(createTicketTimesParam);
+            log.info(" PERFORMANCE 场次 创建");
+        }else if(performanceStatus.getStatus()>=3 && performanceStatus.getStatus()!=4){//未被拒绝 且 通过审核的演出
+            ticketTimesPartnerVo = addNewTimes(createTicketTimesParam);
+            log.info(" PERFORMANCE 场次 新增");
+        }else {
+            ticketTimesPartnerVo = createTimes(createTicketTimesParam);
+            log.info(" PERFORMANCE 场次 创建");
+        }
+        return ticketTimesPartnerVo;
+    }
+
+    @Override
+    public TicketTimesPartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam) {
 
         // 获取 主键id
         String ticketTimesId = IDGenerator.nextSnowId().toString();
@@ -70,76 +93,84 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) + "-" + createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
         }
 
-        // mysql 操作
-//        KylinTicketTimes ticketTimes = new KylinTicketTimes();
-//        BeanUtils.copyProperties(createTicketTimesParam, ticketTimes);
-//        ticketTimes.setTicketTimesId(ticketTimesId);
-//        ticketTimes.setCreatedAt(createdAt);
-//        ticketTimes.setStatus(1);
-//        ticketTimes.setTitle(title);
-//        ticketTimesMapper.insert(ticketTimes);
-//
-//        KylinTicketTimeRelation ticketTimeRelation = new KylinTicketTimeRelation();
-//        ticketTimeRelation.setTicketTimeRelationId(IDGenerator.nextSnowId().toString());
-//        ticketTimeRelation.setTimesId(ticketTimesId);
-//        ticketTimeRelation.setPerformanceId(createTicketTimesParam.getPerformancesId());
-//        ticketTimeRelation.setCreatedAt(createdAt);
-//        ticketTimeRelationMapper.insert(ticketTimeRelation);
-
         // mongo 操作
-        TicketTimesCreatePartnerVo ticketTimesCreatePartnerVo = new TicketTimesCreatePartnerVo();
-        ticketTimesCreatePartnerVo.setTicketTimesId(ticketTimesId);
-        ticketTimesCreatePartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketTimesCreatePartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketTimesCreatePartnerVo.setStatus(1);
-        ticketTimesCreatePartnerVo.setTitle(title);
-        ticketTimesCreatePartnerVo.setPerformancesId(createTicketTimesParam.getPerformancesId());
-        ticketTimesCreatePartnerVo.setType(createTicketTimesParam.getType());
-        ticketTimesCreatePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        TicketTimesCreatePartnerVo data = mongoTemplate.insert(
-                ticketTimesCreatePartnerVo, TicketTimesCreatePartnerVo.class.getSimpleName()
+        TicketTimesPartnerVo ticketTimesPartnerVo = new TicketTimesPartnerVo();
+        ticketTimesPartnerVo.setTicketTimesId(ticketTimesId);
+        ticketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketTimesPartnerVo.setStatus(1);
+        ticketTimesPartnerVo.setTitle(title);
+        ticketTimesPartnerVo.setPerformancesId(createTicketTimesParam.getPerformancesId());
+        ticketTimesPartnerVo.setType(createTicketTimesParam.getType());
+        ticketTimesPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        TicketTimesPartnerVo data = mongoTemplate.insert(
+                ticketTimesPartnerVo, TicketTimesPartnerVo.class.getSimpleName()
         );
 
-        // redis 操作
-//        redisUtil.hset(KylinRedisConst.TIMES, ticketTimesId, ticketTimesCreatePartnerVo);
+        return ticketTimesPartnerVo;
+    }
+
+    @Override
+    public TicketTimesPartnerVo addNewTimes(CreateTicketTimesParam createTicketTimesParam) {
+        // 获取 主键id
+        String ticketTimesId = IDGenerator.nextSnowId().toString();
+        // 获取 当前时间 -> 创建时间
+        LocalDateTime createdAt = LocalDateTime.now();
+        // 标题
+        String title = "";
+        if (createTicketTimesParam.getType() == 1) {
+            title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+        } else {
+            title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) + "-" + createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+        }
 
-        return ticketTimesCreatePartnerVo;
+        // mongo 操作
+        TicketTimesPartnerVo ticketTimesPartnerVo = new TicketTimesPartnerVo();
+        ticketTimesPartnerVo.setTicketTimesId(ticketTimesId);
+        ticketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketTimesPartnerVo.setStatus(-1);
+        ticketTimesPartnerVo.setTitle(title);
+        ticketTimesPartnerVo.setPerformancesId(createTicketTimesParam.getPerformancesId());
+        ticketTimesPartnerVo.setType(createTicketTimesParam.getType());
+        ticketTimesPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        TicketTimesPartnerVo data = mongoTemplate.insert(
+                ticketTimesPartnerVo, TicketTimesPartnerVo.class.getSimpleName()
+        );
+        return null;
     }
 
     @Override
     public Boolean deleteTimes(String ticketTimesId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
+            KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
+                    new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id",ticketTimesId));
 
-//            KylinTicketTimes ticketTimes = new KylinTicketTimes();
-//            ticketTimes.setUpdatedAt(updatedAt);
-//            ticketTimes.setStatus(0);
-//            ticketTimesMapper.update(ticketTimes
-//                    , new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", ticketTimesId));
-
-            // mongo 操作
+            KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
+                    new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",ticketTimeRelation.getPerformanceId()));
+            if(performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {//未提审||被拒绝
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 map.put("status", 0);
 
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            Document doc = mongoTemplate.getCollection(TicketTimesCreatePartnerVo.class.getSimpleName()).findOneAndUpdate(
+                Document doc = mongoTemplate.getCollection(TicketTimesPartnerVo.class.getSimpleName()).findOneAndUpdate(
                         Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)).getQueryObject(),
                         object,
                         new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
                 );
-
-            // redis 操作
-//            redisUtil.hset(KylinRedisConst.TIMES, ticketTimesId, JsonUtils.fromJson(doc.toJson(), TicketTimesCreatePartnerVo.class));
-
                 return true;
+            }else{
+                return false;
+            }
         } catch (Exception e) {
             return false;
         }
     }
 
     @Override
-    public TicketTimesCreatePartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam) {
+    public TicketTimesPartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
             String title = "";
@@ -150,46 +181,36 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             }
             createTicketTimesParam.setTitle(title);
 
-            // mysql 操作
-//            KylinTicketTimes ticketTimes = new KylinTicketTimes();
-//            BeanUtils.copyProperties(createTicketTimesParam, ticketTimes);
-//            ticketTimes.setUpdatedAt(updatedAt);
-//            ticketTimes.setStatus(1);
-//            ticketTimesMapper.update(ticketTimes, new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", createTicketTimesParam.getTicketTimesId()));
-
-
             // mongo 操作
-            TicketTimesCreatePartnerVo ticketTimesCreatePartnerVo = new TicketTimesCreatePartnerVo();
-            BeanUtils.copyProperties(createTicketTimesParam, ticketTimesCreatePartnerVo);
-            ticketTimesCreatePartnerVo.setTicketTimesId(createTicketTimesParam.getTicketTimesId());
-            ticketTimesCreatePartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketTimesCreatePartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketTimesCreatePartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketTimesCreatePartnerVo.setStatus(1);
-
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(ticketTimesCreatePartnerVo)));
-            Document doc = mongoTemplate.getCollection(TicketTimesCreatePartnerVo.class.getSimpleName()).findOneAndUpdate(
+            TicketTimesPartnerVo ticketTimesPartnerVo = new TicketTimesPartnerVo();
+            BeanUtils.copyProperties(createTicketTimesParam, ticketTimesPartnerVo);
+            ticketTimesPartnerVo.setTicketTimesId(createTicketTimesParam.getTicketTimesId());
+            ticketTimesPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketTimesPartnerVo.setStatus(null);
+
+            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(ticketTimesPartnerVo)));
+            Document doc = mongoTemplate.getCollection(TicketTimesPartnerVo.class.getSimpleName()).findOneAndUpdate(
                     Query.query(Criteria.where("ticketTimesId").is(createTicketTimesParam.getTicketTimesId())).getQueryObject(),
                     object,
                     new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
 
-            // redis 操作
-//            redisUtil.hset(KylinRedisConst.TIMES, createTicketTimesParam.getTicketTimesId(), JsonUtils.fromJson(doc.toJson(), TicketTimesCreatePartnerVo.class));
-            return JsonUtils.fromJson(doc.toJson(), TicketTimesCreatePartnerVo.class);
+            return JsonUtils.fromJson(doc.toJson(), TicketTimesPartnerVo.class);
 
-        }catch (Exception e){
+        } catch (Exception e) {
             return null;
         }
     }
 
     @Override
-    public List<TicketTimesCreatePartnerVo> getTimesMongoList(String performancesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)), TicketTimesCreatePartnerVo.class, TicketTimesCreatePartnerVo.class.getSimpleName());
+    public List<TicketTimesPartnerVo> getTimesMongoList(String performancesId) {
+        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
     }
 
     @Override
-    public TicketTimesCreatePartnerVo getTimesMongo(String timesId) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(timesId)), TicketTimesCreatePartnerVo.class, TicketTimesCreatePartnerVo.class.getSimpleName());
+    public TicketTimesPartnerVo getTimesMongo(String timesId) {
+        return mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(timesId)), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
     }
 }

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

 package com.liquidnet.service.kylin.service.impl.partner;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
 import com.liquidnet.service.kylin.entity.*;
-import com.liquidnet.service.kylin.mapper.KylinTicketRelationsMapper;
-import com.liquidnet.service.kylin.mapper.KylinTicketStatusMapper;
-import com.liquidnet.service.kylin.mapper.KylinTicketsMapper;
+import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
 import com.mongodb.client.result.UpdateResult;
+import lombok.extern.slf4j.Slf4j;
 import org.bson.Document;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +40,7 @@ import java.util.List;
  * @since 2021-05-06
  */
 @Service
+@Slf4j
 public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapper, KylinTickets> implements IKylinTicketsPartnerService {
 
     @Autowired
@@ -51,6 +52,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     @Autowired
     private RedisUtil redisUtil;
 
+    @Autowired
+    private KylinPerformanceStatusMapper performanceStatusMapper;
+
+    @Autowired
+    private KylinTicketTimeRelationMapper ticketTimeRelationMapper;
+
     @Autowired
     private KylinTicketsMapper ticketsMapper;
 
@@ -61,78 +68,123 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     private KylinTicketRelationsMapper ticketRelationsMapper;
 
     @Override
-    public TicketCreatePartnerVo createTicket(TicketCreateParam ticketCreateParam) {
+    public TicketPartnerVo createTicketSummary(TicketCreateParam ticketCreateParam) {
+        TicketPartnerVo ticketPartnerVo = null;
+        //获取演出状态
+        KylinTicketTimeRelation timesRelations = ticketTimeRelationMapper.selectOne(
+                new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketCreateParam.getTimesId()));
+
+        if(null != timesRelations) {
+            KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
+                    new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", timesRelations.getPerformanceId()));
+            if(null == performanceStatus ){
+                ticketPartnerVo = createTicket(ticketCreateParam);
+                log.info(" PERFORMANCE 票 创建");
+            }else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
+                ticketPartnerVo = addNewTicket(ticketCreateParam);
+                log.info(" PERFORMANCE 票 添加");
+            } else {
+                ticketPartnerVo = createTicket(ticketCreateParam);
+                log.info(" PERFORMANCE 票 创建");
+            }
+        }else{
+            ticketPartnerVo = createTicket(ticketCreateParam);
+            log.info(" PERFORMANCE 票 创建");
+        }
+        return ticketPartnerVo;
+    }
+
+    @Override
+    public TicketPartnerVo createTicket(TicketCreateParam ticketCreateParam) {
         // 获取 主键id
         String ticketsId = IDGenerator.nextSnowId().toString();
         // 获取 当前时间 -> 创建时间
         LocalDateTime createdAt = LocalDateTime.now();
-
         ticketCreateParam.setTicketsId(ticketsId);
 
-        // mysql 操作
-//        ticketsMapper.insert(ticketCreateParam.kylinTickets(ticketsId, createdAt, null));
-//        ticketStatusMapper.insert(ticketCreateParam.kylinTicketStatus(ticketsId, createdAt, null));
-//        ticketRelationsMapper.insert(ticketCreateParam.kylinTicketRelations(ticketsId, createdAt, null));
+        // mongo 操作
+        TicketPartnerVo ticketPartnerVo = new TicketPartnerVo();
+        BeanUtils.copyProperties(ticketCreateParam, ticketPartnerVo);
+        ticketPartnerVo.setTicketsId(ticketsId);
+        ticketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketPartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+        TicketTimesPartnerVo ticketTimesPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
+        ticketPartnerVo.setUseStart(ticketTimesPartnerVo.getUseStart());
+        ticketPartnerVo.setUseEnd(ticketTimesPartnerVo.getUseEnd());
+        ticketPartnerVo.setType(ticketTimesPartnerVo.getType());
+        ticketPartnerVo.setStatus(0);
+        ticketPartnerVo.setDefault();
+
+        ticketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        TicketPartnerVo data = mongoTemplate.insert(
+                ticketPartnerVo, TicketPartnerVo.class.getSimpleName()
+        );
+
+        return ticketPartnerVo;
+    }
+
+    @Override
+    public TicketPartnerVo addNewTicket(TicketCreateParam ticketCreateParam) {
+        // 获取 主键id
+        String ticketsId = IDGenerator.nextSnowId().toString();
+        // 获取 当前时间 -> 创建时间
+        LocalDateTime createdAt = LocalDateTime.now();
+        ticketCreateParam.setTicketsId(ticketsId);
 
         // mongo 操作
-        TicketCreatePartnerVo ticketCreatePartnerVo = new TicketCreatePartnerVo();
-        BeanUtils.copyProperties(ticketCreateParam, ticketCreatePartnerVo);
-        ticketCreatePartnerVo.setTicketsId(ticketsId);
-        ticketCreatePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketCreatePartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketCreatePartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketCreatePartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-
-        TicketTimesCreatePartnerVo ticketTimesCreatePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())), TicketTimesCreatePartnerVo.class, TicketTimesCreatePartnerVo.class.getSimpleName());
-        ticketCreatePartnerVo.setUseStart(ticketTimesCreatePartnerVo.getUseStart());
-        ticketCreatePartnerVo.setUseEnd(ticketTimesCreatePartnerVo.getUseEnd());
-        ticketCreatePartnerVo.setType(ticketTimesCreatePartnerVo.getType());
-
-        ticketCreatePartnerVo.setDefault();
-
-        ticketCreatePartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        TicketCreatePartnerVo data = mongoTemplate.insert(
-                ticketCreatePartnerVo, TicketCreatePartnerVo.class.getSimpleName()
+        TicketPartnerVo ticketPartnerVo = new TicketPartnerVo();
+        BeanUtils.copyProperties(ticketCreateParam, ticketPartnerVo);
+        ticketPartnerVo.setTicketsId(ticketsId);
+        ticketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketPartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+
+        TicketTimesPartnerVo ticketTimesPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
+        ticketPartnerVo.setUseStart(ticketTimesPartnerVo.getUseStart());
+        ticketPartnerVo.setUseEnd(ticketTimesPartnerVo.getUseEnd());
+        ticketPartnerVo.setType(ticketTimesPartnerVo.getType());
+        ticketPartnerVo.setStatus(-2);
+        ticketPartnerVo.setDefault();
+
+        ticketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        TicketPartnerVo data = mongoTemplate.insert(
+                ticketPartnerVo, TicketPartnerVo.class.getSimpleName()
         );
 
-        // redis 操作
-        redisUtil.hset(KylinRedisConst.TICKET, ticketsId, ticketCreatePartnerVo);
-        return ticketCreatePartnerVo;
+        return ticketPartnerVo;
     }
 
     @Override
-    public TicketCreatePartnerVo updateTicket(TicketCreateParam ticketCreateParam) {
+    public TicketPartnerVo updateTicket(TicketCreateParam ticketCreateParam) {
         try {
             String ticketId = ticketCreateParam.getTicketsId();
             LocalDateTime updatedAt = LocalDateTime.now();
-            // mysql 操作
-//            KylinTickets tickets = ticketCreateParam.kylinTickets(ticketId, null, updatedAt);
-//            tickets.setUpdatedAt(updatedAt);
-//            ticketsMapper.update(tickets
-//                    , new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketId));
-
             // mongo 操作
-            TicketCreatePartnerVo ticketCreatePartnerVo = new TicketCreatePartnerVo();
-            BeanUtils.copyProperties(ticketCreateParam, ticketCreatePartnerVo);
-            ticketCreatePartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketCreatePartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketCreatePartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketCreatePartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketCreatePartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketCreatePartnerVo.setTimesId(null);
-            ticketCreatePartnerVo.setDefault();
-
-            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(ticketCreatePartnerVo));
-            Document doc = mongoTemplate.getCollection(TicketCreatePartnerVo.class.getSimpleName()).findOneAndUpdate(
+            TicketPartnerVo ticketPartnerVo = new TicketPartnerVo();
+            BeanUtils.copyProperties(ticketCreateParam, ticketPartnerVo);
+            ticketPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketPartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            ticketPartnerVo.setTimesId(null);
+            ticketPartnerVo.setStatus(null);
+            ticketPartnerVo.setDefault();
+
+            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(ticketPartnerVo));
+            Document doc = mongoTemplate.getCollection(TicketPartnerVo.class.getSimpleName()).findOneAndUpdate(
                     Query.query(Criteria.where("ticketsId").is(ticketId)).getQueryObject(),
                     object,
                     new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
 
             // redis 操作
-            TicketCreatePartnerVo ticketCreatePartnerVoData = JsonUtils.fromJson(doc.toJson(), TicketCreatePartnerVo.class);
-            redisUtil.hset(KylinRedisConst.TICKET, ticketId, ticketCreatePartnerVoData);
-            return ticketCreatePartnerVoData;
+            TicketPartnerVo ticketPartnerVoData = JsonUtils.fromJson(doc.toJson(), TicketPartnerVo.class);
+            return ticketPartnerVoData;
         } catch (Exception e) {
             return null;
         }
@@ -143,95 +195,77 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
 
-//            KylinTicketStatus ticketStatus = new KylinTicketStatus();
-//            ticketStatus.setUpdatedAt(updatedAt);
-//            ticketStatus.setStatus(-1);
-//            ticketStatusMapper.update(ticketStatus
-//                    , new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
+            KylinTicketRelations ticketRelations = ticketRelationsMapper.selectOne(
+                    new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", ticketsId));
+
+            KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
+                    new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketRelations.getTimesId()));
 
+            KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
+                    new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", ticketTimeRelation.getPerformanceId()));
+
+            if (performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {//未提审||被拒绝
                 // mongo 操作
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 map.put("status", -1);
 
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            Document doc = mongoTemplate.getCollection(TicketCreatePartnerVo.class.getSimpleName()).findOneAndUpdate(
+                Document doc = mongoTemplate.getCollection(TicketPartnerVo.class.getSimpleName()).findOneAndUpdate(
                         Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
                         object,
                         new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
                 );
-
-            // redis 操作
-            redisUtil.hset(KylinRedisConst.TICKET, ticketsId, JsonUtils.fromJson(doc.toJson(), TicketCreatePartnerVo.class));
-
                 return true;
+            } else {
+                return false;
+            }
         } catch (Exception e) {
             return false;
         }
     }
 
     @Override
-    public TicketCreatePartnerVo copyTicket(String ticketsId) {
+    public TicketPartnerVo copyTicket(String ticketsId) {
 
         // 获取 当前时间 -> 创建时间
         LocalDateTime createdAt = LocalDateTime.now();
 
-//        KylinTickets tickets = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketsId));
-//        tickets.setCreatedAt(createdAt);
-//        KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
-//        ticketStatus.setCreatedAt(createdAt);
-//        KylinTicketRelations ticketRelations = ticketRelationsMapper.selectOne(new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", ticketsId));
-//        ticketRelations.setCreatedAt(createdAt);
-//        String ticketsCopyId = IDGenerator.nextSnowId().toString();
-//        tickets.setTicketsId(ticketsCopyId);
-//        ticketStatus.setTicketId(ticketsCopyId);
-//        ticketStatus.setTicketStatusId(IDGenerator.nextSnowId().toString());
-//        ticketRelations.setTicketId(ticketsCopyId);
-//        ticketRelations.setTicketRelationsId(IDGenerator.nextSnowId().toString());
-//        ticketsMapper.insert(tickets);
-//        ticketStatusMapper.insert(ticketStatus);
-//        ticketRelationsMapper.insert(ticketRelations);
-
-        TicketCreatePartnerVo ticketCreatePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketsId").is(ticketsId)), TicketCreatePartnerVo.class, TicketCreatePartnerVo.class.getSimpleName());
-        ticketCreatePartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketCreatePartnerVo.setTicketsId(IDGenerator.nextSnowId().toString());
-
-        TicketCreatePartnerVo data = mongoTemplate.insert(
-                ticketCreatePartnerVo, TicketCreatePartnerVo.class.getSimpleName()
+        TicketPartnerVo ticketPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketsId").is(ticketsId)), TicketPartnerVo.class, TicketPartnerVo.class.getSimpleName());
+        ticketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        ticketPartnerVo.setTicketsId(IDGenerator.nextSnowId().toString());
+
+        TicketPartnerVo data = mongoTemplate.insert(
+                ticketPartnerVo, TicketPartnerVo.class.getSimpleName()
         );
 
-        redisUtil.hset(KylinRedisConst.TICKET, ticketsId, ticketCreatePartnerVo);
-        return ticketCreatePartnerVo;
+        redisUtil.hset(KylinRedisConst.TICKET, ticketsId, ticketPartnerVo);
+        return ticketPartnerVo;
     }
 
     @Override
     public boolean submitTicketByTimes(String timesId) {
         LocalDateTime updatedAt = LocalDateTime.now();
-//        KylinTicketStatus ticketStatus = new KylinTicketStatus();
-//        ticketStatus.setUpdatedAt(updatedAt);
-//        ticketStatus.setStatus(1);
-//        ticketStatusMapper.update(ticketStatus
-//                , new UpdateWrapper<KylinTicketStatus>().eq("time_id", timesId));
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("status", 1);
         map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-        UpdateResult updateResult = mongoTemplate.getCollection(TicketCreatePartnerVo.class.getSimpleName()).updateMany(
+        UpdateResult updateResult = mongoTemplate.getCollection(TicketPartnerVo.class.getSimpleName()).updateMany(
                 Query.query(Criteria.where("timesId").is(timesId)).getQueryObject(),
                 object
         );
-        return updateResult.getModifiedCount()<=0;
+        return updateResult.getModifiedCount() <= 0;
     }
 
     @Override
-    public List<TicketCreatePartnerVo> getTicketMongoList(String timesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("timesId").is(timesId)), TicketCreatePartnerVo.class, TicketCreatePartnerVo.class.getSimpleName());
+    public List<TicketPartnerVo> getTicketMongoList(String timesId) {
+        return mongoTemplate.find(Query.query(Criteria.where("timesId").is(timesId)), TicketPartnerVo.class, TicketPartnerVo.class.getSimpleName());
     }
 
     @Override
-    public TicketCreatePartnerVo getTicketsMongo(String ticketsId) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("ticketsId").is(ticketsId)), TicketCreatePartnerVo.class, TicketCreatePartnerVo.class.getSimpleName());
+    public TicketPartnerVo getTicketsMongo(String ticketsId) {
+        return mongoTemplate.findOne(Query.query(Criteria.where("ticketsId").is(ticketsId)), TicketPartnerVo.class, TicketPartnerVo.class.getSimpleName());
     }
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java

 package com.liquidnet.service.kylin.timerTask;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.TicketInventoryDto;
-import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
+import com.liquidnet.service.kylin.dto.param.PerformanceParam;
 import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.TicketVo;
-import com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketCreatePartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.impl.partner.KylinTicketTimesPartnerServiceImpl;
@@ -82,6 +79,11 @@ public class PerformanceVoTask {
     private KylinTicketsPartnerServiceImpl ticketsPartnerService;
 
 
+    /**
+     * 根据票状态判断 演出状态 票状态
+     *
+     * @param performanceSingleId
+     */
     public void performanceVoStatus(String performanceSingleId) {
 
         LocalDateTime timeNow = LocalDateTime.now();
@@ -115,7 +117,6 @@ public class PerformanceVoTask {
             int appStatus = 6;
             for (TicketTimesVo ticketTimesVoItem : timesData) {
                 //票
-//                List<TicketVo> ticketVoList = ticketTimesVoItem.getTicketVoList();
                 List<TicketVo> ticketVoList = mongoTemplate.find(
                         Query.query(Criteria.where("timeId").is(ticketTimesVoItem.getTimeId())),
                         TicketVo.class, TicketVo.class.getSimpleName()
@@ -136,8 +137,9 @@ public class PerformanceVoTask {
                         status10Count += 1;
                     } else {
                         //库存判断
-                        TicketInventoryDto ticketInventoryRedis = (TicketInventoryDto) redisUtil.hget(KylinRedisConst.PERFORMANCES_INVENTORY, ticketVoItem.getTicketsId());
-                        if (ticketInventoryRedis.getSurplusGeneral() > 0) {
+                        int surplusGeneral = (int) redisUtil.hget(KylinRedisConst.PERFORMANCES_INVENTORY+ticketVoItem.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL);
+
+                        if (surplusGeneral > 0) {
                             status = 6;
                         } else {
                             status = 8;
@@ -152,11 +154,6 @@ public class PerformanceVoTask {
                             Query.query(Criteria.where("ticketsId").is(ticketVoItem.getTicketsId())).getQueryObject(),
                             objectTicket
                     );
-//                    //修改场次 内 票数据
-//                    mongoTemplate.getCollection(TicketTimesVo.class.getSimpleName()).updateOne(
-//                            Query.query(Criteria.where("ticketVoList.ticketsId").is(ticketVoItem.getTicketsId())).getQueryObject(),
-//                            objectTicket
-//                    );
                     //演出状态
                     if (status == 6) {//单一票 可购买 则为可购买
                         appStatus = 6;
@@ -181,70 +178,141 @@ public class PerformanceVoTask {
 
     /**
      * 生成 PerformanceCreatePartnerVo(用于审核第一次提交数据)
+     *
      * @param performancesId
      * @return
      */
-    public PerformanceCreatePartnerVo createPerformanceCreateParam(String performancesId){
-        PerformanceCreateParam performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceCreateParam.class, PerformanceCreateParam.class.getSimpleName());
-        List<TicketTimesCreatePartnerVo> ticketTimesCreatePartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
+    public PerformanceMisVo createPerformanceCreateParam(String performancesId) {
+        PerformanceParam performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName());
+        List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
         List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
 
         ArrayList<BigDecimal> floatList = new ArrayList<>();
         ArrayList<String> StringList = new ArrayList<>();
 
-        for (TicketTimesCreatePartnerVo ticketTimes : ticketTimesCreatePartnerVos) {
+        for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVos) {
             TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
             BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
-            List<TicketCreatePartnerVo> ticketCreatePartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
-            ticketTimesTicketCreatePartnerVo.setTicket(ticketCreatePartnerVos);
+            List<TicketPartnerVo> ticketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
+            ticketTimesTicketCreatePartnerVo.setTicket(ticketPartnerVos);
             ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
-            for (TicketCreatePartnerVo ticketCreatePartnerVoItem : ticketCreatePartnerVos) {
-                floatList.add(ticketCreatePartnerVoItem.getPrice());
-                StringList.add(ticketCreatePartnerVoItem.getTimeEnd());
+            for (TicketPartnerVo ticketPartnerVoItem : ticketPartnerVos) {
+                floatList.add(ticketPartnerVoItem.getPrice());
+                StringList.add(ticketPartnerVoItem.getTimeEnd());
             }
         }
-        PerformanceCreatePartnerVo performanceCreatePartnerVo = new PerformanceCreatePartnerVo();
-        BeanUtils.copyProperties(performanceData, performanceCreatePartnerVo);
+        PerformanceMisVo performanceMisVo = new PerformanceMisVo();
+        BeanUtils.copyProperties(performanceData, performanceMisVo);
 
         floatList.sort(Comparator.reverseOrder());
         StringList.sort(Comparator.naturalOrder());
 
-        performanceCreatePartnerVo.setPrice(floatList.get(0) + "起");
-        performanceCreatePartnerVo.setStopSellTime(StringList.get(0));
-        performanceCreatePartnerVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
-        performanceCreatePartnerVo.setStatus(1);
-        performanceCreatePartnerVo.setStatusSell(1);
-        performanceCreatePartnerVo.setRejectTxt("");
+        performanceMisVo.setPrice(floatList.get(0) + "起");
+        performanceMisVo.setStopSellTime(StringList.get(0));
+        performanceMisVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
+        performanceMisVo.setStatus(1);
+        performanceMisVo.setStatusSell(1);
+        performanceMisVo.setRejectTxt("");
 
-        performanceCreatePartnerVo.setIsShow(1);
-        performanceCreatePartnerVo.setIsDistribution(0);
-        performanceCreatePartnerVo.setSyncAgent(0);
-        performanceCreatePartnerVo.setAuditStatus(0);
+        performanceMisVo.setIsShow(1);
+        performanceMisVo.setIsDistribution(0);
+        performanceMisVo.setSyncAgent(0);
+        performanceMisVo.setAuditStatus(0);
 
-        boolean exists = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceCreatePartnerVo.class, PerformanceCreatePartnerVo.class.getSimpleName());
+        boolean exists = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceMisVo.class, PerformanceMisVo.class.getSimpleName());
 
         if (!exists) {
-            PerformanceCreatePartnerVo data = mongoTemplate.insert(
-                    performanceCreatePartnerVo, PerformanceCreatePartnerVo.class.getSimpleName()
+            PerformanceMisVo data = mongoTemplate.insert(
+                    performanceMisVo, PerformanceMisVo.class.getSimpleName()
             );
         }
 
-        return performanceCreatePartnerVo;
+        return performanceMisVo;
+    }
+
+    /**
+     * 生成 PerformanceUpdatePartnerVo(用于修改审核提交数据)
+     *
+     * @param performancesId
+     * @return
+     */
+    public PerformanceMisVo setPerformanceUpdateParam(String performancesId) {
+        PerformanceParam performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName());
+        List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
+        List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
+
+        ArrayList<BigDecimal> floatList = new ArrayList<>();
+        ArrayList<String> StringList = new ArrayList<>();
+
+        for (TicketTimesPartnerVo ticketTimes : ticketTimesPartnerVos) {
+            TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
+            BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
+            List<TicketPartnerVo> ticketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
+            ticketTimesTicketCreatePartnerVo.setTicket(ticketPartnerVos);
+            ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
+            for (TicketPartnerVo ticketPartnerVoItem : ticketPartnerVos) {
+                floatList.add(ticketPartnerVoItem.getPrice());
+                StringList.add(ticketPartnerVoItem.getTimeEnd());
             }
+        }
+        PerformanceMisVo performanceMisVo = new PerformanceMisVo();
+        BeanUtils.copyProperties(performanceData, performanceMisVo);
+
+        floatList.sort(Comparator.reverseOrder());
+        StringList.sort(Comparator.naturalOrder());
+
+        performanceMisVo.setPrice(floatList.get(0) + "起");
+        performanceMisVo.setStopSellTime(StringList.get(0));
+        performanceMisVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
+        performanceMisVo.setStatus(1);
+        performanceMisVo.setRejectTxt("");
+        performanceMisVo.setAuditStatus(0);
+        KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+        performanceMisVo.setStatusSell(performanceStatus.getStatusSell());
+        performanceMisVo.setIsShow(performanceStatus.getIsShow());
+        performanceMisVo.setIsDistribution(performanceStatus.getIsDistribution());
+        performanceMisVo.setSyncAgent(performanceStatus.getSyncAgent());
+
 
-    public void createPerformanceMySql(String performancesId,HashMap<String, Object> map,PerformanceCreatePartnerVo performanceCreatePartnerVo,LocalDateTime updatedAt){
+
+        boolean exists = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceMisVo.class, PerformanceMisVo.class.getSimpleName());
+
+        if (!exists) {
+            mongoTemplate.insert(
+                    performanceMisVo, PerformanceMisVo.class.getSimpleName()
+            );
+        }else{
+            BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(performanceMisVo));
+            mongoTemplate.getCollection(PerformanceMisVo.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
+                    object
+            );
+        }
+
+        return performanceMisVo;
+    }
+
+    /**
+     * 插入数据库
+     *
+     * @param performancesId
+     * @param map
+     * @param performanceMisVo
+     * @param updatedAt
+     */
+    public void createPerformanceMySql(String performancesId, HashMap<String, Object> map, PerformanceMisVo performanceMisVo, LocalDateTime updatedAt) {
         try {
             //创建演出
             KylinPerformances performances = new KylinPerformances();
-            BeanUtils.copyProperties(performanceCreatePartnerVo, performances);
+            BeanUtils.copyProperties(performanceMisVo, performances);
             KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
-            BeanUtils.copyProperties(performanceCreatePartnerVo, performanceStatus);
+            BeanUtils.copyProperties(performanceMisVo, performanceStatus);
             KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
-            BeanUtils.copyProperties(performanceCreatePartnerVo, performanceRelations);
+            BeanUtils.copyProperties(performanceMisVo, performanceRelations);
 
-            performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceCreatePartnerVo.getCreatedAt())));
-            performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceCreatePartnerVo.getTimeStart())));
-            performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceCreatePartnerVo.getTimeEnd())));
+            performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceMisVo.getCreatedAt())));
+            performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceMisVo.getTimeStart())));
+            performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceMisVo.getTimeEnd())));
             performances.setUpdatedAt(updatedAt);
 
             performanceStatus.setPerformanceId(performances.getPerformancesId());
@@ -264,8 +332,8 @@ public class PerformanceVoTask {
 
 
             //场次数据
-            List<TicketTimesCreatePartnerVo> ticketTimesCreatePartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
-            for (TicketTimesCreatePartnerVo ticketTimeItem : ticketTimesCreatePartnerVos) {
+            List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
+            for (TicketTimesPartnerVo ticketTimeItem : ticketTimesPartnerVos) {
                 //创建场次
                 KylinTicketTimes ticketTimes = new KylinTicketTimes();
                 BeanUtils.copyProperties(ticketTimeItem, ticketTimes);
@@ -287,22 +355,22 @@ public class PerformanceVoTask {
                 ticketTimeRelationMapper.insert(ticketTimeRelation);
 
                 //修改票
-                for (TicketCreatePartnerVo ticketItem : ticketsPartnerService.getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
+                for (TicketPartnerVo ticketItem : ticketsPartnerService.getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
                     BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                    Document docTicket = mongoTemplate.getCollection(TicketCreatePartnerVo.class.getSimpleName()).findOneAndUpdate(
+                    Document docTicket = mongoTemplate.getCollection(TicketPartnerVo.class.getSimpleName()).findOneAndUpdate(
                             Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(),
                             objectTicketVo,
                             new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
                     );
-                    TicketCreatePartnerVo ticketCreatePartnerVo = JsonUtils.fromJson(docTicket.toJson(), TicketCreatePartnerVo.class);
+                    TicketPartnerVo ticketPartnerVo = JsonUtils.fromJson(docTicket.toJson(), TicketPartnerVo.class);
 
                     //创建演出
                     KylinTickets tickets = new KylinTickets();
-                    BeanUtils.copyProperties(ticketCreatePartnerVo, tickets);
+                    BeanUtils.copyProperties(ticketPartnerVo, tickets);
                     KylinTicketStatus ticketStatus = new KylinTicketStatus();
-                    BeanUtils.copyProperties(ticketCreatePartnerVo, ticketStatus);
+                    BeanUtils.copyProperties(ticketPartnerVo, ticketStatus);
                     KylinTicketRelations ticketRelations = new KylinTicketRelations();
-                    BeanUtils.copyProperties(ticketCreatePartnerVo, ticketRelations);
+                    BeanUtils.copyProperties(ticketPartnerVo, ticketRelations);
 
                     tickets.setPriceExpress(new BigDecimal("0.00"));
                     tickets.setPriceDiscountMember(new BigDecimal("0.00"));
@@ -336,8 +404,141 @@ public class PerformanceVoTask {
                     ticketRelationsMapper.insert(ticketRelations);
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
+
+        }
+    }
+
+    /**
+     * 修改数据库
+     *
+     * @param performancesId
+     * @param map
+     * @param performanceUpdateMisVo
+     * @param updatedAt
+     */
+    public void updatePerformanceMySql(String performancesId, HashMap<String, Object> map, PerformanceMisVo performanceUpdateMisVo, LocalDateTime updatedAt) {
+        try {
+            //创建演出
+            KylinPerformances performances = new KylinPerformances();
+            BeanUtils.copyProperties(performanceUpdateMisVo, performances);
+            KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
+            BeanUtils.copyProperties(performanceUpdateMisVo, performanceStatus);
+            KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
+            BeanUtils.copyProperties(performanceUpdateMisVo, performanceRelations);
+
+            performances.setCreatedAt(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getCreatedAt())));
+            performances.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeStart())));
+            performances.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(performanceUpdateMisVo.getTimeEnd())));
+            performances.setUpdatedAt(updatedAt);
+
+            performanceStatus.setPerformanceId(performances.getPerformancesId());
+            performanceStatus.setPerformanceStatusId(IDGenerator.nextSnowId().toString());
+            performanceStatus.setCreatedAt(null);
+            performanceStatus.setAuditStatus(0);
+            performanceStatus.setUpdatedAt(updatedAt);
+
+            performanceRelations.setPerformanceId(performances.getPerformancesId());
+            performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId().toString());
+            performanceRelations.setCreatedAt(null);
+            performanceRelations.setUpdatedAt(updatedAt);
+
+            performancesMapper.update(performances,new UpdateWrapper<KylinPerformances>().eq("performances_id",performances.getPerformancesId()));
+            performanceStatusMapper.update(performanceStatus,new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performances.getPerformancesId()));
+            performanceRelationsMapper.update(performanceRelations,new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id",performances.getPerformancesId()));
+
+
+            //场次数据
+            List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
+            for (TicketTimesPartnerVo ticketTimeItem : ticketTimesPartnerVos) {
+                //创建场次
+                KylinTicketTimes ticketTimes = new KylinTicketTimes();
+                BeanUtils.copyProperties(ticketTimeItem, ticketTimes);
+                KylinTicketTimeRelation ticketTimeRelation = new KylinTicketTimeRelation();
+                BeanUtils.copyProperties(ticketTimeItem, ticketTimeRelation);
+
+                ticketTimes.setUseStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseStart())));
+                ticketTimes.setUseEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseEnd())));
+                ticketTimes.setCreatedAt(null);
+                ticketTimes.setUpdatedAt(updatedAt);
+
+                ticketTimeRelation.setPerformanceId(performancesId);
+                ticketTimeRelation.setTicketTimeRelationId(IDGenerator.nextSnowId().toString());
+                ticketTimeRelation.setTimesId(ticketTimes.getTicketTimesId());
+                ticketTimeRelation.setCreatedAt(null);
+                ticketTimeRelation.setUpdatedAt(updatedAt);
+
+                ticketTimesMapper.update(ticketTimes,new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id",ticketTimes.getTicketTimesId()));
+                ticketTimeRelationMapper.update(ticketTimeRelation,new UpdateWrapper<KylinTicketTimeRelation>().eq("ticket_time_id",ticketTimes.getTicketTimesId()));
+
+                //修改票
+                for (TicketPartnerVo ticketItem : ticketsPartnerService.getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
+                    TicketPartnerVo ticketPartnerVo;
+                    if(ticketItem.getStatus()!=7){
+                        BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
+                        Document docTicket = mongoTemplate.getCollection(TicketPartnerVo.class.getSimpleName()).findOneAndUpdate(
+                                Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(),
+                                objectTicketVo,
+                                new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                        );
+                        ticketPartnerVo = JsonUtils.fromJson(docTicket.toJson(), TicketPartnerVo.class);
+                    }else{
+                        ticketPartnerVo = mongoTemplate.findOne(
+                                Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())),
+                                TicketPartnerVo.class,
+                                TicketPartnerVo.class.getSimpleName()
+                        );
+                    }
+
+                    //创建演出
+                    KylinTickets tickets = new KylinTickets();
+                    BeanUtils.copyProperties(ticketPartnerVo, tickets);
+                    KylinTicketStatus ticketStatus = new KylinTicketStatus();
+                    BeanUtils.copyProperties(ticketPartnerVo, ticketStatus);
+                    KylinTicketRelations ticketRelations = new KylinTicketRelations();
+                    BeanUtils.copyProperties(ticketPartnerVo, ticketRelations);
+
+                    tickets.setPriceExpress(new BigDecimal("0.00"));
+                    tickets.setPriceDiscountMember(new BigDecimal("0.00"));
+                    tickets.setPriceDiscount(new BigDecimal("0.00"));
+                    tickets.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeStart())));
+                    tickets.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEnd())));
+                    tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
+                    tickets.setUseStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseStart())));
+                    tickets.setUseEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseEnd())));
+                    tickets.setSaleRemindMinute(60);
+                    tickets.setCreatedAt(null);
+                    tickets.setUpdatedAt(updatedAt);
+
+                    ticketStatus.setTicketStatusId(IDGenerator.nextSnowId().toString());
+                    ticketStatus.setTicketId(tickets.getTicketsId());
+                    ticketStatus.setCounts(1);
+                    ticketStatus.setIsMember(null);
+                    ticketStatus.setStatusExchange(7);
+                    ticketStatus.setQrCodeShowTime(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getQrCodeShowTime())));
+                    //不改动数据 价格 限购 购票时间
+                    ticketStatus.setLimitCount(null);
+                    ticketStatus.setTotalGeneral(null);
+                    ticketStatus.setTotalExchange(null);
+                    tickets.setTimeStart(null);
+                    tickets.setTimeEnd(null);
+
+                    ticketRelations.setCreatedAt(null);
+                    ticketRelations.setUpdatedAt(updatedAt);
+
+                    ticketRelations.setTicketRelationsId(IDGenerator.nextSnowId().toString());
+                    ticketRelations.setTicketId(tickets.getTicketsId());
+                    ticketRelations.setCreatedAt(null);
+                    ticketRelations.setUpdatedAt(updatedAt);
+
+                    ticketsMapper.update(tickets,new UpdateWrapper<KylinTickets>().eq("tickets_id",tickets.getTicketsId()));
+                    ticketStatusMapper.update(ticketStatus,new UpdateWrapper<KylinTicketStatus>().eq("tickets_id",tickets.getTicketsId()));
+                    ticketRelationsMapper.update(ticketRelations,new UpdateWrapper<KylinTicketRelations>().eq("tickets_id",tickets.getTicketsId()));
+                }
+            }
+        } catch (Exception e) {
 
         }
     }
+
 }