From 715ba070dde400a6697b0b334fe8e9d2e5706f80 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期四, 12 九月 2024 21:03:49 +0800
Subject: [PATCH] 下单优惠券计算
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
index 2a11914..055edd1 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -34,6 +34,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -179,6 +180,8 @@
}
public Page<DeliveryOrderStatisticsDTO> selectSupplierDoStatistics(Page page){
+
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
LocalDate theDay = parseLocalDate("2024-08-03");
long current = page.getCurrent();
@@ -187,7 +190,7 @@
current = current == 0 ? 1 : current;
long endDays = (current - 1) * size;
- long beginDays = endDays + size;
+ long beginDays = endDays + size-1;
LocalDate beginDate = now.plusDays(-beginDays);
LocalDate endDate = now.plusDays(-endDays);
@@ -207,6 +210,7 @@
, fivePm.plusDays(-1), fivePm);
DeliveryOrderStatisticsDTO dto = new DeliveryOrderStatisticsDTO();
+ dto.setId(endDate.format(formatter));
dto.setDate(endDate);
dto.setNum(0);
dto.setPrice(new BigDecimal(0));
@@ -219,6 +223,14 @@
}
page.setRecords(ls);
+
+
+ // 获取当前日期
+ LocalDate today = LocalDate.now();
+ // 计算当前日期与给定日期的天数差
+ long daysBetween = ChronoUnit.DAYS.between(theDay, today);
+ page.setTotal(daysBetween);
+
return page;
}
--
Gitblit v1.9.3