场次限购-kylin bug 0有待支付和关闭

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketEntitiesForOrderVo.java

@@ -18,6 +18,8 @@ public class KylinOrderTicketEntitiesForOrderVo implements Serializable, Cloneab
     private String useStart;
     @ApiModelProperty("场次开始结束")
     private String useEnd;
+    @ApiModelProperty("isPayment")
+    private Integer isPayment;
 
     private static final KylinOrderTicketEntitiesForOrderVo obj = new KylinOrderTicketEntitiesForOrderVo();
 

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

@@ -384,7 +384,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         KylinTicketPartnerVo kylinTicketPartnerVo = dataUtils.getKylinTicketPartnerVoByTicketId(ticketsId);
         if (null != kylinTicketPartnerVo && null != kylinTicketPartnerVo.getViewersNumber()) {
             return kylinTicketPartnerVo.getViewersNumber() == 1;
-        }else {
+        } else {
             log.info("[isSingleTicket] 票信息为空, ticketsId: {}", ticketsId);
             return false;
         }
@@ -1370,18 +1370,28 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         for (LimitErrorResultVo vo : param) {
             Criteria criteria = Criteria.where("performanceId").is(vo.getPerformancesId())
                     .and("isPayment").in(Arrays.asList(0, 1, 2, 4));
-            if(vo.getLimitTarget().equals(2)) {
+            if (vo.getLimitTarget().equals(2)) {
                 criteria.and("enterIdCode").is(vo.getIdCard());
             }
-            if(vo.getLimitType().equals(2)) {
+            if (vo.getLimitType().equals(2)) {
                 criteria.and("ticketId").is(vo.getTicketsId());
             }
-            if(vo.getLimitType().equals(3)) {
+            if (vo.getLimitType().equals(3)) {
                 criteria.and("timeId").is(vo.getTimeId());
             }
             Query query = Query.query(criteria);
             List<KylinOrderTicketEntitiesForOrderVo> list = mongoTemplate.find(query,
                     KylinOrderTicketEntitiesForOrderVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
+            List<KylinOrderTicketEntitiesForOrderVo> newList = new ArrayList<>();
+            for (KylinOrderTicketEntitiesForOrderVo entities : list) {
+                if (entities.getIsPayment().equals(0)) {
+                    KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(entities.getOrderId());
+                    if (orderTicketVo.getStatus().equals(2)) {
+                        continue;
+                    }
+                }
+                newList.add(entities);
+            }
             vo.setEntities(list);
         }
         return ResponseDto.success(param);