From 1aa40f8e58ef01e07a87f84ba8d320a0e0742771 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Wed, 23 Jul 2025 23:54:58 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=8A=B6=E6=80=81=E5=8F=B3=E4=B8=8B=E8=A7=92=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/xkt/mapper/AdvertRoundMapper.java | 6 ++++-- .../java/com/ruoyi/xkt/mapper/ShoppingCartMapper.java | 9 +++++++-- .../com/ruoyi/xkt/mapper/StoreProductDemandMapper.java | 9 +++++++-- .../java/com/ruoyi/xkt/mapper/StoreProductMapper.java | 8 ++++++-- .../java/com/ruoyi/xkt/mapper/UserFavoritesMapper.java | 8 ++++++-- .../xkt/service/impl/AdminAdvertRoundServiceImpl.java | 4 +++- .../ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java | 7 ++++++- .../xkt/service/impl/StoreProductDemandServiceImpl.java | 5 ++++- .../ruoyi/xkt/service/impl/StoreProductServiceImpl.java | 4 +++- .../ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java | 5 ++++- xkt/src/main/resources/mapper/AdvertRoundMapper.xml | 1 + xkt/src/main/resources/mapper/ShoppingCartMapper.xml | 1 + .../main/resources/mapper/StoreProductDemandMapper.xml | 1 + xkt/src/main/resources/mapper/StoreProductMapper.xml | 1 + xkt/src/main/resources/mapper/UserFavoritesMapper.xml | 1 + 15 files changed, 55 insertions(+), 15 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundMapper.java index 8aec7bc04..095afbd5f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/AdvertRoundMapper.java @@ -9,7 +9,7 @@ import com.ruoyi.xkt.dto.advertRound.AdvertRoundStorePageDTO; import com.ruoyi.xkt.dto.advertRound.AdvertRoundStorePageResDTO; import org.apache.ibatis.annotations.Param; -import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -65,9 +65,11 @@ public interface AdvertRoundMapper extends BaseMapper { /** * 推广状态数量 * + * @param sixMonthAgo 6个月前 + * @param now 当前时间 * @return AdminAdRoundStatusCountResDTO */ - AdminAdRoundStatusCountResDTO statusCount(); + AdminAdRoundStatusCountResDTO statusCount(@Param("sixMonthAgo") Date sixMonthAgo, @Param("now") Date now); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/ShoppingCartMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/ShoppingCartMapper.java index 7bc591bff..f0ae2cc91 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/ShoppingCartMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/ShoppingCartMapper.java @@ -8,6 +8,7 @@ import com.ruoyi.xkt.dto.userShoppingCart.ShopCartPageResDTO; import com.ruoyi.xkt.dto.userShoppingCart.ShopCartStatusCountResDTO; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -38,9 +39,13 @@ public interface ShoppingCartMapper extends BaseMapper { /** * 获取用户进货车各状态数量 * - * @param userId 用户ID + * @param userId 用户ID + * @param sixMonthAgo 6个月前 + * @param now 现在 * @return ShopCartStatusCountResDTO */ - ShopCartStatusCountResDTO getStatusNum(@Param("userId") Long userId); + ShopCartStatusCountResDTO getStatusNum(@Param("userId") Long userId, + @Param("sixMonthAgo") Date sixMonthAgo, + @Param("now") Date now); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductDemandMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductDemandMapper.java index e488b2939..c7ef91ba2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductDemandMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductDemandMapper.java @@ -5,6 +5,7 @@ import com.ruoyi.xkt.domain.StoreProductDemand; import com.ruoyi.xkt.dto.storeProductDemand.StoreProdDemandStatusCountResDTO; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -35,8 +36,12 @@ public interface StoreProductDemandMapper extends BaseMapper /** * 查询各状态数量 * - * @param storeId 档口ID + * @param storeId 档口ID + * @param sixMonthAgo 六个月前的时间 + * @param now 当前时间 * @return StoreProdDemandStatusCountResDTO */ - StoreProdDemandStatusCountResDTO getStatusNum(@Param("storeId") Long storeId); + StoreProdDemandStatusCountResDTO getStatusNum(@Param("storeId") Long storeId, + @Param("sixMonthAgo") Date sixMonthAgo, + @Param("now") Date now); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java index fd188715e..a0f95af9c 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java @@ -113,10 +113,14 @@ public interface StoreProductMapper extends BaseMapper { /** * 获取档口各个状态的数量 * - * @param storeId 档口ID + * @param storeId 档口ID + * @param sixMonthAgo 六个月前 + * @param now 当前时间 * @return StoreProdStatusCountResDTO */ - StoreProdStatusCountResDTO getStatusNum(@Param("storeId") Long storeId); + StoreProdStatusCountResDTO getStatusNum(@Param("storeId") Long storeId, + @Param("sixMonthAgo") Date sixMonthAgo, + @Param("now") Date now); /** * 获取档口各个状态的分类数量 diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserFavoritesMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserFavoritesMapper.java index 1f6ac9fe4..bc0791021 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/UserFavoritesMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/UserFavoritesMapper.java @@ -39,8 +39,12 @@ public interface UserFavoritesMapper extends BaseMapper { /** * 获取用户收藏商品各状态数量 * - * @param userId 用户ID + * @param userId 用户ID + * @param sixMonthAgo 六个月前 + * @param now 当前时间 * @return */ - UserFavStatusCountResDTO getStatusNum(@Param("userId") Long userId); + UserFavStatusCountResDTO getStatusNum(@Param("userId") Long userId, + @Param("sixMonthAgo") Date sixMonthAgo, + @Param("now") Date now); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java index 5f8e90188..f0b7db91a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdminAdvertRoundServiceImpl.java @@ -281,7 +281,9 @@ public class AdminAdvertRoundServiceImpl implements IAdminAdvertRoundService { @Override @Transactional(readOnly = true) public AdminAdRoundStatusCountResDTO statusCount() { - return this.advertRoundMapper.statusCount(); + final Date now = java.sql.Date.valueOf(LocalDate.now().plusDays(1)); + final Date sixMonthAgo = java.sql.Date.valueOf(LocalDate.now().minusMonths(6)); + return this.advertRoundMapper.statusCount(sixMonthAgo, now); } /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java index 0d10451fe..a40bdc366 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ShoppingCartServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.xkt.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -9,6 +10,7 @@ import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.xkt.domain.*; import com.ruoyi.xkt.dto.storeProductFile.StoreProdMainPicDTO; @@ -24,6 +26,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -311,7 +314,9 @@ public class ShoppingCartServiceImpl implements IShoppingCartService { @Override @Transactional(readOnly = true) public ShopCartStatusCountResDTO getStatusNum() { - return this.shopCartMapper.getStatusNum(SecurityUtils.getUserId()); + final Date now = java.sql.Date.valueOf(LocalDate.now().plusDays(1)); + final Date sixMonthAgo = java.sql.Date.valueOf(LocalDate.now().minusMonths(6)); + return this.shopCartMapper.getStatusNum(SecurityUtils.getUserId(), sixMonthAgo, now); } /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java index 92ad13ae1..56c017763 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java @@ -27,6 +27,7 @@ import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -60,7 +61,9 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService @Override @Transactional(readOnly = true) public StoreProdDemandStatusCountResDTO getStatusNum(Long storeId) { - return this.storeProdDemandMapper.getStatusNum(storeId); + final Date now = java.sql.Date.valueOf(LocalDate.now().plusDays(1)); + final Date sixMonthAgo = java.sql.Date.valueOf(LocalDate.now().minusMonths(6)); + return this.storeProdDemandMapper.getStatusNum(storeId, sixMonthAgo, now); } /** 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 bee30e8d5..ec957750b 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 @@ -854,7 +854,9 @@ public class StoreProductServiceImpl implements IStoreProductService { @Override @Transactional(readOnly = true) public StoreProdStatusCountResDTO getStatusNum(Long storeId) { - return this.storeProdMapper.getStatusNum(storeId); + final Date now = java.sql.Date.valueOf(LocalDate.now().plusDays(1)); + final Date sixMonthAgo = java.sql.Date.valueOf(LocalDate.now().minusMonths(6)); + return this.storeProdMapper.getStatusNum(storeId, sixMonthAgo, now); } /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java index 34bcced0b..aaba9e926 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/UserFavoritesServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -265,7 +266,9 @@ public class UserFavoritesServiceImpl implements IUserFavoritesService { if (ObjectUtils.isEmpty(userId)) { throw new ServiceException("用户未登录，请先登录!", HttpStatus.ERROR); } - return this.userFavMapper.getStatusNum(userId); + final Date now = java.sql.Date.valueOf(LocalDate.now().plusDays(1)); + final Date sixMonthAgo = java.sql.Date.valueOf(LocalDate.now().minusMonths(6)); + return this.userFavMapper.getStatusNum(userId, sixMonthAgo, now); } diff --git a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml index 82a13c8bc..3f91fedb0 100644 --- a/xkt/src/main/resources/mapper/AdvertRoundMapper.xml +++ b/xkt/src/main/resources/mapper/AdvertRoundMapper.xml @@ -154,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" advert_round ar WHERE ar.del_flag = 0 + AND ar.create_time BETWEEN #{sixMonthAgo} AND #{now} diff --git a/xkt/src/main/resources/mapper/ShoppingCartMapper.xml b/xkt/src/main/resources/mapper/ShoppingCartMapper.xml index b20148b91..813be3c9d 100644 --- a/xkt/src/main/resources/mapper/ShoppingCartMapper.xml +++ b/xkt/src/main/resources/mapper/ShoppingCartMapper.xml @@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE sc.del_flag = 0 AND sc.user_id = #{userId} + AND sc.create_time BETWEEN #{sixMonthAgo} AND #{now} diff --git a/xkt/src/main/resources/mapper/StoreProductDemandMapper.xml b/xkt/src/main/resources/mapper/StoreProductDemandMapper.xml index e6d22bd92..b8665f421 100644 --- a/xkt/src/main/resources/mapper/StoreProductDemandMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductDemandMapper.xml @@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" store_product_demand spd WHERE spd.del_flag = 0 AND spd.store_id = #{storeId} + AND spd.create_time between #{sixMonthAgo} AND #{now} diff --git a/xkt/src/main/resources/mapper/StoreProductMapper.xml b/xkt/src/main/resources/mapper/StoreProductMapper.xml index 78d8c046b..6a9fe0f03 100644 --- a/xkt/src/main/resources/mapper/StoreProductMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductMapper.xml @@ -255,6 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE sp.del_flag = 0 AND sp.store_id = #{storeId} + AND sp.create_time between #{sixMonthAgo} AND #{now}