From f491a382cbe99bd0d0a5a815abd8dcacb5fce909 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 2 Jul 2024 10:35:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/TbProductStocktakinController.java    |  2 --
 .../TbProductStocktakinServiceImpl.java           | 15 ++++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStocktakinController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStocktakinController.java
index 8549c4e3..6e758c4a 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStocktakinController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStocktakinController.java
@@ -24,7 +24,6 @@ public class TbProductStocktakinController {
     private final TbProductStocktakinService tbProductStocktakinService;
 
     @PostMapping
-    @AnonymousAccess
     @ApiOperation("新增盘点")
     public ResponseEntity<Object> addStocktakin(
             @RequestBody @Validated TbProductStocktakinDTO productStocktakinDTO
@@ -42,7 +41,6 @@ public class TbProductStocktakinController {
         return ResponseEntity.ok("成功");
     }
 
-    @AnonymousAccess
     @GetMapping
     @ApiOperation("获取盘点数据")
     public ResponseEntity<Object> getStocktakinList(TbProductStocktakinQueryCriteria productStocktakinQueryCriteria, Pageable pageable) {
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStocktakinServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStocktakinServiceImpl.java
index 4527e070..6e1e8cd5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStocktakinServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStocktakinServiceImpl.java
@@ -75,13 +75,15 @@ public class TbProductStocktakinServiceImpl implements TbProductStocktakinServic
         }
 
         TbProduct product = tbProductRepository.findById(productStocktakinDTO.getProductId()).orElse(null);
+        if (product == null) {
+            throw new BadRequestException("商品不存在, 商品id: {}" + productStocktakinDTO.getProductId());
+        }
 
         TbProductStocktakin productStocktakin = new TbProductStocktakin();
 
         productStocktakin.setProductId(productStocktakinDTO.getProductId());
         productStocktakin.setCreateTime(DateUtil.date());
         productStocktakin.setNote(productStocktakinDTO.getNote());
-        productStocktakin.setStock(product.getStockNumber());
         productStocktakin.setInventoryStock(productStocktakinDTO.getStocktakinNum());
         productStocktakin.setName(product.getName());
         productStocktakin.setCoverImg(product.getCoverImg());
@@ -131,9 +133,7 @@ public class TbProductStocktakinServiceImpl implements TbProductStocktakinServic
         if (product.getIsDistribute() == 1) {
             round = (int) Math.floor( product.getStockNumber());
             productStocktakin.setPhasePrice(
-                    productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(productStocktakinDTO.getStocktakinNum())).subtract(
-                            productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(product.getStockNumber()))
-                    )
+                    productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(phaseNum))
             );
 
             productStockDetail.setSubType(productStocktakinDTO.getStocktakinNum() > product.getStockNumber() ? 1 : -1);
@@ -141,6 +141,7 @@ public class TbProductStocktakinServiceImpl implements TbProductStocktakinServic
             productStockDetail.setType(productStocktakinDTO.getStocktakinNum() > product.getStockNumber() ? "盘点入库" : "盘点出库");
 
             productStocktakin.setPhaseNum(productStocktakinDTO.getStocktakinNum() - product.getStockNumber());
+            productStocktakin.setStock(product.getStockNumber());
             if (tbProductRepository.updateStock(product.getId(), product.getStockNumber(), productStocktakinDTO.getStocktakinNum()) < 1) {
                 throw new BadRequestException("修改库存失败，稍后再试");
             }
@@ -165,10 +166,10 @@ public class TbProductStocktakinServiceImpl implements TbProductStocktakinServic
             productStockDetail.setType(productStocktakinDTO.getStocktakinNum() > productSku.getStockNumber() ?  "盘点入库" : "盘点出库");
             productStocktakin.setSkuId(productSku.getId());
             productStocktakin.setPhasePrice(
-                    productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(productStocktakinDTO.getStocktakinNum())).subtract(
-                            productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(product.getStockNumber()))
-                    )
+                    productStocktakinDTO.getPrice().multiply(BigDecimal.valueOf(phaseNum))
             );
+            productStocktakin.setStock(productSku.getStockNumber().intValue());
+
             productStocktakin.setPhaseNum((int) (productStocktakinDTO.getStocktakinNum() - productSku.getStockNumber()));
             if (producSkutMapper.updateStock(productSku.getId(), productSku.getStockNumber(), productStocktakinDTO.getStocktakinNum()) < 1) {
                 throw new BadRequestException("修改库存失败，稍后再试");