Commit 414e714f by 周晓航

对接api修改

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent a29ac354
......@@ -281,6 +281,10 @@ public class DeliveryHandle {
if (CollectionUtils.isNotEmpty(activityDayConfig)) {
for (DispatchConfig d : activityDayConfig) {
if (dateType == DispatchConfig.DATETYPE_TWO) {
// null 默认当做没配置
if (Objects.isNull(d.getStartTime()) || Objects.isNull(d.getEndTime())) {
return null;
}
// 并且不在 活动日内
boolean isActivityDay = currentDate.after(d.getStartTime()) && currentDate.before(d.getEndTime());
if (!isActivityDay) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment