fix:

cloudroam

2024-10-11 bb85777893c0a112d6b69b016d409ac37940d20c

 src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java

@@ -4,6 +4,8 @@
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.dto.request.report.QueryOrderDTO;
import com.mzl.flower.dto.request.report.QueryPartnerOrderDTO;
import com.mzl.flower.dto.request.report.QuerySupplierDTO;
import com.mzl.flower.dto.response.report.*;
import com.mzl.flower.dto.response.report.OrderDetailReportResultVO;
import com.mzl.flower.dto.response.report.OrderPartnerReportResultVO;
import com.mzl.flower.dto.response.report.OrderReportCalendarBO;
@@ -14,7 +16,6 @@
import com.mzl.flower.service.report.OrderReportService;
import com.mzl.flower.utils.ExcelExportUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -25,7 +26,6 @@
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

@Slf4j
@@ -252,6 +252,76 @@
        }
    }

    @Override
    public Page<OrderSupplierReportResultVO> getOrderSupplierPage(Page page, QuerySupplierDTO dto) {
        SupplierReportCalendarBO supplierReportCalendarBO = new SupplierReportCalendarBO();
        if (StringUtils.isEmpty(dto.getStartDate()) || StringUtils.isEmpty(dto.getEndDate())) {
            throw new ValidationException("日期不能为空");
        }
        supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
        supplierReportCalendarBO.setStartDate(dto.getStartDate());
        supplierReportCalendarBO.setEndDate(dto.getEndDate());
        List<OrderSupplierReportResultVO> list = orderReportMapper.getOrderSupplierPageReport(supplierReportCalendarBO, page);
        page.setRecords(list);
        return page;
    }

    @Override
    public OrderSupplierReportResultVO getOrderSupplierClout(QuerySupplierDTO dto) {
        SupplierReportCalendarBO supplierReportCalendarBO = new SupplierReportCalendarBO();
        if (StringUtils.isEmpty(dto.getStartDate()) || StringUtils.isEmpty(dto.getEndDate())) {
            throw new ValidationException("日期不能为空");
        }
        supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
        supplierReportCalendarBO.setStartDate(dto.getStartDate());
        supplierReportCalendarBO.setEndDate(dto.getEndDate());
        OrderSupplierReportResultVO orderSupplierCountReport = orderReportMapper.getOrderSupplierCountReport(supplierReportCalendarBO);
        return orderSupplierCountReport;
    }


    @Override
    public void exportSupplierList(HttpServletResponse response, QuerySupplierDTO dto) {
        SupplierReportCalendarBO supplierReportCalendarBO = new SupplierReportCalendarBO();
        if (StringUtils.isEmpty(dto.getStartDate()) || StringUtils.isEmpty(dto.getEndDate())) {
            throw new ValidationException("日期不能为空");
        }
        supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
        supplierReportCalendarBO.setStartDate(dto.getStartDate());
        supplierReportCalendarBO.setEndDate(dto.getEndDate());
        List<OrderSupplierReportResultVO> list = orderReportMapper.getOrderSupplierReport(supplierReportCalendarBO);

        String[] rowsName = new String[]{"序号","日期", "供应商ID", "供应商","花农底价"
                , "降级扣款",  "缺货扣款（缺货+补货）","售后扣花农款","售后扣合伙人款","实际销售扎数","结算费用","订单状态"};
        List<Object[]> dataList = new ArrayList<>();
        int sn = 1;
        for (OrderSupplierReportResultVO o : list) {
            Object[] objs = new Object[rowsName.length];
            int a = 0;
            objs[a++] = sn; // 序号
            objs[a++] = format(o.getOrderDate(), "yyyy-MM-dd"); // 日期
            objs[a++] = o.getSupplierId(); // 供应商ID
            objs[a++] = o.getSupplierName(); // 供应商
            objs[a++] = o.getOrderSupplierPriceAmount(); // 花农底价
            objs[a++] = o.getOrderCheckFee(); //降级扣款
            objs[a++] = o.getOrderLackFeeSupplier();//缺货扣款
            objs[a++] = o.getSalesFeeSupplier(); // 售后扣花农款
            objs[a++] = o.getRealSaleNum(); // 实际销售扎数
            objs[a++] = o.getProfitFeeAmount(); // 结算费用
            objs[a++] = o.getSettleStatus(); // 订单状态
            dataList.add(objs);
            sn++;
        }

        ExcelExportUtil excelExportUtil = new ExcelExportUtil("花农结算报表", rowsName, dataList, response);
        try {
            response.addHeader("filename", URLEncoder.encode("花农结算报表.xls", "UTF-8"));
            response.addHeader("Access-Control-Expose-Headers", "filename");
            excelExportUtil.export();
        } catch (Exception e) {
            log.error(e.getMessage(), e);
        }
    }
    // 计算 startDate 的前一天 17:00:00
    public static LocalDateTime calculateStartTime(LocalDateTime startDateTime) {
        // 获取 LocalDate 部分