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

Skip to content

L
liquidnet-bus-v1
Commit 3091ca6a authored by zhengfuxin's avatar zhengfuxin
Browse files
Options

修改bug

parent d47895ae
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java
View file @ 3091ca6a
...@@ -54,7 +54,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService { ...@@ -54,7 +54,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
ArrayList<GoblinFrontBanner> goblinFrontBannerArrayList= ObjectUtil.getGoblinFrontBannerArrayList(); ArrayList<GoblinFrontBanner> goblinFrontBannerArrayList= ObjectUtil.getGoblinFrontBannerArrayList();
//查看是否有失效的时间 //查看是否有失效的时间
for(GoblinFrontBanner goblinFrontBanner:list){ for(GoblinFrontBanner goblinFrontBanner:list){
if(null!=goblinFrontBanner.getEndTime()){ if(null!=goblinFrontBanner.getEndTime()&&null!=goblinFrontBanner.getStartTime()){
if( nowTime.isAfter(goblinFrontBanner.getEndTime())){ if( nowTime.isAfter(goblinFrontBanner.getEndTime())){
}else{ }else{
if(nowTime.isBefore(goblinFrontBanner.getStartTime())){ if(nowTime.isBefore(goblinFrontBanner.getStartTime())){
...@@ -62,6 +62,8 @@ public class GoblinFrontServiceImpl implements GoblinFrontService { ...@@ -62,6 +62,8 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
goblinFrontBannerArrayList.add(goblinFrontBanner); goblinFrontBannerArrayList.add(goblinFrontBanner);
} }
} }
}else{
goblinFrontBannerArrayList.add(goblinFrontBanner);
} }
} }
ArrayList<GoblinFrontBannerVo> list1= ObjectUtil.goblinFrontBannerVoArrayList(); ArrayList<GoblinFrontBannerVo> list1= ObjectUtil.goblinFrontBannerVoArrayList();
...@@ -84,8 +86,13 @@ public class GoblinFrontServiceImpl implements GoblinFrontService { ...@@ -84,8 +86,13 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
if(null!=goblinFrontBanner.getEndTime()){ if(null!=goblinFrontBanner.getEndTime()){
if( nowTime.isAfter(goblinFrontBanner.getEndTime())){ if( nowTime.isAfter(goblinFrontBanner.getEndTime())){
}else{ }else{
goblinFrontBannerArrayList.add(goblinFrontBanner); if(nowTime.isBefore(goblinFrontBanner.getStartTime())){
}else{
goblinFrontBannerArrayList.add(goblinFrontBanner);
}
} }
}else{
goblinFrontBannerArrayList.add(goblinFrontBanner);
} }
} }
ArrayList<GoblinFrontBannerVo> list1= ObjectUtil.goblinFrontBannerVoArrayList(); ArrayList<GoblinFrontBannerVo> list1= ObjectUtil.goblinFrontBannerVoArrayList();
......
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