diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index 7fb330e83..029ba3833 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -3,7 +3,6 @@ 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; @@ -13,7 +12,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import java.util.Date; @RestController @@ -33,13 +31,12 @@ 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()); - } - }); +// 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/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index 9afa74f70..ecb2c05d8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -61,6 +61,17 @@ public class WxTopic implements Serializable { private String statusStr; @Transient protected List statusList; + //查询下架状态 + @Transient + private boolean queryDownLineStatus; + + public boolean isQueryDownLineStatus() { + return queryDownLineStatus; + } + + public void setQueryDownLineStatus(boolean queryDownLineStatus) { + this.queryDownLineStatus = queryDownLineStatus; + } public List getStatusList() { return statusList; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java index fcbf4ff9c..5c45c845d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java @@ -11,4 +11,5 @@ public interface WxTopicMapper extends CommonMapper { WxTopic show(WxTopic record); + void updateStatus(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index f0e38aa68..21d9d5b7e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.domain.po.WxCouponTopic; import com.iformall.domain.po.WxTopic; +import com.iformall.enums.EnumWxTopicStatus; import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxCouponTopicMapper; import com.iformall.mapper.WxTopicMapper; @@ -35,8 +36,26 @@ public class WxTopicServiceImpl implements WxTopicService { @Autowired private WxCouponMapper wxCouponMapper; +// public void isQueryDownLineStatus(WxTopic record){ +// record.setQueryDownLineStatus(false); +// if(record.getStatus().equals(EnumWxTopicStatus.INVAILD.getCode())){ +// record.setQueryDownLineStatus(true); +// return; +// } +// if(StringUtils.isNotBlank(record.getStatusStr())){ +// String[] array = record.getStatusStr().split(","); +// for (String status:array) { +// if(status.equals(EnumWxTopicStatus.INVAILD.getCode().toString())){ +// record.setQueryDownLineStatus(true); +// break; +// } +// } +// } +// } + @Override public PageInfo listAsPage(WxTopic record, Integer pageIndex, Integer pageSize) { + wxTopicMapper.updateStatus(); if(StringUtils.isNotBlank(record.getStatusStr())){ String[] array = record.getStatusStr().split(","); List integerList = new ArrayList<>(); diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index 0a6b8653c..850fa715e 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -26,13 +26,9 @@ and `id` = #{id} - and `tenant_id` = #{tenantId} - - and `status` = #{status} - and `begin_time` >= #{beginTime} @@ -45,7 +41,9 @@ #{statusItem} - + + and `name` like concat('%',#{name},'%') + order by createtime desc @@ -60,5 +58,8 @@ order by t.createtime desc limit 1 + + update wx_topic set status = 2 where now() >= end_time and status !=3 +