Merge remote-tracking branch 'origin/master'

alien-store/src/main/java/shop/alien/store/controller/StoreOfficialAlbumController.java

@@ -15,7 +15,7 @@ import shop.alien.store.service.StoreOfficialAlbumService;
 import java.util.List;
 
 /**
- * 标签前端控制器
+ * 官方相册前端控制器
  *
  * @author zhangchen
  * @since 2025-07-16

alien-store/src/main/java/shop/alien/store/controller/TagCategoryController.java

@@ -49,7 +49,6 @@ public class TagCategoryController {
                                             @RequestParam(required = false) String label,
                                             @RequestParam(required = false) String labelType,
                                             @RequestParam(required = false) String labelButtonType
-
     ) {
         log.info("TagCategoryController.getTagList");
         IPage<TagCategory> storeCouponList = tagCategoryService.getTagList(pageNum, pageSize,label,labelType,labelButtonType);
@@ -90,7 +89,7 @@ public class TagCategoryController {
     }
 
     @ApiOperation("获取经营类型标签信息")
-    @ApiOperationSupport(order = 2)
+    @ApiOperationSupport(order = 6)
     @GetMapping("/getBusinessRelationTagList")
     public R<List<TagCategoryVo>> getBusinessRelationTagList(@RequestParam(required = false) Integer businessSection) {
         log.info("TagCategoryController.getBusinessRelationTagList");
@@ -100,7 +99,7 @@ public class TagCategoryController {
 
 
     @ApiOperation("获取标签经营类型关系")
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 7)
     @GetMapping("/getTagBusinessRelationList")
     public R<IPage<TagBusinessRelation>> getTagBusinessRelationList(@RequestParam(defaultValue = "1") int page,
                                             @RequestParam(defaultValue = "10") int size, @RequestParam(required = false) int businessSection,
@@ -112,7 +111,7 @@ public class TagCategoryController {
     }
 
     @ApiOperation("删除标签经营类型关系")
-    @ApiOperationSupport(order = 7)
+    @ApiOperationSupport(order = 8)
     @PostMapping("/deleteTagBusinessRelation")
     public  R<Boolean> deleteTagBusinessRelation(@RequestBody TagBusinessRelation tagBusinessRelation) {
         log.info("TagCategoryController.deleteTagBusinessRelation");
@@ -124,7 +123,7 @@ public class TagCategoryController {
     }
 
     @ApiOperation("创建/更新店铺标签关系")
-    @ApiOperationSupport(order = 8)
+    @ApiOperationSupport(order = 9)
     @PostMapping("/createOrUpdateTagStoreRelation")
     public R<TagStoreRelation> createOrUpdateTagStoreRelation(@RequestBody TagStoreRelation tagStoreRelation) {
         log.info("TagCategoryController.createOrUpdateTagStoreRelation?tagStoreRelation={}", tagStoreRelation);
@@ -133,7 +132,7 @@ public class TagCategoryController {
     }
 
     @ApiOperation("获取标签经营类型关系")
-    @ApiOperationSupport(order = 9)
+    @ApiOperationSupport(order = 10)
     @GetMapping("/getTagStoreRelationByStoreId")
     public R<TagStoreRelation> getTagStoreRelationByStoreId( @RequestParam(required = true) Integer storeId) {
         log.info("TagCategoryController.getTagStoreRelationByStoreId={}", storeId);

alien-store/src/main/java/shop/alien/store/service/impl/StoreTagBusinessRelationServiceImpl.java

@@ -5,18 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import shop.alien.entity.store.TagBusinessRelation;
-import shop.alien.entity.store.TagCategory;
 import shop.alien.mapper.TagBusinessRelationMapper;
-import shop.alien.mapper.TagCategoryMapper;
-import shop.alien.store.config.BaseRedisService;
 import shop.alien.store.service.StoreTagBusinessRelationService;
-import shop.alien.store.service.StoreTagService;
 import shop.alien.store.util.CommonConstant;
 
 import java.util.List;
@@ -41,7 +36,6 @@ public class StoreTagBusinessRelationServiceImpl extends ServiceImpl<TagBusiness
         int result = tagBusinessRelationMapper.insert(tagBusinessRelation);
         log.info("标签创建, 结果: {}", result);
         // 清除相关缓存
-//        baseRedisService.delete(TAG_TREE_CACHE_KEY);
         return tagBusinessRelation;
     }