puzhibing
3 天以前 039dbb9ab16f295e91cfcdea5bf68bf16bc0417e
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -3972,6 +3972,8 @@
        MgtOrderTotal mgtOrderTotalFirst = orderMapper.totalOrderFirst(mgtShopOrderPageDto);
        MgtOrderTotal mgtOrderTotalSecond = orderMapper.totalOrderSecond(mgtShopOrderPageDto);
        MgtOrderTotal mgtOrderTotalThird = orderMapper.totalOrderThird(mgtShopOrderPageDto);
        MgtOrderTotal mgtOrderTotalFour = orderMapper.totalOrderFour(mgtShopOrderPageDto);
        mgtOrderTotal.setOrderTotal(mgtOrderTotalFirst.getOrderTotal());
        mgtOrderTotal.setOrderMoneyTotal(mgtOrderTotalFirst.getOrderMoneyTotal());
        mgtOrderTotal.setShopOrderTotal(mgtOrderTotalSecond.getShopOrderTotal());
@@ -4368,7 +4370,7 @@
     */
    private List<MgtMapBigTotalVo> bigListRemoveNull(List<MgtMapBigTotalVo> MgtMapIntTotalVos) {
        for (int i = 0; i < MgtMapIntTotalVos.size(); i++) {
            if (StringUtils.isBlank(MgtMapIntTotalVos.get(i).getMapKey())) {
            if(MgtMapIntTotalVos.get(i).getMapKey().isEmpty()){
                MgtMapIntTotalVos.remove(i);
            }
        }
@@ -4957,8 +4959,33 @@
        //获取来源销售排名
        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天