diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/api/AllocMealtimeApi.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/api/AllocMealtimeApi.java index e2867e08..42ad6d49 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/api/AllocMealtimeApi.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/api/AllocMealtimeApi.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Component; import java.time.LocalTime; import java.util.*; +import java.util.stream.Collectors; @Component public class AllocMealtimeApi { @@ -139,8 +140,9 @@ public class AllocMealtimeApi { } } - RedisUtil.setString(key, JacksonUtil.writeValueAsString(mealtimeList), 1800L); - return mealtimeList; + List mealtimeList2 = (List)mealtimeList.stream().sorted(Comparator.comparing(AllocMealtimeModel::getMealtimeType)).collect(Collectors.toList()); + RedisUtil.setString(key, JacksonUtil.writeValueAsString(mealtimeList2), 1800L); + return mealtimeList2; } public AllocMealtimeModel getUseAssignTimeMealtime(LocalTime assignTime, Long canteenId, Long stallId) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java index 942ab8c4..4b080012 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuRecipeServiceImpl.java @@ -373,6 +373,7 @@ public class MenuRecipeServiceImpl extends ServiceImpl