|
@@ -1,5 +1,6 @@
|
|
|
package com.chelvc.cloud.vehicle.server.service.impl;
|
|
|
|
|
|
+import java.util.Comparator;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
|
|
@@ -53,7 +54,15 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
|
|
|
|
|
|
@Override
|
|
|
public List<CategoryDTO> listActiveCategories() {
|
|
|
- List<Category> categories = this.lambdaQuery().eq(Category::getEnabled, true).list();
|
|
|
+ List<Category> categories = this.lambdaQuery().eq(Category::getEnabled, true)
|
|
|
+ .orderByAsc(Category::getSort).list();
|
|
|
+ categories.sort(Comparator.comparing(Category::getType).thenComparing(Category::getSort));
|
|
|
+ return CategoryCopier.INSTANCE.copying(categories);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<CategoryDTO> listRecommendCategories(int size) {
|
|
|
+ List<Category> categories = this.baseMapper.listRecommendCategories(size);
|
|
|
return CategoryCopier.INSTANCE.copying(categories);
|
|
|
}
|
|
|
}
|