From 6c3d421cf60b7ecc29fad3c0117dba3593629f26 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 8 Apr 2019 15:21:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E6=81=AF=E7=BB=84=E4=BB=B6][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E6=B7=BB=E5=8A=A0=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxTopicController.java | 11 ++++++ .../com/iformall/enums/EnumWxTopicStatus.java | 37 +++++++++++++++++++ .../main/resources/mapper/WxTopicMapper.xml | 7 ++-- 3 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumWxTopicStatus.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index da98f2276..b480eabe4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -3,6 +3,8 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.enums.EnumCouponChannelActivityStatus; +import com.iformall.enums.EnumWxTopicStatus; import com.iformall.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -12,6 +14,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; + @RestController @RequestMapping("topic") @Api(description = "专题相关接口") @@ -29,6 +33,13 @@ public class WxTopicController extends BaseController { String tenantId = getTenantId(); wxTopic.setTenantId(tenantId); PageInfo page = wxTopicService.listAsPage(wxTopic, pageNum, pageSize); + + Date now = new Date(); + page.getList().stream().forEach(cc->{ + if (cc.getEndTime()!=null && now.getTime() > cc.getEndTime().getTime()) { + cc.setStatus(EnumWxTopicStatus.INVAILD.getCode()); + } + }); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumWxTopicStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumWxTopicStatus.java new file mode 100644 index 000000000..612baf774 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumWxTopicStatus.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + +/** + * Created by luozukai + * 状态1生效2失效3作废 + */ +public enum EnumWxTopicStatus { + VAILD(1, "有效"), + INVAILD(2, "无效"), + CANCLE(3, "作废") + ; + + public static EnumWxTopicStatus getEnum(Integer code) { + for (EnumWxTopicStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumWxTopicStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index 087ebfca9..c4eeaa68c 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -18,8 +18,7 @@ - `id`,`tenant_id`,`name`,`title`,content,cover,advert,begin_time,end_time,createtime,updatetime, - if(now() > end_time,2,status) as status + `id`,`tenant_id`,`name`,`title`,content,cover,advert,begin_time,end_time,createtime,updatetime @@ -46,9 +45,9 @@ order by createtime desc - +