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

陶杰

2024-12-11 44050285d9b0f2df69e625f92e69309a530902b6

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

@@ -103,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) {
@@ -113,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);
@@ -158,10 +179,12 @@
        orderReportCalendarBO.setStartDate(calculateStartTime(orderTime));
        orderReportCalendarBO.setEndDate(calculateEndTime(orderTime));
        List<OrderDetailReportResultVO> odrs = orderReportMapper.getOrderDetailReport(orderReportCalendarBO, null);
        String[] rowsName = new String[]{"序号","订单号", "下单用户", "收货人地址", "合伙人", "下单时间", "订单金额"
                , "花农底价", "平台区间加价", "平台加价", "平台区域加价", "合伙人加价", "合伙人区间加价", "会员折扣"
                , "优惠券", "降级扣款", "缺货扣款", "补货扣款", "售后扣合伙人款", "售后扣花农款", "售后扣平台款", "总包干费"
                , "销售扎数", "利润", "结算状态"};
        String[] rowsName = new String[]{"序号","订单号", "下单用户", "收货人地址", "合伙人", "下单时间", "订单金额","订单金额(实付)"
                , "花农底价", "平台区间加价", "平台加价", "平台区域加价", "合伙人加价", "合伙人区间加价",
                "优惠合计","会员折扣", "优惠券",
                "质检总扣款","降级扣款", "缺货扣款", "补货扣款",
                "售后总扣款","售后供应商扣款","售后平台扣款","售后合伙人扣款","售后打包扣款","售后质检扣款","售后物流扣款","售后打包运费扣款",
                "总包干费","总销售扎数","实际销售扎数","缺货扎数","降级扎数","补货扎数","利润","结算状态",};
        List<Object[]> dataList = new ArrayList<>();
        int sn = 1;
        for (OrderDetailReportResultVO o : odrs) {
@@ -174,22 +197,40 @@
            objs[a++] = o.getPartnerName();
            objs[a++] = o.getOrderDate();
            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.getPartnerTotalFeeAmount();
            objs[a++] = o.getRealSaleNum();

            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);
@@ -240,7 +281,9 @@


        String[] rowsName = new String[]{"序号","下单日期", "合伙人ID", "合伙人","底价"
                , "合伙人加价",  "会员折扣","优惠券","售后扣合伙人款","总包干费","实际销售扎数"};
                , "合伙人加价",  "会员折扣","优惠券","售后扣合伙人款","总包干费"
                ,"总售扎数","实际销售扎数","缺货扎数","降级扎数","补货扎数"
        };
        List<Object[]> dataList = new ArrayList<>();
        int sn = 1;
        for (OrderPartnerReportResultVO o : list) {
@@ -256,7 +299,13 @@
            objs[a++] = o.getOrderCouponAmountTotal(); // 优惠券
            objs[a++] = o.getOrderFeePartner(); //售后扣合伙人款
            objs[a++] = o.getPartnerTotalFeeAmount(); // 总包干费

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

            dataList.add(objs);
            sn++;
        }
@@ -347,7 +396,7 @@
    @Override
    public AppSupplierStatisticsVO getAppSupplierStatistics(QueryAppSupplierDTO dto) {

        // TODO


        // 总成交：花农售卖全部的底价合计，
        // 本月成交：本月售卖的底价合计，