From 8cdf550932690ba9e0a6046f476b5144cbb995e4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 8 Dec 2021 16:10:50 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81=E4=B8=93=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxTopicServiceImpl.java | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 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 06ab8f64a..06def3a7e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -71,29 +71,29 @@ public class WxTopicServiceImpl implements WxTopicService { @Override public ResultData saveOrUpdate(WxTopic record) { //验证是否存在已发放的专题 - if(record.getStatus().equals(EnumWxTopicStatus.VAILD.getCode())) { - WxTopic query = new WxTopic(); - query.updateTenantInfo(record); - if(record.getId() != null && record.getBeginTime() == null){ - WxTopic wt = wxTopicMapper.selectById(record.getId()); - query.setBeginTime(wt.getBeginTime()); - query.setEndTime(wt.getEndTime()); - }else{ - query.setBeginTime(record.getBeginTime()); - query.setEndTime(record.getEndTime()); - } - WxTopic dbquery = new WxTopic(); - dbquery.updateTenantInfo(record); - dbquery.setStatus(EnumWxTopicStatus.VAILD.getCode()); - List onLineTopicList = wxTopicMapper.findList(dbquery); - for (WxTopic topic:onLineTopicList) { - if(DateUtils.belongCalendar(query.getBeginTime(),topic.getBeginTime(),topic.getEndTime()) - || DateUtils.belongCalendar(query.getEndTime(),topic.getBeginTime(),topic.getEndTime()) - || (query.getBeginTime().before(topic.getBeginTime())&&query.getEndTime().after(topic.getEndTime())) ){ - return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "[" + topic.getName() + "]正在活动中,"+DateUtils.date2String(topic.getBeginTime(), "yyyy-MM-dd")+"至" + DateUtils.date2String(topic.getEndTime(), "yyyy-MM-dd")); - } - } - } +// if(record.getStatus().equals(EnumWxTopicStatus.VAILD.getCode())) { +// WxTopic query = new WxTopic(); +// query.updateTenantInfo(record); +// if(record.getId() != null && record.getBeginTime() == null){ +// WxTopic wt = wxTopicMapper.selectById(record.getId()); +// query.setBeginTime(wt.getBeginTime()); +// query.setEndTime(wt.getEndTime()); +// }else{ +// query.setBeginTime(record.getBeginTime()); +// query.setEndTime(record.getEndTime()); +// } +// WxTopic dbquery = new WxTopic(); +// dbquery.updateTenantInfo(record); +// dbquery.setStatus(EnumWxTopicStatus.VAILD.getCode()); +// List onLineTopicList = wxTopicMapper.findList(dbquery); +// for (WxTopic topic:onLineTopicList) { +// if(DateUtils.belongCalendar(query.getBeginTime(),topic.getBeginTime(),topic.getEndTime()) +// || DateUtils.belongCalendar(query.getEndTime(),topic.getBeginTime(),topic.getEndTime()) +// || (query.getBeginTime().before(topic.getBeginTime())&&query.getEndTime().after(topic.getEndTime())) ){ +// return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "[" + topic.getName() + "]正在活动中,"+DateUtils.date2String(topic.getBeginTime(), "yyyy-MM-dd")+"至" + DateUtils.date2String(topic.getEndTime(), "yyyy-MM-dd")); +// } +// } +// } if (record.getId() == null) { final IdWorker idWorker = IdWorker.get();