From bfaf13192a33ac2c03527de73331167861f7b8ad Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 8 Apr 2019 15:30:51 +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 --- .../com/iformall/controller/WxTopicController.java | 6 +++++- .../com/iformall/controller/WxTopicController.java | 11 ++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index b480eabe4..7fb330e83 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -48,7 +48,11 @@ public class WxTopicController extends BaseController { logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); String tenantId = getTenantId(); wxTopic.setTenantId(tenantId); - return new ResultData(wxTopicService.findById(wxTopic)); + WxTopic queryTopic = wxTopicService.findById(wxTopic); + if (queryTopic.getEndTime()!=null && new Date().getTime() > queryTopic.getEndTime().getTime()) { + queryTopic.setStatus(EnumWxTopicStatus.INVAILD.getCode()); + } + return new ResultData(queryTopic); } @PostMapping("saveOrUpdate") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index f4201c537..647b5c4ad 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -2,6 +2,7 @@ package com.iformall.controller; import com.iformall.common.ResultData; import com.iformall.domain.po.WxTopic; +import com.iformall.enums.EnumWxTopicStatus; import com.iformall.service.WxTopicService; import io.swagger.annotations.Api; import org.slf4j.Logger; @@ -9,6 +10,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; + @RestController @RequestMapping("/api/topic") @Api(description = "专题相关接口") @@ -17,15 +20,17 @@ public class WxTopicController extends BaseController { @Autowired private WxTopicService wxTopicService; - - @GetMapping("show") public ResultData show() { logger.debug("[" + getIpAddr() + "] WxTopicController::show"); WxTopic wxTopic = new WxTopic(); String tenantId = getTenantId(); wxTopic.setTenantId(tenantId); - return new ResultData(wxTopicService.show(wxTopic)); + WxTopic queryTopic = wxTopicService.show(wxTopic); + if (queryTopic.getEndTime()!=null && new Date().getTime() > queryTopic.getEndTime().getTime()) { + queryTopic.setStatus(EnumWxTopicStatus.INVAILD.getCode()); + } + return new ResultData(queryTopic); }