From 24f7f046f8854d63839ad52d0cff34ea45a0f449 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期二, 12 十一月 2024 13:10:17 +0800
Subject: [PATCH] 优化
---
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 0 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 9a28008..9427397 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,6 +17,7 @@
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;
@@ -23,6 +25,7 @@
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;
@@ -206,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);
@@ -325,6 +343,33 @@
log.error(e.getMessage(), e);
}
}
+
+ @Override
+ public AppSupplierStatisticsVO getAppSupplierStatistics(QueryAppSupplierDTO dto) {
+
+ // TODO
+
+ // 总成交：花农售卖全部的底价合计，
+ // 本月成交：本月售卖的底价合计，
+ // 上月成交：上月售卖的底价合计，
+ // 今日成交：今日售卖的底价合计，
+ // 近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 部分
@@ -338,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