From 657596f61991a676a34d4302d7ddf213fa4817e1 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 26 Sep 2024 17:03:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/controller/ProductController.java       | 7 ++++++-
 .../system/cashierservice/service/ProductService.java      | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java
index ff8df6d..804ca85 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/ProductController.java
@@ -1,12 +1,14 @@
 package com.chaozhanggui.system.cashierservice.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.chaozhanggui.system.cashierservice.entity.dto.ProductStatusDTO;
 import com.chaozhanggui.system.cashierservice.entity.dto.ProductStockDTO;
 import com.chaozhanggui.system.cashierservice.entity.dto.QuerySpecDTO;
 import com.chaozhanggui.system.cashierservice.service.ProductService;
 import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
 import com.chaozhanggui.system.cashierservice.sign.Result;
+import com.chaozhanggui.system.cashierservice.util.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +38,12 @@ public class ProductController {
 
     @PutMapping("/productStock")
     public Result productStock(
+            @RequestHeader("token") String token,
             @Valid @RequestBody ProductStockDTO productStockDTO
     ) {
-        productService.updateStock(productStockDTO);
+        JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
+        String loginName = jsonObject.getString("loginName");
+        productService.updateStock(productStockDTO,loginName);
         return Result.success(CodeEnum.SUCCESS);
     }
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index abac9e4..fc725b5 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -196,7 +196,7 @@ public class ProductService {
         }
     }
 
-    public void updateStock(ProductStockDTO productStockDTO) {
+    public void updateStock(ProductStockDTO productStockDTO,String loginName) {
         TbProduct product = tbProductMapper.selectByShopIdAndId(productStockDTO.getProductId(), productStockDTO.getShopId());
         if (product == null) {
             throw new MsgException("商品不存在");
@@ -216,6 +216,7 @@ public class ProductService {
 //            data.put("type", "pc收银机修改库存");
             data.put("subType", product.getStockNumber() > productStockDTO.getStock() ? -1 : 1);
             data.put("number", productStockDTO.getStock() - product.getStockNumber());
+            data.put("operator", loginName);
             data.put("remark", "pc收银机修改库存");
             if (product.getStockNumber() > productStockDTO.getStock()) {
                 data.put("type", "盘点出库");