促销模板迭代至4.0，新增午休/试吃/品类

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/impl/PromPlanCoreServiceImpl.java

@@ -462,15 +462,13 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                         // 午休时间：上班时间<午休下班时间<午休上班时间<下班时间
                         LocalTime noonOutLocalTime = DateUtils.parseLocalTimeByEmdtime(row.get(8).toString());
                         LocalTime noonInLocalTime = DateUtils.parseLocalTimeByEmdtime(row.get(9).toString());
-
-                        if (ObjectUtils.allNotNull(noonOutLocalTime, noonInLocalTime)
-                                && inLocalTime.isBefore(noonOutLocalTime)
-                                && noonOutLocalTime.isBefore(noonInLocalTime)
-                                && noonInLocalTime.isBefore(outLocalTime))
-                        {
+                        if (LocalTime.MIDNIGHT.equals(noonOutLocalTime) && LocalTime.MIDNIGHT.equals(noonInLocalTime)) {
+                            dto.setNoonClockOutTime(null);
+                            dto.setNoonClockInTime(null);
+                        } else if (inLocalTime.isBefore(noonOutLocalTime) && noonOutLocalTime.isBefore(noonInLocalTime) && noonInLocalTime.isBefore(outLocalTime)) {
                             dto.setNoonClockOutTime(LocalDateTime.of(planDate, noonOutLocalTime));
                             dto.setNoonClockInTime(LocalDateTime.of(planDate, noonInLocalTime));
-                        }else {
+                        } else {
                             dto.setErrorMsg("时间错误，正确规则：上班时间<午休下班时间<午休上班时间<下班时间；");
                         }
                     }
@@ -775,15 +773,13 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                     // 午休时间：上班时间<午休下班时间<午休上班时间<下班时间
                     LocalTime noonOutLocalTime = DateUtils.parseLocalTimeByEmdtime(row.get(8).toString());
                     LocalTime noonInLocalTime = DateUtils.parseLocalTimeByEmdtime(row.get(9).toString());
-
-                    if (ObjectUtils.allNotNull(noonOutLocalTime, noonInLocalTime)
-                            && inLocalTime.isBefore(noonOutLocalTime)
-                            && noonOutLocalTime.isBefore(noonInLocalTime)
-                            && noonInLocalTime.isBefore(outLocalTime))
-                    {
+                    if (LocalTime.MIDNIGHT.equals(noonOutLocalTime) && LocalTime.MIDNIGHT.equals(noonInLocalTime)) {
+                        dto.setNoonClockOutTime(null);
+                        dto.setNoonClockInTime(null);
+                    } else if (inLocalTime.isBefore(noonOutLocalTime) && noonOutLocalTime.isBefore(noonInLocalTime) && noonInLocalTime.isBefore(outLocalTime)) {
                         dto.setNoonClockOutTime(LocalDateTime.of(planDate, noonOutLocalTime));
                         dto.setNoonClockInTime(LocalDateTime.of(planDate, noonInLocalTime));
-                    }else {
+                    } else {
                         dto.setErrorMsg("时间错误，正确规则：上班时间<午休下班时间<午休上班时间<下班时间；");
                     }
                 }