From 1f2bf377f0c41e5ba9d3b0094034e5637d81d6f3 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 26 八月 2024 15:52:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
index 5b7871e..3a8cc6e 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderItemSalesService.java
@@ -172,10 +172,10 @@
}
public Page<OrderItemSalesNewListDTO> selectSalesList(Page page, OrderItemSalesQueryDTO dto){
- dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr()));
- dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr()));
- dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr()));
- dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr()));
+ dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
+ dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
+ dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
+ dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(page, dto);
@@ -184,10 +184,10 @@
}
public void exportSalesList(HttpServletResponse response, OrderItemSalesQueryDTO dto){
- dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr()));
- dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr()));
- dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr()));
- dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr()));
+ dto.setOrderStartDate(parseLocalDateTime(dto.getOrderStartDateStr(), true));
+ dto.setOrderEndDate(parseLocalDateTime(dto.getOrderEndDateStr(), false));
+ dto.setSalesStartDate(parseLocalDateTime(dto.getSalesStartDateStr(), true));
+ dto.setSalesEndDate(parseLocalDateTime(dto.getSalesEndDateStr(), false));
List<OrderItemSalesNewListDTO> ls = orderItemSalesMapper.selectItemSalesList(null, dto);
codeDecorator.decorate(ls);
--
Gitblit v1.9.3