From 47898898df896f9f4e9b1379fa1d7f8634d10250 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 4 Oct 2025 23:34:34 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E8=8E=B7=E5=8F=96=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E6=A1=A3=E5=8F=A3=E9=A6=96=E9=A1=B5=E5=90=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=95=B0=E9=87=8FBUG=E4=BF=AE=E5=A4=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/StoreProductController.java | 6 ++++++ .../xkt/mapper/StoreProductColorMapper.java | 10 ++++++++++ .../ruoyi/xkt/mapper/StoreProductMapper.java | 20 ++++++++----------- .../xkt/service/IStoreProductService.java | 8 ++++++++ .../service/impl/StoreProductServiceImpl.java | 16 ++++++++++++--- .../mapper/StoreProductColorMapper.xml | 17 ++++++++++++++++ .../resources/mapper/StoreProductMapper.xml | 20 ++++++++----------- 7 files changed, 70 insertions(+), 27 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 07f10176a..9916eb602 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 @@ -129,6 +129,12 @@ public class StoreProductController extends XktBaseController { return R.ok(BeanUtil.toBean(storeProdService.getStatusNum(storeId), StoreProdStatusCountResVO.class)); } + @ApiOperation(value = "获取商品各个状态数量", httpMethod = "GET", response = R.class) + @GetMapping(value = "/pc/status/num/{storeId}") + public R getPcStatusNum(@PathVariable Long storeId) { + return R.ok(BeanUtil.toBean(storeProdService.getPcStatusNum(storeId), StoreProdStatusCountResVO.class)); + } + @ApiOperation(value = "获取商品各个状态下的分类数量", httpMethod = "POST", response = R.class) @PostMapping(value = "/status/cate/num/{storeId}") public R> getStatusCateNum(@Validated @RequestBody StoreProdStatusCateNumVO cateCountVO) { diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java index a42109f59..443b89f45 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java @@ -8,9 +8,11 @@ import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPricePageDTO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPriceResDTO; import com.ruoyi.xkt.dto.storeProduct.StoreProdPageDTO; import com.ruoyi.xkt.dto.storeProduct.StoreProdPageResDTO; +import com.ruoyi.xkt.dto.storeProduct.StoreProdStatusCountResDTO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.Date; import java.util.List; /** @@ -70,4 +72,12 @@ public interface StoreProductColorMapper extends BaseMapper { * @return List */ List selectColorPricePage(StoreProdColorPricePageDTO pageDTO); + + /** + * 获取档口各个状态的数量 + * + * @param storeId 档口ID + * @return StoreProdStatusCountResDTO + */ + StoreProdStatusCountResDTO getStatusNum(@Param("storeId") Long storeId); } 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 f83e7c697..945356058 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductMapper.java @@ -104,18 +104,6 @@ public interface StoreProductMapper extends BaseMapper { */ StoreProdPCResDTO selectPCProdInfo(@Param("storeProdId") Long storeProdId, @Param("userId") Long userId); - /** - * 获取档口各个状态的数量 - * - * @param storeId 档口ID - * @param sixMonthAgo 六个月前 - * @param now 当前时间 - * @return StoreProdStatusCountResDTO - */ - StoreProdStatusCountResDTO getStatusNum(@Param("storeId") Long storeId, - @Param("sixMonthAgo") Date sixMonthAgo, - @Param("now") Date now); - /** * 获取档口各个状态的分类数量 * @@ -132,5 +120,13 @@ public interface StoreProductMapper extends BaseMapper { * @return StoreProdAppResDTO */ StoreProdAppResDTO getAppInfo(@Param("storeProdId") Long storeProdId, @Param("userId") Long userId); + + /** + * 获取档口各个状态的数量 + * + * @param storeId 档口ID + * @return StoreProdStatusCountResDTO + */ + StoreProdStatusCountResDTO getStatusNum(@Param("storeId") Long storeId); } 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 4bf6e1b90..6315c74b7 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java @@ -162,4 +162,12 @@ public interface IStoreProductService { * @return StoreProdFuzzyResDTO */ List fuzzyQuery(String prodArtNum); + + /** + * 获取商城 档口首页商品状态数量 + * + * @param storeId 档口ID + * @return StoreProdStatusCountResDTO + */ + StoreProdStatusCountResDTO getPcStatusNum(Long storeId); } 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 d900b18f5..a8c6b70a0 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 @@ -718,6 +718,18 @@ public class StoreProductServiceImpl implements IStoreProductService { .collect(Collectors.toList()); } + /** + * 获取商城 档口首页商品状态数量 + * + * @param storeId 档口ID + * @return StoreProdStatusCountResDTO + */ + @Override + @Transactional(readOnly = true) + public StoreProdStatusCountResDTO getPcStatusNum(Long storeId) { + return this.storeProdMapper.getStatusNum(storeId); + } + /** * 根据档口ID和商品货号模糊查询货号列表 @@ -964,9 +976,7 @@ public class StoreProductServiceImpl implements IStoreProductService { @Override @Transactional(readOnly = true) public StoreProdStatusCountResDTO getStatusNum(Long 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); + return this.storeProdColorMapper.getStatusNum(storeId); } /** diff --git a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml index 39dacec0f..6721de718 100644 --- a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml @@ -125,5 +125,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spc.id + + \ No newline at end of file diff --git a/xkt/src/main/resources/mapper/StoreProductMapper.xml b/xkt/src/main/resources/mapper/StoreProductMapper.xml index dc6d0cfda..d8f68c303 100644 --- a/xkt/src/main/resources/mapper/StoreProductMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductMapper.xml @@ -248,24 +248,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND sp.id = #{storeProdId} + +