1.财务报表-部分统计字段新增 2.合伙人报表-部分统计字段新增

陶杰

2024-12-11 c7d127ae867c00f01a7eb4977836565bcae6ee9f

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

@@ -2,17 +2,25 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.dto.request.report.QueryAppSupplierDTO;
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;
import com.mzl.flower.service.report.OrderReportService;
import com.mzl.flower.utils.ExcelExportUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hpsf.Decimal;
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 +28,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;
@@ -96,9 +103,11 @@
            return vo2;
        }).collect(Collectors.toList());

        String[] rowsName = new String[]{"序号","下单日期", "销售额", "花农底价", "平台区间加价", "平台加价", "平台区域加价"
                , "合伙人加价", "合伙人区间加价", "会员折扣","优惠券","降级扣款","缺货扣款","补货扣款","售后扣合伙人款","售后扣花农款",
                "售后扣平台款","总包干费","实际销售扎数","利润","结算状态",};
        String[] rowsName = new String[]{"序号","下单日期", "销售额(原订单)","销售额(实付)", "花农底价", "平台区间加价", "平台加价", "平台区域加价"
                , "合伙人加价", "合伙人区间加价","优惠合计", "会员折扣","优惠券",
                "质检总扣款","降级扣款","缺货扣款","补货扣款",
                "售后总扣款","售后供应商扣款","售后平台扣款","售后合伙人扣款","售后打包扣款","售后质检扣款","售后物流扣款","售后打包运费扣款",
                "总包干费","总销售扎数","实际销售扎数","缺货扎数","降级扎数","补货扎数","利润","结算状态",};
        List<Object[]> dataList = new ArrayList<>();
        int sn = 1;
        for (OrderReportResultVO o : list) {
@@ -106,23 +115,42 @@
            int a = 0;
            objs[a++] = sn; // 序号
            objs[a++] = format(o.getOrderDate(), "yyyy-MM-dd"); // 下单日期
            objs[a++] = o.getOrderTotal(); // 销售额
            objs[a++] = o.getOrderTotal(); // 销售额(原订单)
            objs[a++] = o.getTotalAmount(); // 销售额(实付)
            objs[a++] = o.getOrderSupplierPriceAmount(); // 花农底价
            objs[a++] = o.getOrderMarkupOneAmount(); // 平台区间加价
            objs[a++] = o.getOrderMarkupTwoAmount(); // 平台加价
            objs[a++] = o.getPlatformAreaFeeAmount(); //平台区域加价
            objs[a++] = o.getOrderMarkupPartnerAmount(); //合伙人加价
            objs[a++] = o.getPartnerSectionFeeAmount(); //合伙人区间加价

            objs[a++] = o.getOrderDiscountTotalFee();//优惠合计
            objs[a++] = o.getOrderPriceDiscountAmount();//会员折扣
            objs[a++] = o.getOrderCouponAmountTotal(); // 优惠券

            objs[a++] = o.getOrderCheckTotalFee();//质检总扣款
            objs[a++] = o.getOrderCheckFee();//降级扣款
            objs[a++] = o.getOrderLackFeeSupplier(); //缺货扣款
            objs[a++] = o.getOrderReplaceFee(); //补货扣款
            objs[a++] = o.getOrderFeePartner(); //售后扣合伙人款
            objs[a++] = o.getOrderFeeSupplier(); // 售后扣花农款
            objs[a++] = o.getOrderFeePlatform(); //售后扣平台款


            objs[a++] = o.getOrderTotalFee(); //售后总扣款
            objs[a++] = o.getOrderFeeSupplier(); //售后供应商扣款
            objs[a++] = o.getOrderFeePlatform(); //售后平台扣款
            objs[a++] = o.getOrderFeePartner(); //售后合伙人扣款
            objs[a++] = o.getOrderFeePlatformPack(); //售后打包扣款
            objs[a++] = o.getOrderFeePlatformCheck(); // 售后质检扣款
            objs[a++] = o.getOrderFeePlatformTransport(); //售后物流扣款
            objs[a++] = o.getOrderFeePackingTransport(); //售后打包运费扣款


            objs[a++] = o.getPartnerTotalFeeAmount(); // 总包干费
            objs[a++] = o.getOrderNum(); // 总销售扎数
            objs[a++] = o.getRealSaleNum(); // 实际销售扎数
            objs[a++] = o.getOrderLackNum(); // 缺货扎数
            objs[a++] = o.getOrderReduceNum(); // 降级扎数
            objs[a++] = o.getOrderReplaceNum(); // 补货扎数

            objs[a++] = o.getProfitFeeAmount(); //利润
            objs[a++] = o.getSettleStatus(); // 结算状态
            dataList.add(objs);
@@ -201,51 +229,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 +268,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 +282,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 +299,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 +313,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 +327,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);
@@ -349,6 +364,33 @@
            log.error(e.getMessage(), e);
        }
    }

    @Override
    public AppSupplierStatisticsVO getAppSupplierStatistics(QueryAppSupplierDTO dto) {



        // 总成交：花农售卖全部的底价合计，
        // 本月成交：本月售卖的底价合计，
        // 上月成交：上月售卖的底价合计，
        // 今日成交：今日售卖的底价合计，
        // 近30天成交扎数：最近30天扎数合计（已有），
        // 今日成交扎数（已有）
        // 缺货（本月）：本月质检缺货，并且web端审核通过的数量合计，
        // 缺货（上月）：上月质检缺货，并且web端审核通过的数量合计，
        // 降级（本月）：本月质检降级，并且web端审核通过的数量合计，
        // 降级（上月）：上月质检降级，并且web端审核通过的数量合计，
        // 补货（本月）：本月质检补货，并且web端审核通过的数量合计，
        // 补货（上月）：上月质检补货，并且web端审核通过的数量合计，

        // 当天的开始时间
        dto.setStartDateTime(getCurDayStartTime());
        // 当天的结束时间
        dto.setEndDateTime(getCurDayEndTime());

        return orderReportMapper.getAppSupplierAmountStatistics(dto);
    }

    // 计算 startDate 的前一天 17:00:00
    public static LocalDateTime calculateStartTime(LocalDateTime startDateTime) {
        // 获取 LocalDate 部分
@@ -362,5 +404,49 @@
        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;
    }

    // 获取当天的开始时间
    public static LocalDateTime getCurDayStartTime() {
        LocalDateTime now = LocalDateTime.now();
        LocalTime cutoffTime = LocalTime.of(17, 0);

        if (now.toLocalTime().isAfter(cutoffTime)) {
            // 当前时间大于17:00
            return LocalDateTime.of(now.toLocalDate(), cutoffTime);
        } else {
            // 当前时间小于等于17:00
            return LocalDateTime.of(now.minusDays(1).toLocalDate(), cutoffTime);
        }
    }

    // 获取当天的结束时间
    public static LocalDateTime getCurDayEndTime() {
        LocalDateTime now = LocalDateTime.now();
        LocalTime cutoffTime = LocalTime.of(17, 0);

        if (now.toLocalTime().isAfter(cutoffTime)) {
            // 当前时间大于17:00，结束时间为明天17:00
            return LocalDateTime.of(now.plusDays(1).toLocalDate(), cutoffTime);
        } else {
            // 当前时间小于等于17:00，结束时间为当天17:00
            return LocalDateTime.of(now.toLocalDate(), cutoffTime);
        }
    }

}