修改 根据状态 查询 演出的接口

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

@@ -27,7 +27,6 @@ public class CreateTicketTimesParam implements Serializable {
     private LocalDateTime useStart;
 
     @ApiModelProperty(value = "场次适用结束时间", example = "2020-12-01T12:00:00")
-    @NotNull(message = "不能为空")
     private LocalDateTime useEnd;
 
     @ApiModelProperty(value = "类型 1单日票 2通票", example = "1")

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

@@ -58,7 +58,7 @@ public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
      * @param ticketsId 票id
      * @return vo
      */
-    ResponseDto<KylinTicketPartnerVo> copyTicket(String ticketsId);
+    ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId,String ticketsId);
 
     /**
      * 整个场次票 提交 审核

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

@@ -220,7 +220,7 @@ CREATE TABLE `kylin_ticket_times`
     `type`            tinyint      NOT NULL DEFAULT 1 COMMENT '状态 1单日票 2通票',
     `status`          tinyint      NOT NULL DEFAULT 1 COMMENT '状态 0不可用 1可用',
     `use_start`       datetime     NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票开始时间',
-    `use_end`         datetime     NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票结束时间',
+    `use_end`         datetime              DEFAULT NULL COMMENT '售票结束时间',
     `comment`         varchar(255) NULL     DEFAULT '' COMMENT 'comment',
     `created_at`      datetime(3)  NULL     DEFAULT NULL COMMENT '创建时间',
     `updated_at`      datetime(3)  NULL     DEFAULT NULL COMMENT '修改时间',
@@ -264,7 +264,7 @@ CREATE TABLE `kylin_tickets`
     `time_end`              datetime      NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '售卖结束时间',
     `time_end_express`      datetime      NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '快递票结束时间',
     `use_start`             datetime      NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '适用开始时间',
-    `use_end`               datetime      NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '适用结束时间',
+    `use_end`               datetime               DEFAULT NULL COMMENT '适用结束时间',
     `pay_countdown_minute`  int(11)       NOT NULL DEFAULT 5 COMMENT '支付倒计时时间',
     `sale_remind_minute`    int(11)       NOT NULL DEFAULT 60 COMMENT '开票提醒倒计时（分钟数）',
     `comment`               varchar(255)  NULL     DEFAULT '' COMMENT 'comment',

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

@@ -57,8 +57,8 @@ public class KylinTicketsPartnerController {
     @PostMapping(value = "/copy")
     @ApiOperation(value = "复制票务",position = 4)
     @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("ticketsId") @NotNull String ticketsId) {
-        return ticketsPartnerService.copyTicket(ticketsId);
+    public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("performancesId") @NotNull String performancesId,@RequestParam("ticketsId") @NotNull String ticketsId) {
+        return ticketsPartnerService.copyTicket(performancesId,ticketsId);
     }
 
     @GetMapping(value = "/details")

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

@@ -88,21 +88,26 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             LocalDateTime createdAt = LocalDateTime.now();
             // 标题
             String title = "";
-            String useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
-            String useEnd = createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+            String useStart;
+            String useEnd;
             if (createTicketTimesParam.getType() == 1) {
-                if(!useStart.split(" ")[0].equals(useEnd.split(" ")[0])){
-                    return ResponseDto.failure(ErrorMapping.get(20118));
-                }
+                useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
                 title = useStart;
             } else {
+                useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+                useEnd = createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
                 title = useStart + "-" + useEnd;
             }
             // mongo 操作
             KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo();
             kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId);
             kylinTicketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            if(createTicketTimesParam.getType() == 2) {
                 kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            }else{
+                kylinTicketTimesPartnerVo.setUseEnd(null);
+
+            }
             kylinTicketTimesPartnerVo.setStatus(1);
             kylinTicketTimesPartnerVo.setTitle(title);
             kylinTicketTimesPartnerVo.setPerformancesId(createTicketTimesParam.getPerformancesId());

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

@@ -193,9 +193,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     public ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) {
         log.info("票 修改");
         try {
-            KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
-                    new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketCreateParam.getTimesId()));
-            PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(ticketTimeRelation.getPerformanceId())),
+            KylinTicketTimesPartnerVo ticketTimeRelation = mongoTemplate.findOne(Query.query(Criteria.where("times_id").is(ticketCreateParam.getTimesId())),
+                    KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+
+            PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(ticketTimeRelation.getPerformancesId())),
                     PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
             if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
                 return ResponseDto.failure(ErrorMapping.get("20112"));
@@ -289,11 +290,16 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     }
 
     @Override
-    public ResponseDto<KylinTicketPartnerVo> copyTicket(String ticketsId) {
+    public ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId,String ticketsId) {
         try {
             // 获取 当前时间 -> 创建时间
             LocalDateTime createdAt = LocalDateTime.now();
 
+            PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
+            if(performancePartnerVo.getAuditStatus()==1){
+                return ResponseDto.failure(ErrorMapping.get(20107));
+            }
+
             KylinTicketPartnerVo kylinTicketPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketsId").is(ticketsId)), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
             kylinTicketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             kylinTicketPartnerVo.setTicketsId(IDGenerator.nextSnowId().toString());