diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index ccb88f6..8c351b0 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -423,15 +423,15 @@ public class JDUtils { case "违规排行": { List oneYearOrders = filterOrdersByDate(orderRows, 365); // 计算出skuId 违规的前7个排行 - Map skuIdViolationCountMap = oneYearOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 + Map skuIdViolationCountMap = oneYearOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).filter(orderRow -> orderRow.getSkuId() != null).collect(Collectors.groupingBy(OrderRow::getSkuId, Collectors.counting())); - List> sortedViolationCounts = skuIdViolationCountMap.entrySet().stream() + || orderRow.getValidCode() == 2).filter(orderRow -> orderRow.getSkuId() != null).collect(Collectors.groupingBy(OrderRow::getSkuName, Collectors.counting())); + List> sortedViolationCounts = skuIdViolationCountMap.entrySet().stream() .sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).limit(7).collect(Collectors.toList()); - for (Map.Entry entry : sortedViolationCounts) { - Long skuId = entry.getKey(); + for (Map.Entry entry : sortedViolationCounts) { + String skuName = entry.getKey(); Long count = entry.getValue(); - content.append("商品:").append(skuId).append(" 违规次数:").append(count).append("\r"); + content.append("商品:").append(skuName).append(" 违规次数:").append(count).append("\r"); } content.append("违规排行:");