Merge branch 'pre' into 'master'

Pre

See merge request !237

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

@@ -593,7 +593,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             getStatus = 6;
         }
         boolean isSellOut = dataUtils.ticketIsSoldOut(ticketItem.getTicketsId());
-        if (isSellOut) {
+        if (isSellOut && getStatus != 7) {
             status = 8;
             getStatus = 8;
         }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -87,6 +87,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         add(10);
     }};
 
+    ArrayList<Integer> canBuyTStatus = new ArrayList() {{
+        add(6);
+//        add(8);
+//        add(9);
+//        add(10);
+    }};
+
     @Override
     public ResponseDto<PayInnerResultVo> checkCanOrder(PayOrderParam payOrderParam) {
         boolean isDownGeneral = false;
@@ -231,6 +238,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
             }
 
+            if (!canBuyTStatus.contains(ticketData.getStatus())) {
+                return ResponseDto.failure(ErrorMapping.get("20010"));//当前不可购买
+            }
+
             //通用判断时间
             if (payOrderParam.getAdvanceCode() != null) {
                 if (isOldMember) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java

@@ -115,6 +115,7 @@ public class PerformanceVoTask {
             int ticketCount = 0;            //总循环次数
             int status9Count = 0;            //未开售次数
             int status8Count = 0;            //售罄次数
+            int status7Count = 0;            //下架次数
             int status10Count = 0;            //已结束次数
 
             //演出数据
@@ -129,7 +130,10 @@ public class PerformanceVoTask {
                     LocalDateTime timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.parse(kylinTicketVoItem.getTimeEnd());
                     int surplusGeneral = -1;
                     int status = 0;
-                    if (timeStart.isAfter(timeNow)) {
+                    if (kylinTicketVoItem.getStatus() == 7) {
+                        status = 7;
+                        status7Count += 1;
+                    } else if (timeStart.isAfter(timeNow)) {
                         //未开始
                         status = 9;
                         status9Count += 1;
@@ -148,10 +152,6 @@ public class PerformanceVoTask {
                         }
                     }
 
-                    if (kylinTicketVoItem.getStatus() == 7) {
-                        status = 7;
-                    }
-
                     //修改票状态
                     KylinTicketStatus changeStatus = new KylinTicketStatus();
                     changeStatus.setStatus(status);
@@ -164,11 +164,11 @@ public class PerformanceVoTask {
                     //演出状态
                     if (status == 6) {//单一票 可购买 则为可购买
                         appStatus = 6;
-                    } else if (ticketCount == status10Count) {//全票结束 为结束
+                    } else if ((ticketCount-status7Count) == status10Count) {//全票结束 为结束
                         appStatus = 10;
-                    } else if (ticketCount == status8Count) {//全票售罄为售罄
+                    } else if ((ticketCount-status7Count) == status8Count) {//全票售罄为售罄
                         appStatus = 8;
-                    } else if (ticketCount == status9Count) {//全票未开始 为未开始
+                    } else if ((ticketCount-status7Count) == status9Count) {//全票未开始 为未开始
                         appStatus = 9;
                     }
                 }

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

@@ -580,9 +580,13 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
 //                            9, updatedAt, ticketItem.getTicketsId(),updatedAt,updatedAt
 //                    });
                     KylinTicketPartnerVo ticketPartnerVo = KylinTicketPartnerVo.getNew();
-                    ticketItem.setStatus(9);
+                    if (ticketItem.getStatus() != 7) {
+                        ticketItem.setStatus(9);
+                    }
                     ticketPartnerVo.setTicketsId(ticketItem.getTicketsId());
-                    ticketPartnerVo.setStatus(9);
+                    if (ticketItem.getStatus() != 7) {
+                        ticketPartnerVo.setStatus(9);
+                    }
                     ticketPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     mongoSlimeUtils.updateSubmitTicketVoById(ticketPartnerVo);
                 }
@@ -752,7 +756,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
         } else {//演出列表
             try {
                 PageHelper.startPage(performancePartnerListParam.getPage(), performancePartnerListParam.getSize());
-                HashMap<String,Object> map = mongoSlimeUtils.getPerformanceList(performancePartnerListParam);
+                HashMap<String, Object> map = mongoSlimeUtils.getPerformanceList(performancePartnerListParam);
                 List<PerformancePartnerListDao> voList = (List<PerformancePartnerListDao>) map.get("data");
                 for (int i = 0; i < voList.size(); i++) {
                     PerformancePartnerListDao vo = voList.get(i);