优化

gongzuming

2024-11-12 24f7f046f8854d63839ad52d0cff34ea45a0f449

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

@@ -7,9 +7,11 @@
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.payment.*;
import com.mzl.flower.dto.request.report.QueryAppSupplierDTO;
import com.mzl.flower.dto.response.flower.ParamItemDTO;
import com.mzl.flower.dto.response.flower.StationStatisticDTO;
import com.mzl.flower.dto.response.payment.*;
import com.mzl.flower.dto.response.report.AppSupplierStatisticsVO;
import com.mzl.flower.dto.response.supplier.SupplierOrderDTO;
import com.mzl.flower.entity.payment.*;
import com.mzl.flower.entity.supplier.Station;
@@ -21,6 +23,7 @@
import com.mzl.flower.mapper.supplier.StationMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.service.flower.FlowerParamService;
import com.mzl.flower.service.report.OrderReportService;
import com.mzl.flower.utils.UUIDGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -74,6 +77,9 @@
    @Autowired
    private OrderItemSettlementService orderItemSettlementService;

    @Autowired
    private OrderReportService orderReportService;

    public void createDeliveryOrder(Order order) {
        String orderId = order.getId();
        String orderNo = order.getOrderNo();
@@ -124,6 +130,11 @@
            List<String> statusLs = new ArrayList<>();
            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 +513,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);
@@ -517,11 +534,21 @@
            LocalDateTime s1 = endDate.plusDays(-30);
            Integer dealCountDay30 = deliveryOrderItemMapper.getDoItemCount(supplierId, null, s1, endDate);
            dto.setDealCountDay30(dealCountDay30);

            // 供应商 总成交、本月成交、上月成交、今日成交、缺货（本月）、上月质检缺货、本月质检降级、上月质检降级、本月质检补货、上月质检补货
            QueryAppSupplierDTO appDto=new QueryAppSupplierDTO();
            appDto.setSupplierId(supplierId);
            final AppSupplierStatisticsVO appSupplierStatistics = orderReportService.getAppSupplierStatistics(appDto);
            BeanUtils.copyProperties(appSupplierStatistics,dto);
        }

        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();