diff --git a/src/main/java/com/xiang/service/module/jntyzx/miniapp/utils/VenueInfoUtils.java b/src/main/java/com/xiang/service/module/jntyzx/miniapp/utils/VenueInfoUtils.java index f3310b8..8fc82ce 100644 --- a/src/main/java/com/xiang/service/module/jntyzx/miniapp/utils/VenueInfoUtils.java +++ b/src/main/java/com/xiang/service/module/jntyzx/miniapp/utils/VenueInfoUtils.java @@ -38,38 +38,19 @@ public class VenueInfoUtils { } public static int sortVenueInfo(String placeName) { - if (placeName.contains("十号")) { + if (placeName.contains("十号") || placeName.contains("10")) { return 0; } - if (placeName.contains("九号")) { + if (placeName.contains("九号") || placeName.contains("9")) { return 1; } - if (placeName.contains("二号")) { + if (placeName.contains("二号") || placeName.contains("2")) { return 2; } - if (placeName.contains("八号")) { + if (placeName.contains("八号") || placeName.contains("8")) { return 3; } - if (placeName.contains("七号")) { - return 4; - } - return 5; - } - - public static int sortVenueInfo4Zlb(String placeName) { - if (placeName.contains("10号")) { - return 0; - } - if (placeName.contains("9号")) { - return 1; - } - if (placeName.contains("2号")) { - return 2; - } - if (placeName.contains("8号")) { - return 3; - } - if (placeName.contains("7号")) { + if (placeName.contains("七号") || placeName.contains("7")) { return 4; } return 5; diff --git a/src/main/java/com/xiang/service/module/jntyzx/zlb/schedule/ZlbUserConfigTask.java b/src/main/java/com/xiang/service/module/jntyzx/zlb/schedule/ZlbUserConfigTask.java index 7bfce4c..7683bcf 100644 --- a/src/main/java/com/xiang/service/module/jntyzx/zlb/schedule/ZlbUserConfigTask.java +++ b/src/main/java/com/xiang/service/module/jntyzx/zlb/schedule/ZlbUserConfigTask.java @@ -145,6 +145,6 @@ public class ZlbUserConfigTask extends BaseScheduleTaskTemplate { if (CollectionUtils.isEmpty(siteInfoList)) { return Lists.newArrayList(); } - return siteInfoList.stream().sorted(Comparator.comparing(item -> VenueInfoUtils.sortVenueInfo4Zlb(item.getPlaceName()))).collect(Collectors.toList()); + return siteInfoList.stream().sorted(Comparator.comparing(item -> VenueInfoUtils.sortVenueInfo(item.getPlaceName()))).collect(Collectors.toList()); } }