Merge branch 'dev_notice_0708' into dev_0716_online

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

@@ -363,8 +363,8 @@ public class DataUtils {
         if (obj != null) {
             //获取ids
             HashMap<String, Object> map = (HashMap<String, Object>) obj;
-            List<Integer> toDayIds = (List<Integer>) map.get("toDayIds");
-            List<Integer> threeDayIds = (List<Integer>) map.get("threeDayIds");
+            List<String> toDayIds = (List<String>) map.get("toDayIds");
+            List<String> threeDayIds = (List<String>) map.get("threeDayIds");
             List<String> toDayNftIds = (List<String>) map.get("toDayNftIds");
             List<String> threeNftIds = (List<String>) map.get("threeNftIds");
             List<String> toDayCombinationIds = (List<String>) map.get("toDayCombinationIds");
@@ -372,12 +372,22 @@ public class DataUtils {
 
             // 固定条件
             List<KylinPerformanceVo> toDayList = getKylinPerformanceVos(toDayIds);
+            toDayList.forEach(kylinPerformanceVo -> {
+                kylinPerformanceVo.setNoticeImage(null);
+                kylinPerformanceVo.setTicketTimeList(null);
+                kylinPerformanceVo.setDetails(null);
+            });
             /*List<NoticeKylinPerformanceVo> toDayVoList = toDayList.stream().map(kylinPerformanceVo -> {
                 return NoticeKylinPerformanceVo.getNew().copy(kylinPerformanceVo);
             }).collect(Collectors.toList());*/
 
             // 固定条件
             List<KylinPerformanceVo> threeDaysList = getKylinPerformanceVos(threeDayIds);
+            threeDaysList.forEach(kylinPerformanceVo -> {
+                kylinPerformanceVo.setNoticeImage(null);
+                kylinPerformanceVo.setTicketTimeList(null);
+                kylinPerformanceVo.setDetails(null);
+            });
             /*List<NoticeKylinPerformanceVo> threeDayVoList = threeDaysList.stream().map(kylinPerformanceVo -> {
                 return NoticeKylinPerformanceVo.getNew().copy(kylinPerformanceVo);
             }).collect(Collectors.toList());*/
@@ -396,9 +406,7 @@ public class DataUtils {
             //组合购
             //当天
             List<GoblinMixDetailsVo> toDayCombinationList = getGoblinMixDetailsVos(toDayCombinationIds);
-            List<NoticeGoblinMixDetailsVo> toDayCombinationVoList = toDayCombinationList.stream().map(goblinMixDetailsVo -> {
-                return NoticeGoblinMixDetailsVo.getNew().copy(goblinMixDetailsVo);
-            }).collect(Collectors.toList());
+            List<NoticeGoblinMixDetailsVo> toDayCombinationVoList = toDayCombinationList.stream().map(goblinMixDetailsVo -> NoticeGoblinMixDetailsVo.getNew().copy(goblinMixDetailsVo)).collect(Collectors.toList());
 
             //三天
             List<GoblinMixDetailsVo> threeDayCombinationList = getGoblinMixDetailsVos(threeDayCombinationIds);
@@ -508,7 +516,7 @@ public class DataUtils {
         return toDaysNftList;
     }
 
-    private List<KylinPerformanceVo> getKylinPerformanceVos(List<Integer> toDayIds) {
+    private List<KylinPerformanceVo> getKylinPerformanceVos(List<String> toDayIds) {
         List<KylinPerformanceVo> toDayList = new ArrayList<>();
         //redis key
         String key = KylinRedisConst.PERFORMANCES;
@@ -550,7 +558,7 @@ public class DataUtils {
         query.fields().exclude("describeElectronic");
         List<KylinPerformanceVo> toDayList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
         List<String> roadShowId = toDayList.stream().filter(r -> !r.getRoadShowId().equals("0")).map(KylinPerformanceVo -> KylinPerformanceVo.getRoadShowId()).collect(Collectors.toList());
-        List<Integer> toDayIds = toDayList.stream().map(KylinPerformanceVo::getMid).collect(Collectors.toList());
+        List<String> toDayIds = toDayList.stream().map(KylinPerformanceVo::getPerformancesId).collect(Collectors.toList());
         // 固定条件
         Query queryT = getCommonWhere();
         // 排序
@@ -568,7 +576,7 @@ public class DataUtils {
         queryT.fields().exclude("describeElectronic");
         queryT.addCriteria(Criteria.where("roadShowId").nin(roadShowId));
         List<KylinPerformanceVo> threeDaysList = mongoTemplate.find(queryT, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
-        List<Integer> threeDayIds = threeDaysList.stream().map(KylinPerformanceVo::getMid).collect(Collectors.toList());
+        List<String> threeDayIds = threeDaysList.stream().map(KylinPerformanceVo::getPerformancesId).collect(Collectors.toList());
         //数字藏品
 
         LocalDateTime nowTimeTime = DateUtil.asLocalDateTime((Date) toDayTime.get("start"));