fix 过滤无规格平台

netflix-dao/src/main/java/com/cyksj/model/dto/YhServiceDto.java

@@ -35,6 +35,8 @@ public class YhServiceDto {
 
 	private String secondEndTime;
 
+	private String sortTime;
+
 
 	@Getter
 	@Setter
@@ -52,14 +54,19 @@ public class YhServiceDto {
 	}
 
 	public Boolean isBetween(LocalTime currentTime) {
-		return (!currentTime.isBefore(LocalTime.parse(startTime)) && !currentTime.isAfter(LocalTime.parse(endTime)))
-				||
-				(!StrUtil.hasEmpty(secondStartTime, secondEndTime) && !currentTime.isBefore(LocalTime.parse(secondStartTime)) && !currentTime.isAfter(LocalTime.parse(secondEndTime)));
+		return (!LocalTime.parse(startTime).isAfter(currentTime) && LocalTime.parse(endTime).isAfter(currentTime))
+				|| (!StrUtil.hasEmpty(secondStartTime, secondEndTime) && !LocalTime.parse(secondStartTime).isAfter(currentTime) && LocalTime.parse(secondEndTime).isAfter(currentTime));
 	}
 
 	public Boolean isAfter(LocalTime currentTime) {
-		return (LocalTime.parse(startTime).isAfter(currentTime))
-				||
-				(!StrUtil.hasEmpty(secondStartTime) && (LocalTime.parse(secondStartTime).isAfter(currentTime)));
+		if (LocalTime.parse(startTime).isAfter(currentTime)) {
+			this.sortTime = startTime;
+			return true;
+		}
+		if ((!StrUtil.hasEmpty(secondStartTime) && (LocalTime.parse(secondStartTime).isAfter(currentTime)))) {
+			this.sortTime = secondStartTime;
+			return true;
+		}
+		return false;
 	}
 }

netflix-service/src/main/java/com/cyksj/service/sys/impl/SysConfigServiceImpl.java

@@ -140,7 +140,7 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper,SysConfig>
 				DayOfWeek nextWorkDay = getNextWorkDay(currentDayOfWeek);
 				collect = getDutyService(nextWorkDay, workday, saturday, sunday);
 			}
-			collect.sort(Comparator.comparing(e -> DateUtil.parse(e.getStartTime(), "HH:mm")));
+			collect.sort(Comparator.comparing(e -> DateUtil.parse(e.getSortTime() == null ? e.getStartTime() : e.getSortTime(), "HH:mm")));
 			//获取下一天的早时
 			return List.of(collect.get(0));
 		}

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonController.java

@@ -205,6 +205,7 @@ public class CmsGoodsDonController {
         } else {
             conditionSql = "(special_type is null or special_type != 'giftCard')";
         }
+        conditionSql += "  and exists (select id from goods_don_sku sku where sku.goods_id = g.id limit 1)";
         List<GoodsDon> goodsDons = beanSearcher.searchAll(GoodsDon.class, mapBuilder
                 .put("condition", conditionSql)
                 .field(GoodsDon::getDeleted, true)