From 5997dc8acfa81a6c867c28810d1c3c9714efc46c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 29 三月 2025 14:55:42 +0800
Subject: [PATCH] fix: 登录
---
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java | 256 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 237 insertions(+), 19 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 4d36436..a43f482 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
@@ -2,8 +2,11 @@
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;
@@ -14,18 +17,19 @@
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.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;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j
@@ -99,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) {
@@ -109,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);
@@ -154,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) {
@@ -170,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);
@@ -205,23 +250,40 @@
@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) {
@@ -237,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++;
}
@@ -250,6 +318,112 @@
} 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.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);
+ 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
@@ -265,5 +439,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