Merge branch 'master' of http://192.168.89.173/rays/pcloud-book

pcloud-service-book/src/main/java/com/pcloud/book/push/check/PushCheck.java

@@ -37,6 +37,15 @@ public class PushCheck {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "群发类型不能为空！");
         }
         checkPushTime(push);
+        if (push.getStartTime() != null && (push.getStartTime().getTime() - DateUtils.getDayStart(new Date()).getTime() < 0)) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "开始时间必须在现在时间之后！");
+        }
+        if (push.getEndTime() != null && (push.getEndTime().getTime() - System.currentTimeMillis() <= 0)) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "结束时间必须在现在时间之后！");
+        }
+        if (push.getStartTime() != null && push.getEndTime() != null && push.getStartTime().getTime() - push.getEndTime().getTime() > 0) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "开始时间必须在结束时间之前！");
+        }
         if (ListUtils.isEmpty(push.getPushGroups())) {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "发送群不能为空！");
         }