Merge remote-tracking branch 'origin/dev' into dev

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

@@ -20,6 +20,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartner
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.mongodb.BasicDBObject;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
@@ -39,6 +40,7 @@ import java.util.HashMap;
 import java.util.List;
 
 @Component
+@Slf4j
 public class PerformanceVoUtils {
 
     @Autowired
@@ -275,19 +277,22 @@ public class PerformanceVoUtils {
             //场次数据
             List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = getTimesMongoList(performancesId);
             int isMember = 0;
-            try {
-                for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {
-                    //修改票
-                    List<KylinTicketPartnerVo> kylinTicketPartnerVoList = getTicketMongoList(ticketTimeItem.getTicketTimesId());
-                    for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVoList) {
-                        if (ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketItem.getTicketsId())).getIsMember().equals(1)) {
+
+            for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {
+                //修改票
+                List<KylinTicketPartnerVo> kylinTicketPartnerVoList = getTicketMongoList(ticketTimeItem.getTicketTimesId());
+                for (KylinTicketPartnerVo ticketItem : kylinTicketPartnerVoList) {
+                    try {
+                        KylinTicketStatus statusData = ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketItem.getTicketsId()));
+                        log.info("isMember = ", statusData);
+                        if (statusData.getIsMember().equals(1)) {
                             isMember = 1;
                             break;
                         }
+                    } catch (Exception e) {
+                        log.info("isMember = ", e);
                     }
                 }
-            }catch (Exception e){
-
             }
 
             for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {
@@ -425,7 +430,7 @@ public class PerformanceVoUtils {
     }
 
     public List<KylinTicketTimesPartnerVo> getTimesMongoList(String performancesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)).with(Sort.by(Sort.Direction.DESC, "createdAt")), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
+        return mongoTemplate.find(Query.query(Criteria.where("performancesId").is(performancesId)).with(Sort.by(Sort.Direction.ASC, "createdAt")), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
     }
 
 }