From 1a9310ef832d0e181229c7003381f6b0581698cc Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 8 Oct 2024 15:27:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AD=A6=E6=88=92=E5=80=BC?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/controller/product/StockController.java  | 2 ++
 .../service/impl/productimpl/TbProductServiceImpl.java      | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java
index 9a0a35ff..ac1a9c9b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/StockController.java
@@ -1,6 +1,7 @@
 package cn.ysk.cashier.controller.product;
 
 import cn.hutool.core.util.StrUtil;
+import cn.ysk.cashier.annotation.Log;
 import cn.ysk.cashier.exception.BadRequestException;
 import cn.ysk.cashier.service.product.StockService;
 import cn.ysk.cashier.utils.JSONUtil;
@@ -36,6 +37,7 @@ public class StockController {
 
     @PutMapping("warnLine")
     @ApiOperation("修改商品警告线")
+    @Log("修改商品警告值为:#stockUpdateWarnLineVO.warnLine")
     public ResponseEntity<Object> updateProductWarnLine(@RequestBody StockUpdateWarnLineVO stockUpdateWarnLineVO) {
         if (StrUtil.isBlank(stockUpdateWarnLineVO.getShopId()) || stockUpdateWarnLineVO.getWarnLine() == null || stockUpdateWarnLineVO.getWarnLine() <= 0) {
             throw new BadRequestException("参数有误");
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
index 59d59494..cecf90c8 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
@@ -244,9 +244,11 @@ public class TbProductServiceImpl implements TbProductService {
     public Map<String, Object> queryAllV2(TbProductQueryV2Criteria criteria,Pageable pageable) {
         //查询商品数据
         Page<TbProduct> page = tbProductRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
+        Integer warnLine = 0;
         List<TbProductNewVo> products = new ArrayList<>();
         for (TbProduct product : page.getContent()) {
             TbProductNewVo productNewVo = new TbProductNewVo();
+            warnLine = product.getWarnLine();
             BeanUtils.copyProperties(product, productNewVo);
             productNewVo.setLowPrice(product.getLowPrice().toString());
             productNewVo.setStockNumber(Double.valueOf(product.getStockNumber()));
@@ -274,7 +276,9 @@ public class TbProductServiceImpl implements TbProductService {
             productNewVo.setConInfos(CollectionUtils.isEmpty(skuCons)?Arrays.asList():skuCons);
             products.add(productNewVo);
         }
-        return PageUtil.toPage(products, page.getTotalElements());
+        Map<String, Object> result = PageUtil.toPage(products, page.getTotalElements());
+        result.put("warnLine",warnLine);
+        return result;
     }
 
     public List<TbProductNewVo.TbProductSkuVos> convert(List<TbProductSku> skuVo1List) {