| @@ -71,29 +71,29 @@ public class WxTopicServiceImpl implements WxTopicService { | |||||
| @Override | @Override | ||||
| public ResultData saveOrUpdate(WxTopic record) { | 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<WxTopic> 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<WxTopic> 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) { | if (record.getId() == null) { | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||