From 0f82d6e7497e7ca252ea9f20648b5c8ddd5b9f2d Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 9 Jun 2025 09:03:56 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E8=B0=83?= =?UTF-8?q?=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/xkt/StoreProductController.java | 10 +++++----- .../com/ruoyi/xkt/service/IStoreProductService.java | 4 ++-- .../xkt/service/impl/StoreHomepageServiceImpl.java | 13 +++++++++---- .../xkt/service/impl/StoreProductServiceImpl.java | 4 ++-- .../xkt/service/impl/WebsitePCServiceImpl.java | 6 +++--- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java index 461eae2ee..ae75c49d9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java @@ -65,13 +65,13 @@ public class StoreProductController extends XktBaseController { } /** - * 推广营销（新品馆）模糊查询最新20天上新商品 + * 推广营销（新品馆）模糊查询最新30天上新商品 */ - @ApiOperation(value = "推广营销（新品馆）模糊查询最新20天上新商品", httpMethod = "GET", response = R.class) - @GetMapping(value = "/fuzzy/latest20") - public R> fuzzyQueryLatest20List(@RequestParam(value = "prodArtNum", required = false) String prodArtNum, + @ApiOperation(value = "推广营销（新品馆）模糊查询最新30天上新商品", httpMethod = "GET", response = R.class) + @GetMapping(value = "/fuzzy/latest30") + public R> fuzzyQueryLatest30List(@RequestParam(value = "prodArtNum", required = false) String prodArtNum, @RequestParam("storeId") Long storeId) { - return R.ok(BeanUtil.copyToList(storeProdService.fuzzyQueryLatest20List(storeId, prodArtNum), StoreProdFuzzyLatest20ResVO.class)); + return R.ok(BeanUtil.copyToList(storeProdService.fuzzyQueryLatest30List(storeId, prodArtNum), StoreProdFuzzyLatest20ResVO.class)); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java index 6e698ae43..4ce324726 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java @@ -151,11 +151,11 @@ public interface IStoreProductService { Integer batchDelete(StoreProdDeleteDTO deleteDTO) throws IOException; /** - * 推广营销查询最近20天上新商品 + * 推广营销查询最近30天上新商品 * * @param storeId 档口ID * @param prodArtNum 商品货号 * @return List */ - List fuzzyQueryLatest20List(Long storeId, String prodArtNum); + List fuzzyQueryLatest30List(Long storeId, String prodArtNum); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java index 246b9b490..cccc3ab14 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreHomepageServiceImpl.java @@ -181,10 +181,15 @@ public class StoreHomepageServiceImpl implements IStoreHomepageService { Map attrMap = attrList.stream() .collect(Collectors.toMap(StoreProdPriceAndMainPicAndTagDTO::getStoreProdId, Function.identity())); return recommendList.stream().map(x -> { - StoreProdPriceAndMainPicAndTagDTO dto = attrMap.get(x.getBizId()); - final List tags = ObjectUtils.isNotEmpty(dto) && StringUtils.isNotBlank(dto.getTagStr()) ? Arrays.asList(dto.getTagStr().split(",")) : null; - return BeanUtil.toBean(dto, StoreRecommendResDTO.class).setTags(tags); - }).collect(Collectors.toList()); + StoreProdPriceAndMainPicAndTagDTO dto = attrMap.get(x.getBizId()); + if (ObjectUtils.isEmpty(dto)) { + return null; + } + final List tags = ObjectUtils.isNotEmpty(dto) && StringUtils.isNotBlank(dto.getTagStr()) ? Arrays.asList(dto.getTagStr().split(",")) : null; + return BeanUtil.toBean(dto, StoreRecommendResDTO.class).setTags(tags); + }) + .filter(ObjectUtils::isNotEmpty) + .collect(Collectors.toList()); } /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 246f6c5c4..6c0909225 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -483,8 +483,8 @@ public class StoreProductServiceImpl implements IStoreProductService { */ @Override @Transactional(readOnly = true) - public List fuzzyQueryLatest20List(Long storeId, String prodArtNum) { - LocalDateTime daysAgo = LocalDateTime.now().minusDays(20).withHour(0).withMinute(0).withSecond(0); + public List fuzzyQueryLatest30List(Long storeId, String prodArtNum) { + LocalDateTime daysAgo = LocalDateTime.now().minusDays(30).withHour(0).withMinute(0).withSecond(0); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(StoreProduct::getStoreId, storeId).eq(StoreProduct::getDelFlag, Constants.UNDELETED) .between(StoreProduct::getCreateTime, daysAgo, LocalDateTime.now()); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java index 722b311ea..858357f0d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/WebsitePCServiceImpl.java @@ -1666,12 +1666,12 @@ public class WebsitePCServiceImpl implements IWebsitePCService { .build(); boolQuery.filter(f -> f.terms(t -> t.field("season.keyword").terms(termsQueryField))); } - // 如果是按照时间过滤，则表明是“新品”，则限制 时间范围 20天前到现在 + // 如果是按照时间过滤，则表明是“新品”，则限制 时间范围 30天前到现在 if (Objects.equals(searchDTO.getSort(), "createTime")) { // 当前时间 final String nowStr = DateUtils.getTime(); - // 当前时间往前推20天，获取当天的0点0分0秒 - LocalDateTime ago = LocalDateTime.now().minusDays(20).withHour(0).withMinute(0).withSecond(0); + // 当前时间往前推30天，获取当天的0点0分0秒 + LocalDateTime ago = LocalDateTime.now().minusDays(30).withHour(0).withMinute(0).withSecond(0); // ago 转化为 yyyy-MM-dd HH:mm:ss String agoStr = ago.format(DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS)); RangeQuery.Builder builder = new RangeQuery.Builder();