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

Commit 8651d22e authored by jiangxiulong's avatar jiangxiulong

巡演 已结束的也展示

parent d57984d9
...@@ -183,7 +183,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -183,7 +183,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
public List<KylinPerformanceVo> roadList(String roadShowId) { public List<KylinPerformanceVo> roadList(String roadShowId) {
List<KylinPerformanceVo> performancesList = dataUtils.getRoadList(roadShowId); List<KylinPerformanceVo> performancesList = dataUtils.getRoadList(roadShowId);
performancesList = checkAppStatus(performancesList); performancesList = checkAppStatusRoad(performancesList);
return performancesList; return performancesList;
} }
...@@ -414,6 +414,41 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -414,6 +414,41 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
} }
return newList; return newList;
} }
public List<KylinPerformanceVo> checkAppStatusRoad(List<KylinPerformanceVo> list) {
List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();
if (!CollectionUtils.isEmpty(list)) {
String nowTimeStr = DateUtil.getNowTime();
for (KylinPerformanceVo info : list) {
// 当前时间大于停售时间 小于结束时间 是 停售
String stopSellTime = info.getStopSellTime();
String timeEnd = info.getTimeEnd();
Integer isEnd = DateUtil.compareStrDay(nowTimeStr, timeEnd);
if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) {
info.setAppStatus(11);
}
// 票状态 6票可购买 8售罄 9未开始 10结束 11停售
// if (3 != info.getAppStatus() && 7 != info.getAppStatus() && 1 != isEnd) { // 演出已结束、未上线 不展示
if (3 != info.getAppStatus() && 7 != info.getAppStatus()) { // 演出已结束、未上线 不展示
String sellTime = info.getSellTime();
if (1 == DateUtil.compareStrDay(sellTime, nowTimeStr)) {// 未开始
info.setAppStatus(9);
int isMemberStatus = getPerformanceIsMemberStatus(info);
if (1 == isMemberStatus) {
info.setAppStatus(6);
}
} else { // 已开始
info.setAppStatus(6);
if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 演出已结束
info.setAppStatus(10);
}
}
newList.add(info);
}
}
}
return newList;
}
public KylinPerformanceVo checkAppStatusInfo(KylinPerformanceVo info) { public KylinPerformanceVo checkAppStatusInfo(KylinPerformanceVo info) {
if (null != info) { if (null != info) {
......
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