提交

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

 package com.liquidnet.service.kylin.dto.param;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class PerformanceStep2Param implements Serializable {
@@ -23,4 +25,7 @@ public class PerformanceStep2Param implements Serializable {
 
     @ApiModelProperty(value = "第三方id", example = "0")
     private String merchantId;
+
+    @ApiModelProperty(value = "场次数据",hidden = true)
+    private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
 }

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.partner;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 @Data
-public class PerformanceVo {
+public class PerformanceCreatePartnerVo {
 
     //演出数据
     @ApiModelProperty(value = "主键id")
@@ -114,6 +113,6 @@ public class PerformanceVo {
 
     //场次数据
     @ApiModelProperty(value = "场次数据")
-    private List<TicketTimesTicketVo> ticketTimes;
+    private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
 
 }

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.partner;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * 修改场地全部显示数据参数
  */
 @Data
-public class TicketVo implements Serializable {
+public class TicketCreatePartnerVo implements Serializable {
     @ApiModelProperty(value = "主键")
     private String ticketsId;
 

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.partner;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,7 +8,7 @@ import java.io.Serializable;
 //返回
 
 @Data
-public class TicketTimesVo implements Serializable {
+public class TicketTimesCreatePartnerVo implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String ticketTimesId;
 

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.partner;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +9,7 @@ import java.util.List;
 //包含 票
 
 @Data
-public class TicketTimesTicketVo implements Serializable {
+public class TicketTimesTicketCreatePartnerVo implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String ticketTimesId;
 
@@ -23,7 +23,7 @@ public class TicketTimesTicketVo implements Serializable {
     private String useStart;
 
     @ApiModelProperty(value = "场次适用结束时间")
-    private String useSEnd;
+    private String useEnd;
 
     @ApiModelProperty(value = "状态 0不可见 1可见")
     private int status;
@@ -39,5 +39,5 @@ public class TicketTimesTicketVo implements Serializable {
 
     //票
     @ApiModelProperty(value = "票数据")
-    private List<TicketVo> ticket;
+    private List<TicketCreatePartnerVo> ticket;
 }

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

 package com.liquidnet.service.kylin.service.admin;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 /**
@@ -14,7 +14,7 @@ import com.liquidnet.service.kylin.entity.KylinPerformances;
  */
 public interface IKylinPerformancesAdminService extends IService<KylinPerformances> {
 
-    PerformanceVo performanceDetails(String performancesId);
+    PerformanceCreatePartnerVo performanceDetails(String performancesId);
 
     boolean performanceAudit(String performancesId,int status ,String rejectTxt);
 }

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

 package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
@@ -19,4 +20,7 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
 
     boolean createStep2(PerformanceStep2Param step1Param);
 
+    PerformanceStep1Param getStep1(String performancesId);
+
+    PerformanceStep2Param getStep2(String performancesId);
 }

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

@@ -2,8 +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.TicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.TicketVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 
 import java.util.List;
@@ -18,11 +17,13 @@ import java.util.List;
  */
 public interface IKylinTicketTimesPartnerService extends IService<KylinTicketTimes> {
 
-    TicketTimesVo createTimes(CreateTicketTimesParam createTicketTimesParam);
+    TicketTimesCreatePartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam);
 
     Boolean deleteTimes(String ticketTimesId);
 
-    TicketTimesVo changeTimes(CreateTicketTimesParam createTicketTimesParam);
+    TicketTimesCreatePartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam);
 
-    List<TicketTimesVo> getTimesMongo(String performancesId);
+    List<TicketTimesCreatePartnerVo> getTimesMongoList(String performancesId);
+
+    TicketTimesCreatePartnerVo 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,8 +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.TicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.TicketVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketCreatePartnerVo;
 import com.liquidnet.service.kylin.entity.KylinTickets;
 
 import java.util.List;
@@ -18,16 +17,17 @@ import java.util.List;
  */
 public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
 
-    TicketVo createTicket(TicketCreateParam ticketCreateParam);
+    TicketCreatePartnerVo createTicket(TicketCreateParam ticketCreateParam);
 
-    TicketVo updateTicket(TicketCreateParam ticketCreateParam);
+    TicketCreatePartnerVo updateTicket(TicketCreateParam ticketCreateParam);
 
     boolean deleteTicket(String ticketsId);
 
-    TicketVo copyTicket(String ticketsId);
-
-    List<TicketVo> getTicketMongo(String timesId);
+    TicketCreatePartnerVo copyTicket(String ticketsId);
 
     boolean submitTicketByTimes(String timesId);
 
+    List<TicketCreatePartnerVo> getTicketMongoList(String timesId);
+
+    TicketCreatePartnerVo getTicketsMongo(String ticketsId);
 }

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

@@ -2,9 +2,7 @@ package com.liquidnet.service.kylin.controller.admin;
 
 
 import com.liquidnet.service.ResponseDto;
-import com.liquidnet.service.kylin.dao.FieldMisDetailsDao;
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
-import com.liquidnet.service.kylin.service.impl.admin.FieldsAdminServiceImpl;
+import com.liquidnet.service.kylin.dto.vo.partner.PerformanceCreatePartnerVo;
 import com.liquidnet.service.kylin.service.impl.admin.KylinPerformancesAdminServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author liquidnet
  * @since 2021-05-05
  */
-@Api("后端-演出")
+@Api(tags = "后端-演出")
 @RestController
 @RequestMapping("admin/performance")
 public class KylinPerformancesAdminController {
@@ -33,9 +31,9 @@ public class KylinPerformancesAdminController {
 
     @GetMapping(value = "details")
     @ApiOperation(value = "获取演出详情")
-    @ApiResponse(response = PerformanceVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<PerformanceVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
-        PerformanceVo result = null;
+    @ApiResponse(response = PerformanceCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<PerformanceCreatePartnerVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
+        PerformanceCreatePartnerVo result = null;
         result = performancesAdminService.performanceDetails(performancesId);
         if (null != result) {
             return ResponseDto.success(result);

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

@@ -3,8 +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.param.PerformanceStep1Param;
-import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinTicketTimesPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * @author liquidnet
  * @since 2021-05-06
  */
-@Api("第三方-场次")
+@Api(tags = "第三方-场次")
 @RestController
 @RequestMapping("partner/times")
 public class KylinTicketTimesPartnerController {
@@ -30,9 +29,9 @@ public class KylinTicketTimesPartnerController {
 
     @PostMapping(value = "")
     @ApiOperation(value = "创建场次")
-    @ApiResponse(response = TicketTimesVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesVo> createTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
-        TicketTimesVo result = null;
+    @ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketTimesCreatePartnerVo> createTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
+        TicketTimesCreatePartnerVo result = null;
         result = ticketTimesPartnerService.createTimes(createTicketTimesParam);
         if (null == result) {
             return ResponseDto.failure("创建失败");
@@ -43,7 +42,7 @@ public class KylinTicketTimesPartnerController {
 
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除场次")
-    @ApiResponse(response = TicketTimesVo.class, code = 200, message = "接口返回对象参数")
+    @ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
     public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") String ticketTimesId) {
         boolean result = ticketTimesPartnerService.deleteTimes(ticketTimesId);
         if (result) {
@@ -55,9 +54,9 @@ public class KylinTicketTimesPartnerController {
 
     @PutMapping(value = "")
     @ApiOperation(value = "修改场次")
-    @ApiResponse(response = TicketTimesVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesVo> deleteTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
-        TicketTimesVo result = null;
+    @ApiResponse(response = TicketTimesCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketTimesCreatePartnerVo> deleteTimes(@RequestBody CreateTicketTimesParam createTicketTimesParam) {
+        TicketTimesCreatePartnerVo result = null;
         result = ticketTimesPartnerService.changeTimes(createTicketTimesParam);
         if (null == result) {
             return ResponseDto.failure("修改失败");
@@ -66,4 +65,18 @@ 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;
+        result = ticketTimesPartnerService.getTimesMongo(ticketTimesId);
+        if (null == result) {
+            return ResponseDto.failure("查询场次信息失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
+
 }

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

@@ -3,11 +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.FieldsVo;
-import com.liquidnet.service.kylin.dto.vo.TicketVo;
-import com.liquidnet.service.kylin.mapper.KylinTicketsMapper;
-import com.liquidnet.service.kylin.service.impl.KylinTicketsServiceImpl;
-import com.liquidnet.service.kylin.service.impl.partner.FieldsPartnerServiceImpl;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketCreatePartnerVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * @author liquidnet
  * @since 2021-05-06
  */
-@Api("第三方-票")
+@Api(tags = "第三方-票")
 @RestController
 @RequestMapping("partner/ticket")
 public class KylinTicketsPartnerController {
@@ -33,9 +29,9 @@ public class KylinTicketsPartnerController {
 
     @PostMapping(value = "")
     @ApiOperation(value = "创建票务")
-    @ApiResponse(response = TicketVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketVo> createTicket(@RequestBody TicketCreateParam ticketCreateParam) {
-        TicketVo result = null;
+    @ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketCreatePartnerVo> createTicket(@RequestBody TicketCreateParam ticketCreateParam) {
+        TicketCreatePartnerVo result = null;
         result = ticketsPartnerService.createTicket(ticketCreateParam);
         if (null == result) {
             return ResponseDto.failure("创建票务失败");
@@ -46,9 +42,9 @@ public class KylinTicketsPartnerController {
 
     @PutMapping(value = "")
     @ApiOperation(value = "修改票务")
-    @ApiResponse(response = TicketVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketVo> updateTicket(@RequestBody TicketCreateParam ticketCreateParam) {
-        TicketVo result = null;
+    @ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketCreatePartnerVo> updateTicket(@RequestBody TicketCreateParam ticketCreateParam) {
+        TicketCreatePartnerVo result = null;
         result = ticketsPartnerService.updateTicket(ticketCreateParam);
         if (null == result) {
             return ResponseDto.failure("修改票务失败");
@@ -71,9 +67,9 @@ public class KylinTicketsPartnerController {
 
     @PostMapping(value = "/copy")
     @ApiOperation(value = "复制票务")
-    @ApiResponse(response = TicketVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
-        TicketVo result = null;
+    @ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketCreatePartnerVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
+        TicketCreatePartnerVo result = null;
         result = ticketsPartnerService.copyTicket(ticketsId);
         if (null == result) {
             return ResponseDto.failure("复制票务失败");
@@ -81,4 +77,17 @@ public class KylinTicketsPartnerController {
             return ResponseDto.success(result);
         }
     }
+
+    @GetMapping(value = "/details")
+    @ApiOperation(value = "获取票务详情")
+    @ApiResponse(response = TicketCreatePartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<TicketCreatePartnerVo> getTicketsMongo(@RequestParam("ticketsId") String ticketsId) {
+        TicketCreatePartnerVo result = null;
+        result = ticketsPartnerService.getTicketsMongo(ticketsId);
+        if (null == result) {
+            return ResponseDto.failure("查询票务信息失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
 }

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

@@ -10,7 +10,7 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-@Api("第三方-演出")
+@Api(tags = "第三方-演出")
 @RestController
 @RequestMapping("partner/performance")
 public class PerformancePartnerController {
@@ -42,4 +42,28 @@ public class PerformancePartnerController {
         }
     }
 
+    @GetMapping(value = "step1")
+    @ApiOperation(value = "获取演出第一步数据")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PerformanceStep1Param> createStep1(@RequestParam("performancesId") String performancesId) {
+        PerformanceStep1Param result = performancesPartnerService.getStep1(performancesId);
+        if (result==null) {
+            return ResponseDto.failure("获取数据失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
+    @GetMapping(value = "step2")
+    @ApiOperation(value = "获取演出第二步数据")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PerformanceStep2Param> createStep2(@RequestParam("performancesId") String performancesId) {
+        PerformanceStep2Param result = performancesPartnerService.getStep2(performancesId);
+        if (result == null) {
+            return ResponseDto.failure("获取数据失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
 }

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

@@ -5,19 +5,25 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.dto.param.PerformanceCreateParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
-import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
+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.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
+import com.mongodb.BasicDBObject;
 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;
 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.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -34,6 +40,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     @Autowired
     private MongoTemplate mongoTemplate;
 
+    @Autowired
+    private MongoConverter mongoConverter;
+
     @Autowired
     private KylinTicketsPartnerServiceImpl ticketsPartnerService;
 
@@ -67,41 +76,118 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         // 获取 当前时间 -> 创建时间
         LocalDateTime createdAt = LocalDateTime.now();
 
+        PerformanceStep1Param info = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)),
+                PerformanceStep1Param.class,
+                PerformanceStep1Param.class.getSimpleName());
+
+        boolean isExists = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(0)),
+                PerformanceCreateParam.class,
+                PerformanceCreateParam.class.getSimpleName());
+
+        boolean isExistsSubmit = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(1)),
+                PerformanceCreateParam.class,
+                PerformanceCreateParam.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("isSubmit", step2Param.getIsSubmit());
+        map.put("merchantId", step2Param.getMerchantId());
+
+        //演出新增数据
+        PerformanceCreateParam performanceCreateParam = new PerformanceCreateParam();
+        BeanUtils.copyProperties(info, performanceCreateParam);
+        performanceCreateParam.setIsTrueName(step2Param.getIsTrueName());
+        performanceCreateParam.setLimitCount(step2Param.getLimitCount());
+        performanceCreateParam.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        performanceCreateParam.setIsSubmit(step2Param.getIsSubmit());
+        performanceCreateParam.setMerchantId(step2Param.getMerchantId());
+
         // 获取第一步数据
         if (step2Param.getIsSubmit() == 1) { // 提交
-            PerformanceStep1Param info = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)),
-                    PerformanceStep1Param.class,
-                    PerformanceStep1Param.class.getSimpleName());
-
-            PerformanceCreateParam isExists = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)),
-                    PerformanceCreateParam.class,
-                    PerformanceCreateParam.class.getSimpleName());
-            if(isExists!=null){
-                return false;
+            if (isExists) {
+                map.put("status", 1);
+                BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
+                mongoTemplate.getCollection(PerformanceCreateParam.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
+                        object
+                );
+            }else{
+                // 提交 演出
+                performanceCreateParam.setStatus(1);
+                PerformanceCreateParam data = mongoTemplate.insert(
+                        performanceCreateParam, PerformanceCreateParam.class.getSimpleName()
+                );
             }
 
-            // 提交 演出
-            PerformanceCreateParam performanceCreateParam = new PerformanceCreateParam();
-            BeanUtils.copyProperties(info, performanceCreateParam);
-            performanceCreateParam.setIsTrueName(step2Param.getIsTrueName());
-            performanceCreateParam.setLimitCount(step2Param.getLimitCount());
-            performanceCreateParam.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            performanceCreateParam.setStatus(1);
-            performanceCreateParam.setIsSubmit(step2Param.getIsSubmit());
-            performanceCreateParam.setMerchantId(step2Param.getMerchantId());
-            PerformanceCreateParam data = mongoTemplate.insert(
-                    performanceCreateParam, PerformanceCreateParam.class.getSimpleName()
-            );
 
             //提交 票
-            List<TicketTimesVo> ticketTimesVoList = ticketTimesPartnerService.getTimesMongo(performanceId);
-            for (TicketTimesVo ticketTimes : ticketTimesVoList) {
+            List<TicketTimesCreatePartnerVo> ticketTimesCreatePartnerVoList = ticketTimesPartnerService.getTimesMongo(performanceId);
+            for (TicketTimesCreatePartnerVo ticketTimes : ticketTimesCreatePartnerVoList) {
                 ticketsPartnerService.submitTicketByTimes(ticketTimes.getTicketTimesId());
             }
         } else { //保存
-            return false;
+            if (isExists) {
+                map.put("status", 0);
+                BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
+                mongoTemplate.getCollection(PerformanceCreateParam.class.getSimpleName()).updateMany(
+                        Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
+                        object
+                );
+            }else {
+                // 保存 演出
+                performanceCreateParam.setStatus(0);
+                PerformanceCreateParam data = mongoTemplate.insert(
+                        performanceCreateParam, PerformanceCreateParam.class.getSimpleName()
+                );
+            }
         }
 
         return true;
     }
+
+    @Override
+    public PerformanceStep1Param getStep1(String performancesId) {
+        PerformanceStep1Param data = mongoTemplate.findOne(
+                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceStep1Param.class,PerformanceStep1Param.class.getSimpleName()
+        );
+        if(data==null){
+            return new PerformanceStep1Param();
+        }
+        return data;
+    }
+
+    @Override
+    public PerformanceStep2Param getStep2(String performancesId) {
+        PerformanceCreateParam data = mongoTemplate.findOne(
+                Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceCreateParam.class,PerformanceCreateParam.class.getSimpleName()
+        );
+
+        if(data==null){
+            return new PerformanceStep2Param();
+        }
+
+        List<TicketTimesCreatePartnerVo> ticketTimesCreatePartnerVos = ticketTimesPartnerService.getTimesMongo(performancesId);
+        List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
+
+        for (TicketTimesCreatePartnerVo ticketTimes : ticketTimesCreatePartnerVos) {
+            TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
+            BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
+            List<TicketCreatePartnerVo> ticketCreatePartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
+            ticketTimesTicketCreatePartnerVo.setTicket(ticketCreatePartnerVos);
+            ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
+        }
+
+        PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param();
+        BeanUtils.copyProperties(data,performanceStep2Param);
+        performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
+
+        return performanceStep2Param;
+    }
 }

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.TicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.TicketVo;
-import com.liquidnet.service.kylin.entity.KylinTicketTimeRelation;
+import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesCreatePartnerVo;
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 import com.liquidnet.service.kylin.mapper.KylinTicketTimeRelationMapper;
 import com.liquidnet.service.kylin.mapper.KylinTicketTimesMapper;
@@ -59,7 +56,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     private MongoConverter mongoConverter;
 
     @Override
-    public TicketTimesVo createTimes(CreateTicketTimesParam createTicketTimesParam) {
+    public TicketTimesCreatePartnerVo createTimes(CreateTicketTimesParam createTicketTimesParam) {
 
         // 获取 主键id
         String ticketTimesId = IDGenerator.nextSnowId().toString();
@@ -90,23 +87,23 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
 //        ticketTimeRelationMapper.insert(ticketTimeRelation);
 
         // mongo 操作
-        TicketTimesVo ticketTimesVo = new TicketTimesVo();
-        ticketTimesVo.setTicketTimesId(ticketTimesId);
-        ticketTimesVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketTimesVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketTimesVo.setStatus(1);
-        ticketTimesVo.setTitle(title);
-        ticketTimesVo.setPerformancesId(createTicketTimesParam.getPerformancesId());
-        ticketTimesVo.setType(createTicketTimesParam.getType());
-        ticketTimesVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        TicketTimesVo data = mongoTemplate.insert(
-                ticketTimesVo, TicketTimesVo.class.getSimpleName()
+        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()
         );
 
         // redis 操作
-        redisUtil.hset(KylinRedisConst.TIMES, ticketTimesId, ticketTimesVo);
+        redisUtil.hset(KylinRedisConst.TIMES, ticketTimesId, ticketTimesCreatePartnerVo);
 
-        return ticketTimesVo;
+        return ticketTimesCreatePartnerVo;
     }
 
     @Override
@@ -126,14 +123,14 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             map.put("status", 0);
 
             BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            Document doc = mongoTemplate.getCollection(TicketTimesVo.class.getSimpleName()).findOneAndUpdate(
+            Document doc = mongoTemplate.getCollection(TicketTimesCreatePartnerVo.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(), TicketTimesVo.class));
+            redisUtil.hset(KylinRedisConst.TIMES, ticketTimesId, JsonUtils.fromJson(doc.toJson(), TicketTimesCreatePartnerVo.class));
 
             return true;
         } catch (Exception e) {
@@ -142,7 +139,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     }
 
     @Override
-    public TicketTimesVo changeTimes(CreateTicketTimesParam createTicketTimesParam) {
+    public TicketTimesCreatePartnerVo changeTimes(CreateTicketTimesParam createTicketTimesParam) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
             String title = "";
@@ -162,24 +159,24 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
 
 
             // mongo 操作
-            TicketTimesVo ticketTimesVo = new TicketTimesVo();
-            BeanUtils.copyProperties(createTicketTimesParam, ticketTimesVo);
-            ticketTimesVo.setTicketTimesId(createTicketTimesParam.getTicketTimesId());
-            ticketTimesVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketTimesVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketTimesVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketTimesVo.setStatus(1);
-
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(ticketTimesVo)));
-            Document doc = mongoTemplate.getCollection(TicketTimesVo.class.getSimpleName()).findOneAndUpdate(
+            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(
                     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(), TicketTimesVo.class));
-            return JsonUtils.fromJson(doc.toJson(), TicketTimesVo.class);
+            redisUtil.hset(KylinRedisConst.TIMES, createTicketTimesParam.getTicketTimesId(), JsonUtils.fromJson(doc.toJson(), TicketTimesCreatePartnerVo.class));
+            return JsonUtils.fromJson(doc.toJson(), TicketTimesCreatePartnerVo.class);
 
         }catch (Exception e){
             return null;
@@ -187,7 +184,12 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     }
 
     @Override
-    public List<TicketTimesVo> getTimesMongo(String performancesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)), TicketTimesVo.class, TicketTimesVo.class.getSimpleName());
+    public List<TicketTimesCreatePartnerVo> getTimesMongoList(String performancesId) {
+        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)), TicketTimesCreatePartnerVo.class, TicketTimesCreatePartnerVo.class.getSimpleName());
+    }
+
+    @Override
+    public TicketTimesCreatePartnerVo getTimesMongo(String timesId) {
+        return mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(timesId)), TicketTimesCreatePartnerVo.class, TicketTimesCreatePartnerVo.class.getSimpleName());
     }
 }