pack check bugfix;

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -384,22 +384,13 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             }
             if(Objects.nonNull(pack.getPackaStartPeriod())&&Objects.nonNull(pack.getPackaEndPeriod())
             &&(!StringUtils.equals(pack.getPackaStartPeriod(),"0")||!StringUtils.equals(pack.getPackaEndPeriod(),"23"))) {
-                String preStartHour = DateUtils.parseDateToStr("HHmm", request.getPreStartDate());
-                String preEndHour = DateUtils.parseDateToStr("HHmm", request.getPreEndDate());
-                String packaStartPeriod1 = pack.getPackaStartPeriod();
-                //只有一位时，在前面补0
-                if (packaStartPeriod1.length() == 1) {
-                    packaStartPeriod1 = "0" + packaStartPeriod1;
-                }
-                String packaStartPeriod = packaStartPeriod1 + "00";
-                String packaEndPeriod1 = pack.getPackaEndPeriod();
-                //只有一位时，在前面补0
-                if (packaEndPeriod1.length() == 1) {
-                    packaEndPeriod1 = "0" + packaEndPeriod1;
-                }
-                String packaEndPeriod = packaEndPeriod1 + "00";
+                Integer preStartHour = Integer.parseInt(DateUtils.parseDateToStr("H", request.getPreStartDate()));
+                Integer preEndHour = Integer.parseInt(DateUtils.parseDateToStr("H", request.getPreEndDate()));
+                Integer packaStartPeriod = Integer.parseInt(pack.getPackaStartPeriod());
+                Integer packaEndPeriod = Integer.parseInt(pack.getPackaEndPeriod());
                 //1 开始时段<结束时段，则应该预约开始时间>可用开始时间，预约结束时间<可用结束时间
-                if (preEndHour.compareTo(preStartHour) > 0) {
+                if (Integer.parseInt(DateUtils.parseDateToStr("yyyyMMdd", request.getPreEndDate())) ==
+                        Integer.parseInt(DateUtils.parseDateToStr("yyyyMMdd", request.getPreStartDate()))) {
                     if (preStartHour.compareTo(packaStartPeriod) < 0 || packaEndPeriod.compareTo(preEndHour) < 0) {
                         throw new BaseException("预约时段非套餐可用时段！");
                     }