From c9bdc58a6a9130f1c83962f114a9593a7af37014 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期一, 28 七月 2025 19:05:08 +0800 Subject: [PATCH] bug修改 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java index 9d6ea99..0e0d98d 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java @@ -4952,8 +4952,31 @@ //获取来源销售排名 List<MgtMapBigTotalVo> orderFromList = orderMapper.listPlTotalOrderTotalOrderFrom(mgtBasePlatformDto); if (orderFromList != null && orderFromList.size() > 0) { + + MgtMapBigTotalVo duoyin = new MgtMapBigTotalVo(); + duoyin.setMapKey("抖音"); + duoyin.setMapValue(totalOrderTotalVo.getDouyinAmount()); + + MgtMapBigTotalVo kauishou = new MgtMapBigTotalVo(); + kauishou.setMapKey("快手"); + kauishou.setMapValue(totalOrderTotalVo.getKuaishouAmount()); + + MgtMapBigTotalVo meituan = new MgtMapBigTotalVo(); + meituan.setMapKey("美团"); + meituan.setMapValue(totalOrderTotalVo.getMeituanAmount()); + orderFromList.add(duoyin); + orderFromList.add(kauishou); + orderFromList.add(meituan); orderFromList = bigListRemoveNull(orderFromList); - mgtTotalOrderTotalVo.setOrderFromRankList(orderFromList); + //排行 + List<MgtMapBigTotalVo> sortedList = orderFromList.stream() + // 按 mapValue 降序排序,处理 null 值(若 mapValue 可能为 null) + .sorted(Comparator.comparing( + MgtMapBigTotalVo::getMapValue, + Comparator.nullsLast(BigDecimal::compareTo).reversed() + )) + .collect(Collectors.toList()); + mgtTotalOrderTotalVo.setOrderFromRankList(sortedList); } //订单分布 //日期全部时固定为5天 -- Gitblit v1.7.1