From 24b727d0bfbbc1f1d8870340fe51160cda423c60 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 12 Apr 2019 12:05:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BC=98=E5=8C=96=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E5=91=A8=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxTopicServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 88386a831..b7f165a0a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -62,6 +62,12 @@ public class WxTopicServiceImpl implements WxTopicService { @Override public ResultData saveOrUpdate(WxTopic record) { + if(record.getStatus().equals(EnumWxTopicStatus.VAILD.getCode())) { + WxTopic showTopic = wxTopicMapper.show(record); + if (showTopic != null) { + return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "["+showTopic.getName()+"]正在活动中,截止至"+ DateUtils.date2String(showTopic.getEndTime(),"yyyy-MM-dd")); + } + } if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); @@ -72,12 +78,6 @@ public class WxTopicServiceImpl implements WxTopicService { } return new ResultData(Result.SUCCESS,"添加成功"); } else { - if(record.getStatus().equals(EnumWxTopicStatus.VAILD.getCode())) { - WxTopic showTopic = wxTopicMapper.show(record); - if (showTopic != null) { - return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "["+showTopic.getName()+"]正在活动中,截止至"+ DateUtils.date2String(showTopic.getEndTime(),"yyyy-MM-dd")); - } - } record.setUpdatetime(new Date()); wxTopicMapper.updateByPrimaryKeySelective(record); if(StringUtils.isNotBlank(record.getCouponIds())) {