Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-10-12 021fcaca65cc87874e216630153e17455acaabce

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

@@ -3,8 +3,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
import com.mzl.flower.dto.response.report.OrderReportResultVO;
import com.mzl.flower.mapper.report.OrderReportMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.service.calendar.CalendarService;
@@ -13,6 +18,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import javax.servlet.http.HttpServletResponse;
@@ -20,7 +26,6 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -201,51 +206,36 @@
    }

    @Override
    public Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryOrderDTO dto) {
        List<OrderReportCalendarBO> calendarBOList= calendarService.getOrderDatePage(page,dto);
    public Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryPartnerOrderDTO dto) {

        final List<OrderPartnerReportResultVO> list = calendarBOList.stream().map(calendarBO -> {
            if(null!=dto.getPartnerId()) calendarBO.setPartnerId(dto.getPartnerId());
//            if(null!=dto.getPartnerFlag()) calendarBO.setPartnerFlag(dto.getPartnerFlag());
            // 查询合伙人
            calendarBO.setPartnerFlag(1);
            OrderPartnerReportResultVO vo2=orderReportMapper.getPartnerOrderDateReport(calendarBO);
            if(null==vo2) vo2=new OrderPartnerReportResultVO();
            vo2.setOrderDate(calendarBO.getCalDate());

            return vo2;
        }).collect(Collectors.toList());

        page.setRecords(list);
        return page;
        if(null!=dto.getPaymentDateStart())
            dto.setStartDate(calculateStartTime(dto.getPaymentDateStart()));
        if(null!=dto.getPaymentDateEnd())
            dto.setEndDate(calculateEndTime(dto.getPaymentDateEnd()));
        Page<OrderPartnerReportResultVO> result=orderReportMapper.getPartnerOrderDateReportPage(page,dto);
        return result;
    }

    @Override
    public OrderPartnerReportResultVO getPartnerSaleStatis(QueryOrderDTO dto) {

        OrderReportCalendarBO bo=new OrderReportCalendarBO();
        if(null!=dto.getPartnerId()) bo.setPartnerId(dto.getPartnerId());
        bo.setStartDate(calculateStartTime(dto.getStartDate()));
        bo.setEndDate(calculateEndTime(dto.getEndDate()));
        OrderPartnerReportResultVO vo2=orderReportMapper.getPartnerOrderDateReportStatis(bo);

    public OrderPartnerReportResultVO getPartnerSaleStatis(QueryPartnerOrderDTO dto) {
        if(null!=dto.getPaymentDateStart())
            dto.setStartDate(calculateStartTime(dto.getPaymentDateStart()));
        if(null!=dto.getPaymentDateEnd())
            dto.setEndDate(calculateEndTime(dto.getPaymentDateEnd()));
        OrderPartnerReportResultVO vo2=orderReportMapper.getPartnerOrderDateReportStatis(dto);
        return vo2;
    }

    @Override
    public void exportPartnerSalesList(HttpServletResponse response, QueryOrderDTO dto) {
        List<OrderReportCalendarBO> calendarBOList= calendarService.getOrderDateList(dto);
        final List<OrderPartnerReportResultVO> list = calendarBOList.stream().map(calendarBO -> {
            if(null!=dto.getPartnerId()) calendarBO.setPartnerId(dto.getPartnerId());
//            if(null!=dto.getPartnerFlag()) calendarBO.setPartnerFlag(dto.getPartnerFlag());
            // 查询合伙人
            calendarBO.setPartnerFlag(1);
            OrderPartnerReportResultVO vo2=orderReportMapper.getPartnerOrderDateReport(calendarBO);
            if(null==vo2) vo2=new OrderPartnerReportResultVO();
            vo2.setOrderDate(calendarBO.getCalDate());
    public void exportPartnerSalesList(HttpServletResponse response, QueryPartnerOrderDTO dto) {

            return vo2;
        }).collect(Collectors.toList());
        if(null!=dto.getPaymentDateStart())
            dto.setStartDate(calculateStartTime(dto.getPaymentDateStart()));
        if(null!=dto.getPaymentDateEnd())
            dto.setEndDate(calculateEndTime(dto.getPaymentDateEnd()));

        List<OrderPartnerReportResultVO> list = orderReportMapper.getPartnerOrderDateReportList(dto);


        String[] rowsName = new String[]{"序号","下单日期", "合伙人ID", "合伙人","底价"
                , "合伙人加价",  "会员折扣","优惠券","售后扣合伙人款","总包干费","实际销售扎数"};
@@ -255,7 +245,7 @@
            Object[] objs = new Object[rowsName.length];
            int a = 0;
            objs[a++] = sn; // 序号
            objs[a++] = format(o.getOrderDate(), "yyyy-MM-dd"); // 下单日期
            objs[a++] = o.getOrderDate(); // 下单日期
            objs[a++] = o.getPartnerId(); // 合伙人ID
            objs[a++] = o.getPartnerName(); // 合伙人
            objs[a++] = o.getOrderPartnerPriceAmount(); // 合伙人底价
@@ -269,9 +259,9 @@
            sn++;
        }

        ExcelExportUtil excelExportUtil = new ExcelExportUtil("财务报表", rowsName, dataList, response);
        ExcelExportUtil excelExportUtil = new ExcelExportUtil("合伙人财务报表", rowsName, dataList, response);
        try {
            response.addHeader("filename", URLEncoder.encode("财务报表.xls", "UTF-8"));
            response.addHeader("filename", URLEncoder.encode("合伙人财务报表.xls", "UTF-8"));
            response.addHeader("Access-Control-Expose-Headers", "filename");
            excelExportUtil.export();
        } catch (Exception e) {
@@ -286,8 +276,8 @@
            throw new ValidationException("日期不能为空");
        }
        supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
        supplierReportCalendarBO.setStartDate(dto.getStartDate());
        supplierReportCalendarBO.setEndDate(dto.getEndDate());
        supplierReportCalendarBO.setStartDate(calculateStartTime(dto.getStartDate().atStartOfDay()));
        supplierReportCalendarBO.setEndDate(calculateEndTime(dto.getEndDate().atStartOfDay()));
        List<OrderSupplierReportResultVO> list = orderReportMapper.getOrderSupplierPageReport(supplierReportCalendarBO, page);
        page.setRecords(list);
        return page;
@@ -300,8 +290,8 @@
            throw new ValidationException("日期不能为空");
        }
        supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
        supplierReportCalendarBO.setStartDate(dto.getStartDate());
        supplierReportCalendarBO.setEndDate(dto.getEndDate());
        supplierReportCalendarBO.setStartDate(calculateStartTime(dto.getStartDate().atStartOfDay()));
        supplierReportCalendarBO.setEndDate(calculateEndTime(dto.getEndDate().atStartOfDay()));
        OrderSupplierReportResultVO orderSupplierCountReport = orderReportMapper.getOrderSupplierCountReport(supplierReportCalendarBO);
        return orderSupplierCountReport;
    }
@@ -314,30 +304,32 @@
            throw new ValidationException("日期不能为空");
        }
        supplierReportCalendarBO.setSupplierId(dto.getSupplierId());
        supplierReportCalendarBO.setStartDate(dto.getStartDate());
        supplierReportCalendarBO.setEndDate(dto.getEndDate());
        supplierReportCalendarBO.setStartDate(calculateStartTime(dto.getStartDate().atStartOfDay()));
        supplierReportCalendarBO.setEndDate(calculateEndTime(dto.getEndDate().atStartOfDay()));
        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++;
            if(!ObjectUtils.isEmpty(o)) {
                Object[] objs = new Object[rowsName.length];
                int a = 0;
                objs[a++] = sn; // 序号
                objs[a++] = format(o.getDateinfo(), "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);
@@ -362,5 +354,21 @@
        LocalDateTime endOfDay = endDateTime.with(LocalTime.of(17, 0, 0));
        return endOfDay;
    }


    // 计算 startDate 前一天的 17:00:00
    public static LocalDateTime calculateStartTime(LocalDate startDate) {
        // 获取前一天的日期，并将时间设为 17:00:00
        LocalDateTime previousDay = startDate.minusDays(1).atTime(LocalTime.of(17, 0, 0));
        return previousDay;
    }

    // 计算 endDate 当天的 17:00:00
    public static LocalDateTime calculateEndTime(LocalDate endDate) {
        // 将时间部分固定为 17:00:00
        LocalDateTime endOfDay = endDate.atTime(LocalTime.of(17, 0, 0));
        return endOfDay;
    }

}