czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into prod

This commit is contained in:
GYJ 2025-04-06 18:14:31 +08:00
parent ce04529394 f1119ddf29
commit 90be23cc09
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java
View File

@ -112,12 +112,13 @@ public class UProductServiceImpl extends ServiceImpl<ProductMapper, Product> imp
product.setIsSaleTime(isSaleTime); product.setIsSaleTime(isSaleTime);
}); });
switch (group.getSortMode()) { // switch (group.getSortMode()) {
case "0" -> productList.sort(Comparator.comparing(ShopProductVo::getSalePrice)); // case "0" -> productList.sort(Comparator.comparing(ShopProductVo::getSalePrice));
case "1" -> productList.sort((o1, o2) -> o2.getSalePrice().compareTo(o1.getSalePrice())); // case "1" -> productList.sort((o1, o2) -> o2.getSalePrice().compareTo(o1.getSalePrice()));
case "2" -> productList.sort((o1, o2) -> o2.getSort().compareTo(o1.getSort())); // case "2" -> productList.sort((o1, o2) -> o2.getSort().compareTo(o1.getSort()));
//
} // }
productList.sort(Comparator.comparing(ShopProductVo::getSalePrice));
group.setProductList(productList); group.setProductList(productList);
} }
return groupList.stream().filter(group -> CollUtil.isNotEmpty(group.getProductList())).toList(); return groupList.stream().filter(group -> CollUtil.isNotEmpty(group.getProductList())).toList();