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());
-        BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
+        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").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

@@ -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
@@ -280,14 +282,16 @@ public class PerformanceVoUtils {
                     //修改票
                     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)) {
+                        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);
             }
 
             for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {