From 56d9dbee5b56aa7ebff1cd76c9cccdc2fa92f43e Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Wed, 24 Jan 2024 11:32:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD,=E9=A2=84=E8=AD=A6=E4=B8=BA0=E4=B8=8D=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lili/modules/goods/entity/dto/GoodsSearchParams.java   | 3 ++-
 .../modules/statistics/service/GoodsStatisticsService.java    | 4 ++++
 .../statistics/serviceimpl/GoodsStatisticsServiceImpl.java    | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java
index 9e30d21d..7c5ce6e7 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java
@@ -132,7 +132,7 @@ public class GoodsSearchParams extends PageVO {
             queryWrapper.le("quantity", leQuantity);
         }
         if (geQuantity != null) {
-            queryWrapper.ge("quantity", geQuantity);
+            queryWrapper.gt("quantity", geQuantity);
         }
         if (recommend != null) {
             queryWrapper.le("recommend", recommend);
@@ -145,6 +145,7 @@ public class GoodsSearchParams extends PageVO {
         }
         if(alertQuantity != null && alertQuantity){
             queryWrapper.apply("quantity <= alert_quantity");
+            queryWrapper.ge("alert_quantity", 0);
         }
         queryWrapper.in(CollUtil.isNotEmpty(ids), "id", ids);
 
diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java
index 19f3b00f..a6a4653d 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java
@@ -28,6 +28,10 @@ public interface GoodsStatisticsService extends IService<Goods> {
      */
     long todayUpperNum();
 
+    /**
+     * 预警库存数
+     * @return
+     */
     long alertQuantityNum();
 
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java
index b6afc59b..2192cf81 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java
@@ -68,6 +68,7 @@ public class GoodsStatisticsServiceImpl extends ServiceImpl<GoodsStatisticsMappe
                 "store_id", currentUser.getStoreId());
         queryWrapper.eq("market_enable",GoodsStatusEnum.UPPER.name());
         queryWrapper.apply("quantity < alert_quantity");
+        queryWrapper.gt("alert_quantity",0);
         return goodsSkuService.count(queryWrapper);
     }
 }