From 03460728b50f69ef33d39c8352e95b33253bb056 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 七月 2025 17:59:28 +0800
Subject: [PATCH] 前端

---
 server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 2dd7779..642bff7 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -21,9 +21,11 @@
 import com.github.yulichang.base.MPJBaseMapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
@@ -45,6 +47,7 @@
     private SystemDictDataBiz systemDictDataBiz;
 
     @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public Integer create(Category category) {
         if(Objects.isNull(category)
         || Objects.isNull(category.getType())
@@ -54,11 +57,14 @@
         ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
-        LoginUserInfo loginUserInfo = category.getLoginUserInfo();
-        category.setCreateTime(new Date());
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         category.setDeleted(Constants.ZERO);
+        category.setCreateTime(new Date());
         category.setCreateUser(loginUserInfo.getId());
-        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())){
+        category.setUpdateTime(new Date());
+        category.setUpdateUser(loginUserInfo.getId());
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())
+                && !Constants.equalsInteger(category.getType(),Constants.THREE)){
             category.setDetail(category.getDetailList().toJSONString());
         }
         if(!Constants.equalsInteger(category.getType(),Constants.ONE)){
@@ -90,6 +96,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public void updateById(Category category) {
         if(Objects.isNull(category)
                 || Objects.isNull(category.getId())
@@ -100,7 +107,23 @@
         ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
-        LoginUserInfo loginUserInfo = category.getLoginUserInfo();
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        category.setUpdateTime(new Date());
+        category.setIsFixed(null);
+        category.setUpdateUser(loginUserInfo.getId());
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())
+                && !Constants.equalsInteger(category.getType(),Constants.THREE)){
+            category.setDetail(category.getDetailList().toJSONString());
+        }
+        categoryMapper.updateById(category);
+    }
+    @Override
+    public void updateStatus(Category category) {
+        if(Objects.isNull(category)
+                || Objects.isNull(category.getId())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         category.setUpdateTime(new Date());
         category.setIsFixed(null);
         category.setUpdateUser(loginUserInfo.getId());

--
Gitblit v1.9.3