记得上下班打卡 | git大法好,push需谨慎

Commit afd116ff authored by GaoHu's avatar GaoHu

演出预告列表修改

parent a845a2ec
...@@ -362,8 +362,8 @@ public class DataUtils { ...@@ -362,8 +362,8 @@ public class DataUtils {
if (obj != null) { if (obj != null) {
//获取ids //获取ids
HashMap<String, Object> map = (HashMap<String, Object>) obj; HashMap<String, Object> map = (HashMap<String, Object>) obj;
List<Integer> toDayIds = (List<Integer>) map.get("toDayIds"); List<String> toDayIds = (List<String>) map.get("toDayIds");
List<Integer> threeDayIds = (List<Integer>) map.get("threeDayIds"); List<String> threeDayIds = (List<String>) map.get("threeDayIds");
List<String> toDayNftIds = (List<String>) map.get("toDayNftIds"); List<String> toDayNftIds = (List<String>) map.get("toDayNftIds");
List<String> threeNftIds = (List<String>) map.get("threeNftIds"); List<String> threeNftIds = (List<String>) map.get("threeNftIds");
List<String> toDayCombinationIds = (List<String>) map.get("toDayCombinationIds"); List<String> toDayCombinationIds = (List<String>) map.get("toDayCombinationIds");
...@@ -371,12 +371,22 @@ public class DataUtils { ...@@ -371,12 +371,22 @@ public class DataUtils {
// 固定条件 // 固定条件
List<KylinPerformanceVo> toDayList = getKylinPerformanceVos(toDayIds); List<KylinPerformanceVo> toDayList = getKylinPerformanceVos(toDayIds);
toDayList.forEach(kylinPerformanceVo -> {
kylinPerformanceVo.setNoticeImage(null);
kylinPerformanceVo.setTicketTimeList(null);
kylinPerformanceVo.setDetails(null);
});
/*List<NoticeKylinPerformanceVo> toDayVoList = toDayList.stream().map(kylinPerformanceVo -> { /*List<NoticeKylinPerformanceVo> toDayVoList = toDayList.stream().map(kylinPerformanceVo -> {
return NoticeKylinPerformanceVo.getNew().copy(kylinPerformanceVo); return NoticeKylinPerformanceVo.getNew().copy(kylinPerformanceVo);
}).collect(Collectors.toList());*/ }).collect(Collectors.toList());*/
// 固定条件 // 固定条件
List<KylinPerformanceVo> threeDaysList = getKylinPerformanceVos(threeDayIds); List<KylinPerformanceVo> threeDaysList = getKylinPerformanceVos(threeDayIds);
threeDaysList.forEach(kylinPerformanceVo -> {
kylinPerformanceVo.setNoticeImage(null);
kylinPerformanceVo.setTicketTimeList(null);
kylinPerformanceVo.setDetails(null);
});
/*List<NoticeKylinPerformanceVo> threeDayVoList = threeDaysList.stream().map(kylinPerformanceVo -> { /*List<NoticeKylinPerformanceVo> threeDayVoList = threeDaysList.stream().map(kylinPerformanceVo -> {
return NoticeKylinPerformanceVo.getNew().copy(kylinPerformanceVo); return NoticeKylinPerformanceVo.getNew().copy(kylinPerformanceVo);
}).collect(Collectors.toList());*/ }).collect(Collectors.toList());*/
...@@ -395,9 +405,7 @@ public class DataUtils { ...@@ -395,9 +405,7 @@ public class DataUtils {
//组合购 //组合购
//当天 //当天
List<GoblinMixDetailsVo> toDayCombinationList = getGoblinMixDetailsVos(toDayCombinationIds); List<GoblinMixDetailsVo> toDayCombinationList = getGoblinMixDetailsVos(toDayCombinationIds);
List<NoticeGoblinMixDetailsVo> toDayCombinationVoList = toDayCombinationList.stream().map(goblinMixDetailsVo -> { List<NoticeGoblinMixDetailsVo> toDayCombinationVoList = toDayCombinationList.stream().map(goblinMixDetailsVo -> NoticeGoblinMixDetailsVo.getNew().copy(goblinMixDetailsVo)).collect(Collectors.toList());
return NoticeGoblinMixDetailsVo.getNew().copy(goblinMixDetailsVo);
}).collect(Collectors.toList());
//三天 //三天
List<GoblinMixDetailsVo> threeDayCombinationList = getGoblinMixDetailsVos(threeDayCombinationIds); List<GoblinMixDetailsVo> threeDayCombinationList = getGoblinMixDetailsVos(threeDayCombinationIds);
...@@ -507,7 +515,7 @@ public class DataUtils { ...@@ -507,7 +515,7 @@ public class DataUtils {
return toDaysNftList; return toDaysNftList;
} }
private List<KylinPerformanceVo> getKylinPerformanceVos(List<Integer> toDayIds) { private List<KylinPerformanceVo> getKylinPerformanceVos(List<String> toDayIds) {
List<KylinPerformanceVo> toDayList = new ArrayList<>(); List<KylinPerformanceVo> toDayList = new ArrayList<>();
//redis key //redis key
String key = KylinRedisConst.PERFORMANCES; String key = KylinRedisConst.PERFORMANCES;
...@@ -549,7 +557,7 @@ public class DataUtils { ...@@ -549,7 +557,7 @@ public class DataUtils {
query.fields().exclude("describeElectronic"); query.fields().exclude("describeElectronic");
List<KylinPerformanceVo> toDayList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName()); 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<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(); Query queryT = getCommonWhere();
// 排序 // 排序
...@@ -567,7 +575,7 @@ public class DataUtils { ...@@ -567,7 +575,7 @@ public class DataUtils {
queryT.fields().exclude("describeElectronic"); queryT.fields().exclude("describeElectronic");
queryT.addCriteria(Criteria.where("roadShowId").nin(roadShowId)); queryT.addCriteria(Criteria.where("roadShowId").nin(roadShowId));
List<KylinPerformanceVo> threeDaysList = mongoTemplate.find(queryT, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName()); 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")); LocalDateTime nowTimeTime = DateUtil.asLocalDateTime((Date) toDayTime.get("start"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment