order pack check bugfix;

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

@@ -372,9 +372,18 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             &&(!StringUtils.equals(pack.getPackaStartPeriod(),"0")||!StringUtils.equals(pack.getPackaEndPeriod(),"23"))) {
                 String preStartHour = DateUtils.parseDateToStr("H", request.getPreStartDate());
                 String preEndHour = DateUtils.parseDateToStr("H", request.getPreEndDate());
-                if (Integer.parseInt(pack.getPackaStartPeriod()) < Integer.parseInt(preStartHour)
-                        || Integer.parseInt(pack.getPackaEndPeriod()) < Integer.parseInt(preEndHour)) {
-                    throw new BaseException("预约时段非套餐可用时段！");
+                //1 可用开始时段<结束时段，则应该预约开始时间>可用开始时间，预约结束时间<可用结束时间
+                if(Integer.parseInt(pack.getPackaStartPeriod()) < Integer.parseInt(pack.getPackaEndPeriod())) {
+                    if (Integer.parseInt(pack.getPackaStartPeriod()) > Integer.parseInt(preStartHour)
+                            || Integer.parseInt(pack.getPackaEndPeriod()) < Integer.parseInt(preEndHour)) {
+                        throw new BaseException("预约时段非套餐可用时段！");
+                    }
+                    //1 可用开始时段>结束时段，代表可用时段跨日，则应该预约开始时间<可用开始时间，预约结束时间>可用结束时间
+                }else{
+                    if (Integer.parseInt(pack.getPackaStartPeriod()) < Integer.parseInt(preStartHour)
+                            || Integer.parseInt(pack.getPackaEndPeriod()) > Integer.parseInt(preEndHour)) {
+                        throw new BaseException("预约时段非套餐可用时段！");
+                    }
                 }
             }
         }