From d59390831ee9605994b43d3402f88572e0dc7a34 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 2 Jul 2024 14:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8E=92=E5=BA=8F=20?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=20?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=20=E5=AF=BC=E5=85=A5=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/controller/product/StockController.java    |  1 -
 .../repository/product/TbProductSkuRepository.java     |  8 ++------
 .../service/impl/productimpl/StockServiceImpl.java     | 10 +++++++---
 3 files changed, 9 insertions(+), 10 deletions(-)

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 f7380ad3..538e4b44 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
@@ -72,7 +72,6 @@ public class StockController {
     @Log("库存导入")
     @PostMapping("/doImport/v2")
     @ApiOperation("文件导入库存")
-    @AnonymousPostMapping
     public ResponseEntity<Object> importExcelV2(@RequestParam String shopId,@RequestParam("file") MultipartFile file) {
         String fileName = file.getOriginalFilename();
         if (file.isEmpty()) {
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
index 4f2fd189..3e1b3909 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java
@@ -55,10 +55,7 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
 
     @Query("SELECT new cn.ysk.cashier.vo.StockV2Vo(" +
             "sku.id,pro.id,pro.coverImg,pro.name,unit.name,pro.typeEnum,sku.specSnap,pro.isStock, " +
-            "CASE " +
-            "        WHEN pro.isDistribute = 1 THEN IFNULL(pro.stockNumber, 0) " +
-            "        ELSE SUM(sku.stockNumber) " +
-            "    END " +
+            "CASE WHEN pro.isDistribute = 1 THEN IFNULL(pro.stockNumber, 0) ELSE SUM(sku.stockNumber) END as number" +
             ", pro.isDistribute, pro.isPauseSale, true, sku.warnLine, pro.lowPrice)  " +
             "from " +
             "TbProduct pro " +
@@ -70,8 +67,7 @@ public interface TbProductSkuRepository extends JpaRepository<TbProductSku, Inte
             "AND (:proName IS NULL OR pro.name LIKE %:proName%) " +
             "AND (:isStock IS NULL OR pro.isStock = :isStock) " +
             "group by pro.id " +
-            "ORDER BY " +
-            "pro.name DESC,sku.stockNumber DESC")
+            "order by number asc ")
     Page<StockV2Vo> searchProStockV2(@Param("shopId") String shopId, @Param("proName") String proName, @Param("isStock")Integer isStock, Pageable pageable);
 
     @Query("SELECT new cn.ysk.cashier.vo.StockV2Vo(" +
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
index 283c54aa..2c630aaf 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/StockServiceImpl.java
@@ -12,6 +12,7 @@ import cn.ysk.cashier.repository.shop.TbShopInfoRepository;
 import cn.ysk.cashier.service.TbProductStockOperateService;
 import cn.ysk.cashier.service.product.StockService;
 import cn.ysk.cashier.service.product.TbProductService;
+import cn.ysk.cashier.utils.CacheKey;
 import cn.ysk.cashier.utils.FileUtil;
 import cn.ysk.cashier.utils.RedisUtils;
 import cn.ysk.cashier.utils.StringUtils;
@@ -260,16 +261,19 @@ public class StockServiceImpl implements StockService {
 
     @Transactional
     public void inHouseV2(String shopId, List<StockV2Vo> list) {
-        Map<Integer, Double> idStockMap = new HashMap<>();
+        Set<Integer> proIds=new HashSet<>();
+        Set<Integer> skuIds=new HashSet<>();
         for (StockV2Vo stockVo : list) {
             if (stockVo.getProId() == 0) {
                 tbProductSkuRepository.updateStockNumber2(stockVo.getSkuId(), shopId, Double.parseDouble(stockVo.getNumber().toString()));
+                skuIds.add(stockVo.getSkuId());
             } else {
                 productService.updateStockNumber(stockVo.getProId(), Double.parseDouble(stockVo.getNumber().toString()));
+                proIds.add(stockVo.getProId());
             }
-            idStockMap.put(stockVo.getSkuId(), Double.parseDouble(stockVo.getNumber().toString()));
         }
-        redisUtils.redisUp(2, shopId, idStockMap);
+        redisUtils.delByIntKey(CacheKey.PRODUCT_SKU + shopId + ":product", proIds);
+        redisUtils.delByIntKey(CacheKey.PRODUCT_SKU + shopId + ":", skuIds);
     }
 
     @Transactional