Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

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

@@ -76,6 +76,8 @@ public class TicketVo {
     private Integer isExclusive;
     @ApiModelProperty(value = "是否会员")
     private Integer isMember;
+    @ApiModelProperty(value = "会员购买状态")
+    private Integer isMemberStatus;
     @ApiModelProperty(value = "是否分销")
     private Integer isAgent;
 

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

@@ -109,9 +109,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
 
         // 要查询的字段
-        /*Document fieldsObject = new Document();
-        Query query = new BasicQuery(queryObject, fieldsObject);
-        fieldsObject.put("performancesId", true);*/
+//        query.fields().include();//包含该字段
+//        query.fields().exclude();//不包含该字段
 
         // 查询总数
         long count = mongoTemplate.count(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
@@ -255,9 +254,9 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                 query.addCriteria(Criteria.where("isAgent").is(isAgent));
             }
             List<TicketVo> ticketList = mongoTemplate.find(
-                query,
-                TicketVo.class,
-                TicketVo.class.getSimpleName()
+                    query,
+                    TicketVo.class,
+                    TicketVo.class.getSimpleName()
             );
 
             for (TicketVo ticket : ticketList) {
@@ -284,6 +283,25 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                         ticket.setStatus(6);
                     }
                 }
+                // 会员状态
+                Integer isMemberStatus = 0;
+                if (1 == ticket.getIsMember()) { // 有会员
+                    String memberTimeStart = ticket.getMemberTimeStart();
+                    DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                    LocalDateTime memberTimeStartL = LocalDateTime.parse(memberTimeStart, df);
+
+                    LocalDateTime nowTimeTicket = LocalDateTime.now();
+                    String nowTimeTicketStr = nowTimeTicket.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                    LocalDateTime nowTimeTicketStrL = LocalDateTime.parse(nowTimeTicketStr, df);
+                    if (memberTimeStartL.isBefore(nowTimeTicketStrL)) { // 可以购买
+                        isMemberStatus = 1;
+                    } else { // 还没到会员购买时间
+                        isMemberStatus = 0;
+                    }
+                } else {
+                    isMemberStatus = 0;
+                }
+                ticket.setIsMemberStatus(isMemberStatus);
             }
 
             partner.setTicketList(ticketList);