提交 删除场次 票

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

@@ -151,31 +151,37 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart
             }
             KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId);
             KylinTicketTimesVo ticketTimesData = null;
-            for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
-                ticketTimesData = vo.getTicketTimeList().get(x);
-                if (ticketTimesData.getTimeId().equals(ticketTimesId)) {
-                    break;
-                }
-            }
-            if (ticketTimesData != null) {
-                if (vo.getAuditStatus() == 0) {
-                    return ResponseDto.failure(ErrorMapping.get(20101));
+            if (vo == null) {
+                mongoMerchantUtils.delTicketTimesPartnerVo(ticketTimesId);
+                return ResponseDto.success("删除成功");
+            } else {
+                for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
+                    ticketTimesData = vo.getTicketTimeList().get(x);
+                    if (ticketTimesData.getTimeId().equals(ticketTimesId)) {
+                        break;
+                    }
                 }
-                if (vo.getAppStatus() == 0 || vo.getAppStatus() == 4) {//未提审||被拒绝
-                    KylinTicketTimesPartnerVo ticketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
-                    ticketTimesPartnerVo.setTicketTimesId(ticketTimesId);
-                    ticketTimesPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                    ticketTimesPartnerVo.setStatus(0);
-                    mongoMerchantUtils.insertTicketTimesPartnerVo(ticketTimesPartnerVo);
-                    log.info(UserPathDto.setPartnerData("0", "deleteTimes", "ticketTimesId=" + ticketTimesId, "删除成功"));
-                    return ResponseDto.success("删除成功");
+                if (ticketTimesData != null) {
+                    if (vo.getAuditStatus() == 0) {
+                        return ResponseDto.failure(ErrorMapping.get(20101));
+                    }
+                    if (vo.getAppStatus() == 0 || vo.getAppStatus() == 4) {//未提审||被拒绝
+                        KylinTicketTimesPartnerVo ticketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
+                        ticketTimesPartnerVo.setTicketTimesId(ticketTimesId);
+                        ticketTimesPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        ticketTimesPartnerVo.setStatus(0);
+                        mongoMerchantUtils.insertTicketTimesPartnerVo(ticketTimesPartnerVo);
+                        log.info(UserPathDto.setPartnerData("0", "deleteTimes", "ticketTimesId=" + ticketTimesId, "删除成功"));
+                        return ResponseDto.success("删除成功");
+                    } else {
+                        return ResponseDto.failure(ErrorMapping.get(20106));
+                    }
                 } else {
-                    return ResponseDto.failure(ErrorMapping.get(20106));
+                    mongoMerchantUtils.delTicketTimesPartnerVo(ticketTimesId);
+                    return ResponseDto.success();
                 }
-            } else {
-                mongoMerchantUtils.delTicketTimesPartnerVo(ticketTimesId);
-                return ResponseDto.success();
             }
+
         } catch (Exception e) {
             log.info(UserPathDto.setPartnerData("0", "deleteTimes", "ticketTimesId=" + ticketTimesId, e));
             return ResponseDto.failure(ErrorMapping.get(20102));

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

@@ -239,6 +239,10 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
     public ResponseDto<String> deleteTicket(String ticketsId, String performanceId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
+            PerformancePartnerVo data = mongoMerchantUtils.getPerformancePartnerVo(performanceId);
+            if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
+                return ResponseDto.failure(ErrorMapping.get("20106"));
+            }
             KylinPerformanceVo vo = redisMerchantUtils.getPerformanceVo(performanceId);
             KylinTicketTimesVo ticketTimesData;
             KylinTicketVo ticketData = null;
@@ -253,11 +257,6 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
                 }
                 break;
             }
-
-            PerformancePartnerVo data = mongoMerchantUtils.getPerformancePartnerVo(performanceId);
-            if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
-                return ResponseDto.failure(ErrorMapping.get("20106"));
-            }
             if (ticketData == null) {
                 mongoMerchantUtils.deleteTicketPartnerVo(ticketsId);
                 return ResponseDto.success("删除成功");