1. 多人票退款bug修复

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

@@ -3,7 +3,6 @@ package com.liquidnet.service.kylin.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.*;
-import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
@@ -11,7 +10,6 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
-import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.*;
@@ -315,7 +313,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
                             && ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) != 0
                             && (orderTicketVo.getStatus().equals(1) || orderTicketVo.getStatus().equals(3) || orderTicketVo.getStatus().equals(6))
-                            && (orderTicketVo.getTransferStatus().equals(0) || orderTicketVo.getTransferStatus().equals(5))) {
+                            && (orderTicketVo.getTransferStatus().equals(0) || orderTicketVo.getTransferStatus().equals(5))
+                            && isSingleTicket(ticketVo.getTicketsId())) {
                         vo.setIsCanRefund(1);
                     } else {
                         vo.setIsCanRefund(0);
@@ -323,11 +322,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 } else {
                     vo.setIsCanRefund(0);
                 }
-                // 如果是多人票目前不支持退
-                KylinTicketPartnerVo kylinTicketPartnerVo = dataUtils.getKylinTicketPartnerVoByTicketId(ticketVo.getTicketsId());
-                if (kylinTicketPartnerVo != null && kylinTicketPartnerVo.getViewersNumber() != null) {
-                    vo.setIsCanRefund(kylinTicketPartnerVo.getViewersNumber() > 1 ? 0 : 1);
-                }
 
                 //是否可转
                 if (null != performanceVo.getIsTransfer() && performanceVo.getIsTransfer() == 1) {
@@ -386,6 +380,16 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         }
     }
 
+    private boolean isSingleTicket(String ticketsId) {
+        KylinTicketPartnerVo kylinTicketPartnerVo = dataUtils.getKylinTicketPartnerVoByTicketId(ticketsId);
+        if (null != kylinTicketPartnerVo && null != kylinTicketPartnerVo.getViewersNumber()) {
+            return kylinTicketPartnerVo.getViewersNumber() == 1;
+        }else {
+            log.info("[isSingleTicket] 票信息为空, ticketsId: {}", ticketsId);
+            return false;
+        }
+    }
+
     @Override
     public ResponseDto<Integer> orderUnPayCount() {
         String uid = CurrentUtil.getCurrentUid();