From d94e7d6bbf23698c27147a60ee866c64b2d43775 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java | 296 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 293 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
index 3c19f73..d1756a9 100644
--- a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
@@ -1,7 +1,14 @@
package com.mzl.flower.service.impl.report;
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;
@@ -10,10 +17,11 @@
import com.mzl.flower.service.report.OrderReportService;
import com.mzl.flower.utils.ExcelExportUtil;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
+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;
import java.net.URLEncoder;
@@ -21,7 +29,6 @@
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.List;
import java.util.stream.Collectors;
@@ -51,6 +58,21 @@
return vo2;
}).collect(Collectors.toList());
+ page.setRecords(list);
+ return page;
+ }
+
+ @Override
+ public Page<OrderDetailReportResultVO> getOrderDetailPage(Page page, QueryOrderDTO dto) {
+ OrderReportCalendarBO orderReportCalendarBO = new OrderReportCalendarBO();
+ if (StringUtils.isEmpty(dto.getCalDate())) {
+ throw new ValidationException("日期不能为空");
+ }
+ LocalDateTime orderTime = dto.getCalDate().atStartOfDay();
+ orderReportCalendarBO.setPartnerId(dto.getPartnerId());
+ orderReportCalendarBO.setStartDate(calculateStartTime(orderTime));
+ orderReportCalendarBO.setEndDate(calculateEndTime(orderTime));
+ List<OrderDetailReportResultVO> list = orderReportMapper.getOrderDetailReport(orderReportCalendarBO, page);
page.setRecords(list);
return page;
}
@@ -124,6 +146,230 @@
}
}
+ @Override
+ public void exportOrderDetail(HttpServletResponse response, QueryOrderDTO dto) {
+
+ if (StringUtils.isEmpty(dto.getCalDate())) {
+ throw new ValidationException("日期不能为空");
+ }
+ OrderReportCalendarBO orderReportCalendarBO = new OrderReportCalendarBO();
+ LocalDateTime orderTime = dto.getCalDate().atStartOfDay();
+ orderReportCalendarBO.setPartnerId(dto.getPartnerId());
+ orderReportCalendarBO.setStartDate(calculateStartTime(orderTime));
+ orderReportCalendarBO.setEndDate(calculateEndTime(orderTime));
+ List<OrderDetailReportResultVO> odrs = orderReportMapper.getOrderDetailReport(orderReportCalendarBO, null);
+ String[] rowsName = new String[]{"序号","订单号", "下单用户", "收货人地址", "合伙人", "下单时间", "订单金额"
+ , "花农底价", "平台区间加价", "平台加价", "平台区域加价", "合伙人加价", "合伙人区间加价", "会员折扣"
+ , "优惠券", "降级扣款", "缺货扣款", "补货扣款", "售后扣合伙人款", "售后扣花农款", "售后扣平台款", "总包干费"
+ , "销售扎数", "利润", "结算状态"};
+ List<Object[]> dataList = new ArrayList<>();
+ int sn = 1;
+ for (OrderDetailReportResultVO o : odrs) {
+ Object[] objs = new Object[rowsName.length];
+ int a = 0;
+ objs[a++] = sn;
+ objs[a++] = o.getOrderNo();
+ objs[a++] = o.getCustomer();
+ objs[a++] = o.getAddress();
+ objs[a++] = o.getPartnerName();
+ objs[a++] = o.getOrderDate();
+ objs[a++] = o.getOrderTotal();
+ 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.getOrderPriceDiscountAmount();
+ objs[a++] = o.getOrderCouponAmountTotal();
+ 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.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);
+ }
+
+ }
+
+ @Override
+ public Page<OrderPartnerReportResultVO> getPartnerSalePage(Page page, QueryPartnerOrderDTO dto) {
+
+ 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(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, QueryPartnerOrderDTO dto) {
+
+ 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", "合伙人","底价"
+ , "合伙人加价", "会员折扣","优惠券","售后扣合伙人款","总包干费","实际销售扎数"};
+ List<Object[]> dataList = new ArrayList<>();
+ int sn = 1;
+ for (OrderPartnerReportResultVO o : list) {
+ Object[] objs = new Object[rowsName.length];
+ int a = 0;
+ objs[a++] = sn; // 序号
+ objs[a++] = o.getOrderDate(); // 下单日期
+ objs[a++] = o.getPartnerId(); // 合伙人ID
+ objs[a++] = o.getPartnerName(); // 合伙人
+ objs[a++] = o.getOrderPartnerPriceAmount(); // 合伙人底价
+ objs[a++] = o.getOrderMarkupPartnerAmount(); //合伙人加价
+ objs[a++] = o.getOrderPriceDiscountAmount();//会员折扣
+ objs[a++] = o.getOrderCouponAmountTotal(); // 优惠券
+ objs[a++] = o.getOrderFeePartner(); //售后扣合伙人款
+ objs[a++] = o.getPartnerTotalFeeAmount(); // 总包干费
+ objs[a++] = o.getRealSaleNum(); // 实际销售扎数
+ 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);
+ }
+ }
+
+ @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(calculateStartTime(dto.getStartDate().atStartOfDay()));
+ supplierReportCalendarBO.setEndDate(calculateEndTime(dto.getEndDate().atStartOfDay()));
+ 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(calculateStartTime(dto.getStartDate().atStartOfDay()));
+ supplierReportCalendarBO.setEndDate(calculateEndTime(dto.getEndDate().atStartOfDay()));
+ 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(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) {
+ 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);
+ 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);
+ }
+ }
+
+ @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 部分
@@ -137,5 +383,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);
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3