wrj 3 днів тому
батько
коміт
a87dfdabe7

+ 9 - 4
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/HomeController.java

@@ -84,13 +84,18 @@ public class HomeController {
 
         //块
         HomeBlocks homeBlocks = new HomeBlocks();
-        Optional<Integer> orderNumMax = blockOrder.stream().max(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getOrderNum()).orElse(MassageConstants.INTEGER_ZERO));
-        homeBlocks.setOrderNum(orderNumMax.orElse(MassageConstants.INTEGER_ZERO));
+        if(blockOrder.size()>1){
+            Optional<Integer> orderNumMax = blockOrder.stream().max(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getOrderNum()).orElse(MassageConstants.INTEGER_ZERO));
+            homeBlocks.setOrderNum(orderNumMax.orElse(MassageConstants.INTEGER_ZERO));
+            Optional<BigDecimal> turnover = blockOrder.stream().max(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getTurnover()).orElse(BigDecimal.ZERO));
+            homeBlocks.setTurnover(turnover.orElse(BigDecimal.ZERO));
+        }else {
+            homeBlocks.setOrderNum(MassageConstants.INTEGER_ZERO);
+            homeBlocks.setTurnover(BigDecimal.ZERO);
+        }
         Optional<Integer> upOrderNum = blockOrder.stream().min(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getOrderNum()).orElse(MassageConstants.INTEGER_ZERO));
         homeBlocks.setUpOrderNum(upOrderNum.orElse(MassageConstants.INTEGER_ZERO));
 
-        Optional<BigDecimal> turnover = blockOrder.stream().max(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getTurnover()).orElse(BigDecimal.ZERO));
-        homeBlocks.setTurnover(turnover.orElse(BigDecimal.ZERO));
         Optional<BigDecimal> upTurnover = blockOrder.stream().min(Comparator.comparing(HomeBlock::getMonth)).map(i -> Optional.ofNullable(i.getTurnover()).orElse(BigDecimal.ZERO));
         homeBlocks.setUpTurnover(upTurnover.orElse(BigDecimal.ZERO));