Merge branch 'dev' into test

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

@@ -64,21 +64,29 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     ) {
         List<KylinPerformanceVo> performancesList = dataUtils.getPerformancesListOfcityName(cityName);
 
+        // 是否启用推荐
+        Integer isRecommend = 1;
+
         // 判断搜索 处理新数据
         List<KylinPerformanceVo> performancesListNew = new ArrayList<>();
         List<String> performancesIds = new ArrayList<>();
         for (KylinPerformanceVo info : performancesList) {
             boolean isShow = true;
             if (type > 0) {
+                isRecommend = 0;
                 if (info.getType() != type) {
                     isShow = false;
                 }
             }
             if (null != isExclusive || null != isDiscount || null != isAdvance) {
+                isRecommend = 0;
                 if (info.getIsExclusive() != isExclusive && info.getIsDiscount() != isDiscount && info.getIsAdvance() != isAdvance) {
                     isShow = false;
                 }
             }
+            if (days > 0) {
+                isRecommend = 0;
+            }
             if (isShow) {
                 performancesIds.add(info.getPerformancesId());
                 performancesListNew.add(info);
@@ -89,7 +97,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         // 推荐
         int is_native = 1;
         int recommend = performancesListNew.size();
-        if (recommend <= 2) {
+        if (recommend <= 2 && 1 == isRecommend) {
             List<KylinPerformanceVo> performancesListRecommend = dataUtils.getPerformancesListIsSystemRecommend();
 
             if (!CollectionUtils.isEmpty(performancesListRecommend)) {
@@ -111,7 +119,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         info.put("total", 0);
         info.put("list", performancesListNew);
 
-        log.info(UserPathDto.setData("演出列表",cityName+"/"+type+"/"+isDiscount+"/"+isAdvance+"/"+"/"+isExclusive,info));
+        log.info(UserPathDto.setData("演出列表","cityName="+cityName+" type="+type+" isDiscount="+isDiscount+"isAdvance ="+isAdvance+" isExclusive="+isExclusive,info));
         return info;
     }
 
@@ -161,7 +169,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             performancesInfo.setDiffDistance(diffDistance);
         }
 
-        log.info(UserPathDto.setData("演出详情",performancesId+"/"+latitudeFrom+"/"+longitudeFrom,performancesInfo));
+        log.info(UserPathDto.setData("演出详情","performancesId="+performancesId+" latitudeFrom="+latitudeFrom+" longitudeFrom="+longitudeFrom,performancesInfo));
         return performancesInfo;
     }
 
@@ -178,14 +186,22 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
         for (KylinTicketTimesVo partner : ticketTimesList) {
             List<KylinTicketVo> ticketList = partner.getTicketList();
+            List<KylinTicketVo> ticketListNew = new ArrayList<>();
             for (KylinTicketVo ticket : ticketList) {
                 int status = checkTicketStatus(ticket);
                 ticket.setStatus(status);
                 // 会员状态
                 Integer isMemberStatus = getIsMemberStatus(ticket);
                 ticket.setIsMemberStatus(isMemberStatus);
+                if (null != isAgent && isAgent > 0) {
+                    if (ticket.getIsAgent() == isAgent) {
+                        ticketListNew.add(ticket);
+                    }
+                } else {
+                    ticketListNew.add(ticket);
+                }
             }
-            partner.setTicketList(ticketList);
+            partner.setTicketList(ticketListNew);
         }
 
         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
@@ -278,7 +294,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         info.put("total", count);
         info.put("list", list);
 
-        log.info(UserPathDto.setData("演出搜索",title+"/"+page+"/"+size,info));
+        log.info(UserPathDto.setData("演出搜索","title="+title+" page="+page+" size="+size,info));
         return info;
     }
 
@@ -306,30 +322,35 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         payDetailVo.setPerformanceInfo(performancesInfo);
         payDetailVo.setTicketInfo(ticketVo);
 
-        log.info(UserPathDto.setData("预支付",performancesId+"/"+ticketsId,payDetailVo));
+        log.info(UserPathDto.setData("预支付","performancesId="+performancesId+" ticketsId="+ticketsId,payDetailVo));
         return payDetailVo;
     }
 
     public List<KylinPerformanceVo> checkAppStatus(List<KylinPerformanceVo> list) {
+        List<KylinPerformanceVo> newList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             String nowTimeStr = DateUtil.getNowTime();
             for (KylinPerformanceVo info : list) {
-                String timeStart = info.getSellTime();
-                String timeEnd = info.getStopSellTime();
-
-                if (info.getAppStatus() != 8) {
-                    if (1 == DateUtil.compareStrDay(timeStart, nowTimeStr)) {// 未开始
-                        info.setAppStatus(9);
-                    } else { // 已开始
-                        info.setAppStatus(6);
-                        if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 已结束
-                            info.setAppStatus(10);
+                Integer isEnd = DateUtil.compareStrDay(nowTimeStr, info.getTimeEnd());
+                if (3 != info.getAppStatus() && 1 != isEnd) { // 演出已结束或者未上线
+                    String timeStart = info.getSellTime();
+                    String timeEnd = info.getStopSellTime();
+
+                    if (info.getAppStatus() != 8) {
+                        if (1 == DateUtil.compareStrDay(timeStart, nowTimeStr)) {// 未开始
+                            info.setAppStatus(9);
+                        } else { // 已开始
+                            info.setAppStatus(6);
+                            if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 已结束
+                                info.setAppStatus(10);
+                            }
                         }
                     }
+                    newList.add(info);
                 }
             }
         }
-        return list;
+        return newList;
     }
 
     public KylinPerformanceVo checkAppStatusInfo(KylinPerformanceVo info) {
@@ -356,15 +377,23 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             }
             info.setTicketTimeList(ticketTimeListNew);
             if (CollectionUtils.isEmpty(ticketTimeListNew)) {
-                info.setAppStatus(8);
+                info.setAppStatus(11); // 所有票种下架 演出停售
             }
 
+            // 当前时间大于停售时间 小于结束时间 是 停售
             String nowTimeStr = DateUtil.getNowTime();
-            String timeStart = info.getSellTime();
-            String timeEnd = info.getStopSellTime();
+            String stopSellTime = info.getStopSellTime();
+
+            String timeEnd = info.getTimeEnd();
+            if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) {
+                info.setAppStatus(11);
+            }
 
-            if (info.getAppStatus() != 8) {
-                if (1 == DateUtil.compareStrDay(timeStart, nowTimeStr)) {// 未开始
+            // 票状态 6票可购买 8售罄 9未开始 10结束 11停售
+            // 演出状态 7下架前端不展示
+            if (info.getAppStatus() != 8 && info.getAppStatus() != 11) {
+                String sellTime = info.getSellTime();
+                if (1 == DateUtil.compareStrDay(sellTime, nowTimeStr)) {// 未开始
                     info.setAppStatus(9);
                     int isMemberStatus = getPerformanceIsMemberStatus(info);
                     if (1 == isMemberStatus) {
@@ -372,7 +401,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                     }
                 } else { // 已开始
                     info.setAppStatus(6);
-                    if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 已结束
+                    if (1 == DateUtil.compareStrDay(timeEnd, nowTimeStr)) { // 演出已结束
                         info.setAppStatus(10);
                     }
                 }
@@ -382,6 +411,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     }
 
     public int checkTicketStatus(KylinTicketVo ticketItem) {
+        // 3审核通过;4审核未通过;6在售;7停售;8售罄;9未开始;10已结束
         int getStatus = ticketItem.getStatus();
         int status = getStatus;
         if (null != ticketItem) {