[账期调整][修改][修改生成逻辑]

mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java

@@ -80,8 +80,10 @@ public class WxTopicServiceImpl implements WxTopicService {
             dbquery.setStatus(EnumWxTopicStatus.VAILD.getCode());
             List<WxTopic> onLineTopicList = wxTopicMapper.findList(dbquery);
             for (WxTopic topic:onLineTopicList) {
-                if (query.getBeginTime().after(topic.getBeginTime()) && query.getEndTime().before(topic.getEndTime())) {
-                    return new ResultData(ErrorCode.SYS_REPEAT_SUBMIT_EXCEPTION.getCode(), "[" + topic.getName() + "]正在活动中，截止至" + DateUtils.date2String(topic.getEndTime(), "yyyy-MM-dd"));
+                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"));
                 }
             }
         }