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", "盘点出库");