Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -391,11 +391,18 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefundsVo.setUpdatedAt(LocalDateTime.now());
         kylinOrderRefundsVo.setReason("11111");
         log.info("kylinOrderRefundsVo-"+kylinOrderRefundsVo.getStatus());
+        for (String refundId : orderRefundIds) {
             BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
             UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
-                Query.query(Criteria.where("orderRefundsId").in(orderRefundIds)).getQueryObject(),
+                    Query.query(Criteria.where("orderRefundsId").is(refundId)).getQueryObject(),
                     object
             );
+        }
+        /*BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
+        UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("orderRefundsId").in(orderRefundIds)).getQueryObject(),
+                object
+        );*/
         dataUtils.delOrderRefundVo(orderRefundIds);
         dataUtils.delOrderRefundVoByOrderId(orderIds);
         log.info("type-5");

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

 package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
@@ -273,6 +274,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)) {
+                            isMember = 1;
+                            break;
+                        }
+                    }
+                }
+            }catch (Exception e){
+
+            }
+
             for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {
                 //创建场次
                 KylinTicketTimes ticketTimes = new KylinTicketTimes();
@@ -311,14 +328,6 @@ 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(
@@ -362,7 +371,6 @@ public class PerformanceVoUtils {
                     ticketRelations.setTicketId(tickets.getTicketsId());
                     ticketRelations.setUpdatedAt(updatedAt);
                     if (ticketItem.getStatus() == -2) {
-                        KylinTicketPartnerVo item = kylinTicketPartnerVoList.get(0);
                         tickets.setAdvanceMinuteMember(5);
                         ticketStatus.setIsMember(isMember);
                         ticketStatus.setMemberLimitCount(1);
@@ -417,7 +425,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.DESC, "createdAt")), KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
     }
 
 }