From 803716b71d13f5a0fc23c2aa1fde9d08675a77b3 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Tue, 27 Aug 2024 23:33:53 +0800 Subject: [PATCH] //LegionActivity --- .../java/com/iformall/domain/po/WxLegionActivity.java | 4 ++-- .../service/impl/WxLegionActivityServiceImpl.java | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java index 75006dd92..b9cba2f2b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java @@ -94,9 +94,9 @@ public class WxLegionActivity extends TenantEntity { private Integer notUnionOrder; /** - * 状态(0:未上架 1:已上架) + * 状态 */ - @io.swagger.annotations.ApiModelProperty(value="状态(0:草稿 1:已上架 2:已下架 3:已过期)",name="status") + @io.swagger.annotations.ApiModelProperty(value="状态(0:草稿 1:已上架 2:已下架 3:已过期 4:未开始)",name="status") @TableField(value = "status") private Integer status; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java index fb45888da..6b8f03baa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java @@ -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()));