增加排序

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java

@@ -489,6 +489,25 @@ public class SummaryServiceImpl implements SummaryService {
             ShopTableSaleInfoVo shopTableSaleInfoVo = tbOrderInfoRepository.queryShopTableSaleInfo(shopId.toString(), shopTableCode, start, end);
             list.add(shopTableSaleInfoVo);
         }
+
+        if (!list.isEmpty()) {
+            list.sort((a, b) -> {
+                // 先比较 orderAmount
+                BigDecimal aAmount = a.getOrderAmount() == null ? BigDecimal.ZERO : new BigDecimal(a.getOrderAmount().toString());
+                BigDecimal bAmount = b.getOrderAmount() == null ? BigDecimal.ZERO : new BigDecimal(b.getOrderAmount().toString());
+                int compareAmount = aAmount.compareTo(bAmount);
+                if (compareAmount != 0) {
+                    return compareAmount;
+                }
+
+                // 如果 orderAmount 相等，再比较 orderCount
+                Integer aCount = a.getOrderCount() == null ? 0 : Integer.parseInt(a.getOrderCount().toString());
+                Integer bCount = b.getOrderCount() == null ? 0 : Integer.parseInt(b.getOrderCount().toString());
+
+                return aCount - bCount;
+            });
+        }
+
         return list;
     }