From 19f963e688b672c2dba9eb77aeea57b4eab62829 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期二, 29 十月 2024 11:34:14 +0800
Subject: [PATCH] 菜单优化
---
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java | 136 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 114 insertions(+), 22 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 6b30c09..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
@@ -2,6 +2,7 @@
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;
@@ -16,12 +17,15 @@
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;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.ArrayList;
@@ -205,18 +209,33 @@
@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);
@@ -259,8 +278,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;
@@ -273,8 +292,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;
}
@@ -287,30 +306,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);
@@ -322,6 +343,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 部分
@@ -335,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