供应商 统计数据

Cui Zhi Feng

2024-09-26 df4601a0941bd696ef682ca146867120f8d1b90f

供应商 统计数据

 src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java

@@ -125,6 +125,11 @@
            statusLs.add(Constants.DELIVERY_ORDER_STATUS.ARRIVED.name());
            statusLs.add(Constants.DELIVERY_ORDER_STATUS.CHECKED.name());
            dto.setStatusList(statusLs);
        } else if (Constants.DELIVERY_ORDER_STATUS.PENDING.name().equals(dto.getStatus())) {
            List<String> statusLs = new ArrayList<>();
            statusLs.add(Constants.DELIVERY_ORDER_STATUS.NO_LOCATION.name());
            statusLs.add(Constants.DELIVERY_ORDER_STATUS.PENDING.name());
            dto.setStatusList(statusLs);
        } else {
            dto.setStatusList(splitParam(dto.getStatus()));
        }
@@ -502,11 +507,17 @@
            }
            dto.setSalesRate(salesRate);

            Integer deliverCount = deliveryOrderItemMapper.getDoItemCount(supplierId, Constants.DELIVERY_ORDER_STATUS.NO_LOCATION.name(), startDate, endDate);
            dto.setDeliverCount(deliverCount == null ? 0 : deliverCount);
            Integer deliverCount1 = deliveryOrderItemMapper.getDoItemCount(supplierId, Constants.DELIVERY_ORDER_STATUS.NO_LOCATION.name(), startDate, endDate);
            Integer deliverCount2 = deliveryOrderItemMapper.getDoItemCount(supplierId, Constants.DELIVERY_ORDER_STATUS.PENDING.name(), startDate, endDate);
            Integer deliverCount = getInteger(deliverCount1) + getInteger(deliverCount2);
            dto.setDeliverCount(deliverCount);

            Integer deliverCount3 = deliveryOrderItemMapper.getDoItemCount(supplierId, Constants.DELIVERY_ORDER_STATUS.ARRIVED.name(), startDate, endDate);
            Integer deliverCount4 = deliveryOrderItemMapper.getDoItemCount(supplierId, Constants.DELIVERY_ORDER_STATUS.CHECKED.name(), startDate, endDate);
            Integer dc = getInteger(deliverCount3) + getInteger(deliverCount4);
            dto.setDeliverTotal(dc);

            Integer deliverTotal = deliveryOrderItemMapper.getDoItemCount(supplierId, null, startDate, endDate);
            dto.setDeliverTotal(deliverTotal == null ? 0 : deliverTotal);
            dto.setDealCountToday(deliverTotal);

            LocalDateTime e = LocalDate.now().withDayOfMonth(1).atTime(17, 0, 0).plusDays(-1);
@@ -522,6 +533,10 @@
        return dto;
    }

    private Integer getInteger(Integer c){
        return c == null ? 0 : c;
    }

    public List<StationStatisticDTO> statisticStationList(String name, LocalDateTime startDate
            , LocalDateTime endDate, String status) {
        String userId = SecurityUtils.getUserId();