Merge remote-tracking branch 'origin/dev' into dev

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/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/PerformanceStep1Param.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;
 
 @Data
@@ -13,24 +14,30 @@ public class PerformanceStep1Param implements Serializable {
     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 = "")
@@ -40,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")
@@ -49,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 = "演出结束时间")
@@ -69,6 +71,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) {

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/service/partner/IKylinPerformancesPartnerService.java

@@ -45,19 +45,19 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
      */
     PerformancePartnerVo getStep1(String performancesId);
 
-    /**
-     * 获取创建演出第一步数据
-     * @param performancesId
-     * @return
-     */
-    PerformanceParam getCreateStep1(String performancesId);
-
-    /**
-     * 获取修改演出第一步数据
-     * @param performancesId
-     * @return
-     */
-    PerformanceParam getUpdateStep1(String performancesId);
+//    /**
+//     * 获取创建演出第一步数据
+//     * @param performancesId
+//     * @return
+//     */
+//    PerformanceParam getCreateStep1(String performancesId);
+//
+//    /**
+//     * 获取修改演出第一步数据
+//     * @param performancesId
+//     * @return
+//     */
+//    PerformanceParam getUpdateStep1(String performancesId);
 
 
     /**
@@ -83,13 +83,15 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
 
     PerformanceStep2Param getStep2(String performancesId);
 
-    PerformanceStep2Param getCreateStep2(String performancesId);
-
-    PerformanceStep2Param getUpdateStep2(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-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinPerformancesAdminController.java

@@ -14,6 +14,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;
 
 /**
@@ -35,7 +36,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>> performanceDetails(@RequestBody @Valid PerformanceAdminListParam performanceAdminListParam) {
         PageInfo<PerformanceAdminListDao> result = null;
         result = performancesAdminService.getList(performanceAdminListParam);
         if (null != result) {
@@ -61,7 +62,7 @@ public class KylinPerformancesAdminController {
     @GetMapping(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> performanceDetails(@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("审核完成");

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

@@ -36,7 +36,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>> performanceDetails(@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) {

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

@@ -33,6 +33,19 @@ public class PerformancePartnerController {
         }
     }
 
+    @PostMapping(value = "copy")
+    @ApiOperation(value = "演出列表")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> copyPerformance(@RequestParam("performancesId") String performancesId) {
+        String result = performancesPartnerService.copyPerformance(performancesId);
+        if (null == result) {
+            return ResponseDto.failure("复制失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
+
     @GetMapping(value = "step1")
     @ApiOperation(value = "获取演出第一步数据")
     @ApiResponse(code = 200, message = "接口返回对象参数")

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

@@ -193,34 +193,40 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     @Override
     public PerformancePartnerVo getStep1(String performancesId) {
         PerformancePartnerVo performancePartnerVo = new PerformancePartnerVo();
-        PerformanceParam updateData = getUpdateStep1(performancesId);
-        BeanUtils.copyProperties(updateData, performancePartnerVo);
-        log.info(" PERFORMANCE  演出第一步 获取");
-        return performancePartnerVo;
-    }
-
-    @Override
-    public PerformanceParam getCreateStep1(String performancesId) {
+//        PerformanceParam updateData = getUpdateStep1(performancesId);
         PerformanceParam data = mongoTemplate.findOne(
                 Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceParam.class, PerformanceParam.class.getSimpleName()
         );
         if (data == null) {
-            return new PerformanceParam();
+            return performancePartnerVo;
         }
-        return data;
+        BeanUtils.copyProperties(data, performancePartnerVo);
+        log.info(" PERFORMANCE  演出第一步 获取");
+        return performancePartnerVo;
     }
 
-    @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 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) {
@@ -404,49 +410,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     @Override
     public PerformanceStep2Param getStep2(String performancesId) {
         PerformanceStep2Param performanceCreatePartnerVo = null;
-        performanceCreatePartnerVo = getUpdateStep2(performancesId);
-        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>();
 
@@ -461,10 +430,67 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         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) {
         try {
@@ -643,6 +669,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();