Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -21,6 +21,7 @@ import com.liquidnet.service.kylin.mapper.*;
 import com.mongodb.BasicDBObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -310,6 +311,14 @@ public class PerformanceVoUtils {
 
                 //修改票
                 List<KylinTicketPartnerVo> kylinTicketPartnerVoList = getTicketMongoList(ticketTimeItem.getTicketTimesId());
+                int isMember = 0;
+                for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVoList) {
+                    if (ticketItem.getIsMember().equals(1)) {
+                        isMember = 1;
+                    }
+                }
+
+
                 for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVoList) {
                     KylinTicketPartnerVo kylinTicketPartnerVo;
                     kylinTicketPartnerVo = mongoTemplate.findOne(
@@ -355,7 +364,7 @@ public class PerformanceVoUtils {
                     if (ticketItem.getStatus() == -2) {
                         KylinTicketPartnerVo item = kylinTicketPartnerVoList.get(0);
                         tickets.setAdvanceMinuteMember(5);
-                        ticketStatus.setIsMember(item.getIsMember());
+                        ticketStatus.setIsMember(isMember);
                         ticketStatus.setMemberLimitCount(1);
                         ticketRelations.setCreatedAt(LocalDateTime.now());
                         tickets.setCreatedAt(LocalDateTime.now());
@@ -408,7 +417,7 @@ public class PerformanceVoUtils {
     }
 
     public List<KylinTicketTimesPartnerVo> getTimesMongoList(String performancesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)).with(Sort.by(Sort.Direction.DESC,"createdAt")), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
     }
 
 }