From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java |   65 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
index 27e4cde..1201a68 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsCategoryService.java
@@ -4,8 +4,12 @@
 import cc.mrbird.febs.common.entity.QueryRequest;
 import cc.mrbird.febs.mall.entity.MallGoods;
 import cc.mrbird.febs.mall.entity.MallGoodsCategory;
+import cc.mrbird.febs.mall.entity.MallStore;
+import cc.mrbird.febs.mall.entity.MallStoreItem;
 import cc.mrbird.febs.mall.mapper.MallGoodsCategoryMapper;
 import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
+import cc.mrbird.febs.mall.mapper.MallStoreItemMapper;
+import cc.mrbird.febs.mall.mapper.MallStoreMapper;
 import cc.mrbird.febs.mall.service.IAdminMallGoodsCategoryService;
 import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
 import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryVo;
@@ -18,17 +22,21 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class AdminMallGoodsCategoryService extends ServiceImpl<MallGoodsCategoryMapper, MallGoodsCategory> implements IAdminMallGoodsCategoryService {
 
     private final MallGoodsCategoryMapper mallGoodsCategoryMapper;
 
     private final MallGoodsMapper mallGoodsMapper;
+    private final MallStoreMapper mallStoreMapper;
+    private final MallStoreItemMapper mallStoreItemMapper;
 
     @Override
     public IPage<MallGoodsCategory> getCategoryList(MallGoodsCategory mallGoodsCategory, QueryRequest request) {
@@ -107,6 +115,7 @@
         MallGoodsCategory mallGoodsCategory = mallGoodsCategoryMapper.selectById(id);
         mallGoodsCategory.setName(mallGoodsCategoryParam.getName());
         mallGoodsCategory.setImage(mallGoodsCategoryParam.getImage());
+        mallGoodsCategory.setIndexNum(mallGoodsCategoryParam.getIndexNum());
         if(ObjectUtil.isNotEmpty(mallGoodsCategoryParam.getParentId())){
             Long parentId = mallGoodsCategoryParam.getParentId();
             MallGoodsCategory mallGoodsCategoryParent = mallGoodsCategoryMapper.selectById(parentId);
@@ -161,4 +170,60 @@
         return adminMallGoodsCategoryTreeVos;
     }
 
+    @Override
+    public IPage<MallStore> storeList(MallStore mallStore, QueryRequest request) {
+        Page<MallStore> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<MallStore> mallStoreIPage = mallGoodsCategoryMapper.selectStoreListInPage(page, mallStore);
+        return mallStoreIPage;
+    }
+
+    @Override
+    public FebsResponse addStore(MallStore mallStore) {
+        mallStoreMapper.insert(mallStore);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse updateStore(MallStore mallStore) {
+        mallStoreMapper.updateById(mallStore);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse delStore(Long id) {
+        mallStoreMapper.deleteById(id);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public IPage<MallStoreItem> storeItemList(MallStoreItem mallStoreItem, QueryRequest request) {
+        Page<MallStoreItem> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<MallStoreItem> mallStoreItemIPage = mallGoodsCategoryMapper.selectStoreItemListInPage(page, mallStoreItem);
+        return mallStoreItemIPage;
+    }
+
+    @Override
+    public List<MallStore> getStore() {
+        List<MallStore> mallStores = mallGoodsCategoryMapper.getStore();
+        return mallStores;
+    }
+
+    @Override
+    public FebsResponse addStoreItem(MallStoreItem mallStoreItem) {
+        mallStoreItemMapper.insert(mallStoreItem);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse updateStoreItem(MallStoreItem mallStoreItem) {
+        mallStoreItemMapper.updateById(mallStoreItem);
+        return new FebsResponse().success();
+    }
+
+    @Override
+    public FebsResponse delStoreItem(Long id) {
+        mallStoreItemMapper.deleteById(id);
+        return new FebsResponse().success();
+    }
+
 }

--
Gitblit v1.9.1