From d3b1427b1e919cfb42004f9e5430f078b1399a8e Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 13 六月 2024 18:08:55 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
index 9c3ce3f..23e8c63 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -41,6 +41,8 @@
import com.ruoyi.system.api.domain.vo.HomeGoodsSkuListVO;
import com.ruoyi.system.api.domain.vo.getHomeGoodsSkuXxiVO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
+
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -333,35 +335,49 @@
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDateTime newTime7 = now.minusYears(30);
String formattedDate7 = newTime7.format(formatter);
- LocalDateTime parseTime7 = LocalDateTime.parse(formattedDate7, formatter);
- wrapper3.gt(GoodsSku::getYears,parseTime7);
+ LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
+ wrapper3.le(GoodsSku::getYears,parseTime7);
}
if(homeGoodsSkuDTO.getYear()==3){
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDateTime newTime7 = now.minusYears(30);
String formattedDate7 = newTime7.format(formatter);
- LocalDateTime parseTime7 = LocalDateTime.parse(formattedDate7, formatter);
+ LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
LocalDateTime newTime15 = now.minusYears(15);
String formattedDate15 = newTime15.format(formatter);
- LocalDateTime parseTime15= LocalDateTime.parse(formattedDate15, formatter);
- wrapper3.gt(GoodsSku::getYears, parseTime15)
- .le(GoodsSku::getYears, parseTime7);
+ LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+ wrapper3.le(GoodsSku::getYears, parseTime15)
+ .gt(GoodsSku::getYears, parseTime7);
}
- if(homeGoodsSkuDTO.getYear()==3){
+ if(homeGoodsSkuDTO.getYear()==4){
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDateTime newTime7 = now.minusYears(5);
String formattedDate7 = newTime7.format(formatter);
- LocalDateTime parseTime7 = LocalDateTime.parse(formattedDate7, formatter);
+ LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
LocalDateTime newTime15 = now.minusYears(15);
String formattedDate15 = newTime15.format(formatter);
- LocalDateTime parseTime15= LocalDateTime.parse(formattedDate15, formatter);
- wrapper3.ge(GoodsSku::getYears, parseTime7)
- .le(GoodsSku::getYears, parseTime15);
+ LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+ wrapper3.le(GoodsSku::getYears, parseTime7)
+ .gt(GoodsSku::getYears, parseTime15);
+ }
+
+ if(homeGoodsSkuDTO.getYear()==5){
+ LocalDateTime now = LocalDateTime.now();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDateTime newTime7 = now.minusYears(1);
+ String formattedDate7 = newTime7.format(formatter);
+ LocalDateTime parseTime7 = LocalDate.parse(formattedDate7).atStartOfDay();
+
+ LocalDateTime newTime15 = now.minusYears(5);
+ String formattedDate15 = newTime15.format(formatter);
+ LocalDateTime parseTime15= LocalDate.parse(formattedDate15).atStartOfDay();
+ wrapper3.le(GoodsSku::getYears, parseTime7)
+ .ge(GoodsSku::getYears, parseTime15);
}
wrapper3.orderByAsc(GoodsSku::getSortNum);
Page<GoodsSku> page1 = this.page(page, wrapper3);
--
Gitblit v1.7.1