From 898a452132dcdb337d9fbf1e0e67872d05034559 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 23 九月 2025 11:10:19 +0800
Subject: [PATCH] 操作日志

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
index 809a87f..4718de7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
@@ -2,8 +2,10 @@
 
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.CodeGenerateUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.framework.web.service.TokenService;
@@ -65,17 +67,25 @@
     /**
      * 添加商品管理管理
      */
+    @Log(title = "商品管理-添加商品管理", businessType = BusinessType.INSERT)
     @ApiOperation( value = "添加商品管理")
     @PostMapping(value = "/add")
     public AjaxResult<Boolean> add(@RequestBody TGoods dto) {
         dto.setShopId(tokenService.getLoginUser().getObjectId());
-        dto.setGoodsNum(CodeGenerateUtils.generateVolumeSn());
+        String num = CodeGenerateUtils.generateVolumeSn();
+        long count = goodsService.count(Wrappers.lambdaQuery(TGoods.class)
+                .eq(TGoods::getGoodsNum, num));
+        if(count>0){
+            num = CodeGenerateUtils.generateVolumeSn();
+        }
+        dto.setGoodsNum(num);
         return AjaxResult.success(goodsService.save(dto));
     }
 
     /**
      * 修改商品管理
      */
+    @Log(title = "商品管理-修改商品管理", businessType = BusinessType.UPDATE)
     @ApiOperation( value = "修改商品管理")
     @PostMapping(value = "/update")
     public AjaxResult<Boolean> update(@RequestBody TGoods dto) {
@@ -84,17 +94,17 @@
         if(!goods.getGoodsName().equals(dto.getGoodsName())){
             List<TOrderStockGoods> orderStockGoods = orderStockGoodsService.list(Wrappers.lambdaQuery(TOrderStockGoods.class)
                     .eq(TOrderStockGoods::getGoodsNum, goods.getGoodsNum()));
-            orderStockGoods.stream().forEach(tOrderStockGoods -> tOrderStockGoods.setGoodsNum(dto.getGoodsNum()));
+            orderStockGoods.stream().forEach(tOrderStockGoods -> tOrderStockGoods.setGoodsName(dto.getGoodsName()));
             orderStockGoodsService.updateBatchById(orderStockGoods);
 
             List<TOrderMealGoods> orderMealGoods = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
                     .eq(TOrderMealGoods::getGoodsNum, goods.getGoodsNum()));
-            orderMealGoods.stream().forEach(tOrderMealGoods -> tOrderMealGoods.setGoodsNum(dto.getGoodsNum()));
+            orderMealGoods.stream().forEach(tOrderMealGoods -> tOrderMealGoods.setGoodsName(dto.getGoodsName()));
             orderMealGoodsService.updateBatchById(orderMealGoods);
 
             List<TOrderSaleGoods> list = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
                     .eq(TOrderSaleGoods::getGoodsNum, goods.getGoodsNum()));
-            list.stream().forEach(tOrderSaleGoods -> tOrderSaleGoods.setGoodsNum(dto.getGoodsNum()));
+            list.stream().forEach(tOrderSaleGoods -> tOrderSaleGoods.setGoodsName(dto.getGoodsName()));
             orderSaleGoodsService.updateBatchById(list);
         }
         return AjaxResult.success(goodsService.updateById(dto));
@@ -119,6 +129,7 @@
     /**
      * 删除商品管理
      */
+    @Log(title = "商品管理-删除商品管理", businessType = BusinessType.DELETE)
     @ApiOperation( value = "删除商品管理")
     @DeleteMapping(value = "/deleteById")
     public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) {
@@ -135,6 +146,7 @@
     /**
      * 批量删除商品管理
      */
+    @Log(title = "商品管理-批量删除商品管理", businessType = BusinessType.DELETE)
     @ApiOperation( value = "批量删除商品管理")
     @DeleteMapping(value = "/deleteByIds")
     public AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {

--
Gitblit v1.7.1