|
|
|
@@ -79,7 +79,7 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ |
|
|
|
} |
|
|
|
//已过期 |
|
|
|
else if(EnumLegionActivityStatus.EXPIRE.getCode().equals(record.getStatus())){ |
|
|
|
record.setStatus(null); |
|
|
|
record.setStatus(EnumLegionActivityStatus.ON_LINE.getCode()); |
|
|
|
record.setValidStatus(EnumYesOrNo.YES.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -103,8 +103,13 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ |
|
|
|
|
|
|
|
Date now = new Date(); |
|
|
|
for (WxLegionActivity activity : list) { |
|
|
|
if(now.after(activity.getEndTime())){ |
|
|
|
activity.setStatus(EnumOfflineActivityStatus.EXPIRE.getCode()); |
|
|
|
if(EnumLegionActivityStatus.ON_LINE.getCode().equals(activity.getStatus())){ |
|
|
|
if(now.before(activity.getStartTime())){ |
|
|
|
activity.setStatus(EnumLegionActivityStatus.NOT_START.getCode()); |
|
|
|
} |
|
|
|
if(now.after(activity.getEndTime())){ |
|
|
|
activity.setStatus(EnumLegionActivityStatus.EXPIRE.getCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
activity.setLegionCount(legionCountMap.get(activity.getId())==null?0:legionCountMap.get(activity.getId())); |
|
|
|
activity.setMerchantCount(merchantCountMap.get(activity.getId())==null?0:merchantCountMap.get(activity.getId())); |
|
|
|
|