fix: 调整分类接口逻辑

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/seller/GoodsCategorySellerController.java

@@ -375,7 +375,7 @@ public class GoodsCategorySellerController {
         return SldResponse.success(vos);
     }
 
-    @ApiOperation("获取分类列表接口")
+    @ApiOperation("获取品牌分类列表接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query")
     })
@@ -392,100 +392,14 @@ public class GoodsCategorySellerController {
             example.setState(GoodsCategoryConst.CATEGORY_STATE_1);
             example.setOrderBy("sort asc, create_time desc");
             List<GoodsCategory> list = goodsCategoryModel.getGoodsCategoryList(example, null);
-            //全部分类信息
+
+            //只获取一级分类，children设置为空集合
             if (!CollectionUtils.isEmpty(list)) {
-                // 将所有一级分类ID转换为逗号分隔的字符串
-                StringBuilder firstLevelIdsBuilder = new StringBuilder();
                 for (GoodsCategory goodsCategory : list) {
-                    if (firstLevelIdsBuilder.length() > 0) {
-                        firstLevelIdsBuilder.append(",");
-                    }
-                    firstLevelIdsBuilder.append(goodsCategory.getCategoryId());
-                }
-                String firstLevelIds = firstLevelIdsBuilder.toString();
-
-                if (!firstLevelIds.isEmpty()) {
-                    GoodsCategoryExample example2 = new GoodsCategoryExample();
-                    example2.setPidIn(firstLevelIds);
-                    example2.setState(GoodsCategoryConst.CATEGORY_STATE_1);
-                    example2.setOrderBy("sort asc, create_time desc");
-                    List<GoodsCategory> secondLevelList = goodsCategoryModel.getGoodsCategoryList(example2, null);
-
-                    // 按照一级分类ID分组二级分类
-                    Map<Integer, List<GoodsCategory>> secondLevelMap = new HashMap<>();
-                    for (GoodsCategory secondCategory : secondLevelList) {
-                        if (!secondLevelMap.containsKey(secondCategory.getPid())) {
-                            secondLevelMap.put(secondCategory.getPid(), new ArrayList<>());
-                        }
-                        secondLevelMap.get(secondCategory.getPid()).add(secondCategory);
-                    }
-
-                    // 获取所有三级分类IDs
-                    StringBuilder secondLevelIdsBuilder = new StringBuilder();
-                    for (GoodsCategory secondCategory : secondLevelList) {
-                        if (secondLevelIdsBuilder.length() > 0) {
-                            secondLevelIdsBuilder.append(",");
-                        }
-                        secondLevelIdsBuilder.append(secondCategory.getCategoryId());
-                    }
-                    String secondLevelIds = secondLevelIdsBuilder.toString();
-
-                    if (!secondLevelIds.isEmpty()) {
-                        GoodsCategoryExample example3 = new GoodsCategoryExample();
-                        example3.setPidIn(secondLevelIds);
-                        example3.setState(GoodsCategoryConst.CATEGORY_STATE_1);
-                        example3.setOrderBy("sort asc, create_time desc");
-                        List<GoodsCategory> thirdLevelList = goodsCategoryModel.getGoodsCategoryList(example3, null);
-
-                        // 按照二级分类ID分组三级分类
-                        Map<Integer, List<GoodsCategory>> thirdLevelMap = new HashMap<>();
-                        for (GoodsCategory thirdCategory : thirdLevelList) {
-                            if (!thirdLevelMap.containsKey(thirdCategory.getPid())) {
-                                thirdLevelMap.put(thirdCategory.getPid(), new ArrayList<>());
-                            }
-                            thirdLevelMap.get(thirdCategory.getPid()).add(thirdCategory);
-                        }
-
-                        // 构建完整的分类树
-                        for (GoodsCategory firstCategory : list) {
-                            FrontGoodsCategoryVO firstVO = new FrontGoodsCategoryVO(firstCategory);
-                            List<FrontGoodsCategoryVO> secondVOs = new ArrayList<>();
-
-                            List<GoodsCategory> secondCategories = secondLevelMap.get(firstCategory.getCategoryId());
-                            if (!CollectionUtils.isEmpty(secondCategories)) {
-                                for (GoodsCategory secondCategory : secondCategories) {
-                                    FrontGoodsCategoryVO secondVO = new FrontGoodsCategoryVO(secondCategory);
-                                    // 没有图片就用默认图片
-                                    if (StringUtils.isEmpty(secondCategory.getCategoryImage())) {
-                                        secondVO.setCategoryImage(FileUrlUtil.getFileUrl(stringRedisTemplate.opsForValue().get("default_goods_cate_grade2_image"), null));
-                                    }
-
-                                    List<FrontGoodsCategoryVO> thirdVOs = new ArrayList<>();
-                                    List<GoodsCategory> thirdCategories = thirdLevelMap.get(secondCategory.getCategoryId());
-                                    if (!CollectionUtils.isEmpty(thirdCategories)) {
-                                        for (GoodsCategory thirdCategory : thirdCategories) {
-                                            FrontGoodsCategoryVO thirdVO = new FrontGoodsCategoryVO(thirdCategory);
-                                            // 没有图片就用默认图片
-                                            if (StringUtils.isEmpty(thirdCategory.getCategoryImage())) {
-                                                thirdVO.setCategoryImage(FileUrlUtil.getFileUrl(stringRedisTemplate.opsForValue().get("default_goods_cate_grade3_image"), null));
-                                            }
-                                            thirdVOs.add(thirdVO);
-                                        }
-                                    }
-
-                                    if (!CollectionUtils.isEmpty(thirdVOs)) {
-                                        secondVO.setChildren(thirdVOs);
-                                        secondVOs.add(secondVO);
-                                    }
-                                }
-                            }
-
-                            if (!CollectionUtils.isEmpty(secondVOs)) {
-                                firstVO.setChildren(secondVOs);
-                                vos.add(firstVO);
-                            }
-                        }
-                    }
+                    FrontGoodsCategoryVO vo = new FrontGoodsCategoryVO(goodsCategory);
+                    // 设置children为空集合而不是null
+                    vo.setChildren(new ArrayList<>());
+                    vos.add(vo);
                 }
             }
         } else {
@@ -496,13 +410,15 @@ public class GoodsCategorySellerController {
             example.setState(StoreConst.STORE_CATEGORY_STATE_PASS);
             List<StoreBindCategory> list = storeBindCategoryModel.getStoreBindCategoryList(example, null);
 
+            //只获取一级分类，children设置为空集合
             if (!CollectionUtils.isEmpty(list)) {
-                // 提取所有一级分类ID并转换为逗号分隔的字符串
+                // 提取所有一级分类ID并去重
                 Set<Integer> firstLevelIdSet = new HashSet<>();
                 for (StoreBindCategory bindCategory : list) {
                     firstLevelIdSet.add(bindCategory.getGoodsCategoryId1());
                 }
 
+                // 批量查询一级分类
                 StringBuilder firstLevelIdsBuilder = new StringBuilder();
                 for (Integer id : firstLevelIdSet) {
                     if (firstLevelIdsBuilder.length() > 0) {
@@ -512,23 +428,16 @@ public class GoodsCategorySellerController {
                 }
                 String firstLevelIds = firstLevelIdsBuilder.toString();
 
-                if (!firstLevelIds.isEmpty()) {
-                    // 批量查询一级分类
-                    GoodsCategoryExample firstExample = new GoodsCategoryExample();
-                    firstExample.setCategoryIdIn(firstLevelIds);
-                    List<GoodsCategory> firstLevelCategories = goodsCategoryModel.getGoodsCategoryList(firstExample, null);
+                GoodsCategoryExample firstExample = new GoodsCategoryExample();
+                firstExample.setCategoryIdIn(firstLevelIds);
+                List<GoodsCategory> firstLevelCategories = goodsCategoryModel.getGoodsCategoryList(firstExample, null);
 
-                    Map<Integer, GoodsCategory> firstLevelMap = new HashMap<>();
-                    for (GoodsCategory category : firstLevelCategories) {
-                        firstLevelMap.put(category.getCategoryId(), category);
-                    }
-
-                    // 构建分类树
-                    for (GoodsCategory firstCategory : firstLevelCategories) {
-                        FrontGoodsCategoryVO firstVO = new FrontGoodsCategoryVO(firstCategory);
-                        firstVO = categoryTreeOptimized(firstVO, firstCategory.getCategoryId(), vendor.getStoreId(), webSite);
-                        vos.add(firstVO);
-                    }
+                // 构建返回结果，children设置为空集合
+                for (GoodsCategory firstCategory : firstLevelCategories) {
+                    FrontGoodsCategoryVO vo = new FrontGoodsCategoryVO(firstCategory);
+                    // 设置children为空集合而不是null
+                    vo.setChildren(new ArrayList<>());
+                    vos.add(vo);
                 }
             }
         }
@@ -536,85 +445,5 @@ public class GoodsCategorySellerController {
         return SldResponse.success(vos);
     }
 
-    /**
-     * 优化后的构造分类树方法
-     *
-     * @param tree
-     * @param categoryId
-     * @param storeId
-     * @param webSite
-     * @return
-     */
-    public FrontGoodsCategoryVO categoryTreeOptimized(FrontGoodsCategoryVO tree, Integer categoryId, Long storeId, String webSite) {
-        // 查询二级分类
-        GoodsCategoryExample example2 = new GoodsCategoryExample();
-        example2.setPid(categoryId);
-        example2.setState(GoodsCategoryConst.CATEGORY_STATE_1);
-        example2.setOrderBy("sort asc, create_time desc");
-        List<GoodsCategory> list2 = goodsCategoryModel.getGoodsCategoryList(example2, null);
-
-        if (!CollectionUtils.isEmpty(list2)) {
-            // 将所有二级分类ID转换为逗号分隔的字符串
-            StringBuilder secondLevelIdsBuilder = new StringBuilder();
-            for (GoodsCategory category : list2) {
-                if (secondLevelIdsBuilder.length() > 0) {
-                    secondLevelIdsBuilder.append(",");
-                }
-                secondLevelIdsBuilder.append(category.getCategoryId());
-            }
-            String secondLevelIds = secondLevelIdsBuilder.toString();
-
-            if (!secondLevelIds.isEmpty()) {
-                // 批量查询三级分类
-                GoodsCategoryExample example3 = new GoodsCategoryExample();
-                example3.setPidIn(secondLevelIds);
-                example3.setState(GoodsCategoryConst.CATEGORY_STATE_1);
-                example3.setOrderBy("sort asc, create_time desc");
-                List<GoodsCategory> list3 = goodsCategoryModel.getGoodsCategoryList(example3, null);
-
-                // 按二级分类ID分组三级分类
-                Map<Integer, List<GoodsCategory>> thirdLevelMap = new HashMap<>();
-                for (GoodsCategory thirdCategory : list3) {
-                    if (!thirdLevelMap.containsKey(thirdCategory.getPid())) {
-                        thirdLevelMap.put(thirdCategory.getPid(), new ArrayList<>());
-                    }
-                    thirdLevelMap.get(thirdCategory.getPid()).add(thirdCategory);
-                }
-
-                // 构造二级和三级分类树
-                List<FrontGoodsCategoryVO> vos2 = new ArrayList<>();
-                for (GoodsCategory goodsCategory2 : list2) {
-                    FrontGoodsCategoryVO tree2 = new FrontGoodsCategoryVO(goodsCategory2);
-                    // 没有图片就用默认图片
-                    if (StringUtils.isEmpty(goodsCategory2.getCategoryImage())) {
-                        tree2.setCategoryImage(FileUrlUtil.getFileUrl(stringRedisTemplate.opsForValue().get("default_goods_cate_grade2_image"), null));
-                    }
-
-                    // 获取当前二级分类下的三级分类
-                    List<FrontGoodsCategoryVO> vos3 = new ArrayList<>();
-                    List<GoodsCategory> thirdCategories = thirdLevelMap.get(goodsCategory2.getCategoryId());
-                    if (!CollectionUtils.isEmpty(thirdCategories)) {
-                        for (GoodsCategory goodsCategory3 : thirdCategories) {
-                            FrontGoodsCategoryVO tree3 = new FrontGoodsCategoryVO(goodsCategory3);
-                            // 没有图片就用默认图片
-                            if (StringUtils.isEmpty(goodsCategory3.getCategoryImage())) {
-                                tree3.setCategoryImage(FileUrlUtil.getFileUrl(stringRedisTemplate.opsForValue().get("default_goods_cate_grade3_image"), null));
-                            }
-                            vos3.add(tree3);
-                        }
-                    }
-
-                    if (!CollectionUtils.isEmpty(vos3)) {
-                        tree2.setChildren(vos3);
-                        vos2.add(tree2);
-                    }
-                }
-
-                tree.setChildren(vos2);
-            }
-        }
-
-        return tree;
-    }
 
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/front/FrontStoreController.java

@@ -34,12 +34,10 @@ import com.slodon.b2b2c.model.member.MemberFollowStoreModel;
 import com.slodon.b2b2c.model.seller.*;
 import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
-import com.slodon.b2b2c.system.pojo.SysSeo;
 import com.slodon.b2b2c.vo.goods.SysSeoVO;
 import com.slodon.b2b2c.vo.seller.FrontStoreListVO;
 import com.slodon.b2b2c.vo.seller.FrontStoreVO;
 import com.slodon.b2b2c.vo.seller.StoreCategoryTreeVO;
-import com.slodon.b2b2c.vo.seller.StoreGoodsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -59,7 +57,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author slodon
@@ -154,51 +151,6 @@ public class FrontStoreController {
             vos.add(vo);
         }
 
-//        else {
-//            List<StoreName> storeNameList = new ArrayList<>();
-//            List<StoreSiteInfo> storeSiteInfoList = new ArrayList<>();
-//            if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
-//                StoreNameExample storeNameExample = new StoreNameExample();
-//                storeNameExample.setStoreNameLike(keyword);
-//                storeNameExample.setWebSite(webSite);
-//                storeNameList = storeNameModel.getStoreNameList(storeNameExample, pager);
-//                if (CollectionUtils.isEmpty(storeNameList)) {
-//                    //没有满足条件的店铺
-//                    return SldResponse.success(new PageVO<>(vos, pager));
-//                }
-//                StoreSiteInfoExample storeSiteInfoExample = new StoreSiteInfoExample();
-//                storeSiteInfoExample.setStoreIdIn(storeNameList.stream().map(StoreName::getStoreId).collect(Collectors.toList()));
-//                storeSiteInfoExample.setWebSite(webSite);
-//                storeSiteInfoExample.setBusinessState(StoreConst.STORE_BUSINESS_STATE_OPEN);
-//                storeSiteInfoList = storeSiteInfoModel.getStoreSiteInfoList(storeSiteInfoExample, null);
-//                if (CollectionUtils.isEmpty(storeSiteInfoList)) {
-//                    //没有满足条件的店铺
-//                    return SldResponse.success(new PageVO<>(vos, pager));
-//                }
-//            }
-//            for (StoreSiteInfo storeSiteInfo : storeSiteInfoList) {
-//                Store store = storeModel.getStoreByStoreId(storeSiteInfo.getStoreId());
-//                if (store != null) {
-//                    store.setStoreName(storeNameList.stream()
-//                            .filter(storeNameWebSite -> storeNameWebSite.getStoreId().equals(storeSiteInfo.getStoreId()))
-//                            .findFirst()
-//                            .map(StoreName::getStoreName)
-//                            .orElse(""));
-//                    store.setStoreLogo(storeSiteInfo.getStoreLogo());
-//                    //默认店铺logo
-//                    if (StringUtils.isEmpty(store.getStoreLogo())) {
-//                        store.setStoreLogo(stringRedisTemplate.opsForValue().get("default_image_store_logo"));
-//                    }
-//                    //默认店铺背景图片(取移动端横幅)
-//                    if (StringUtils.isEmpty(store.getStoreBannerMobile())) {
-//                        store.setStoreBannerMobile(stringRedisTemplate.opsForValue().get("default_image_store_backdrop"));
-//                    }
-//                    FrontStoreListVO vo = new FrontStoreListVO(store);
-//                    vos.add(vo);
-//                }
-//            }
-//        }
-
         return SldResponse.success(new PageVO<>(vos, pager));
     }
 
@@ -212,7 +164,11 @@ public class FrontStoreController {
         Member member = UserUtil.getUser(request, Member.class);
         String webSite = WebUtil.getWebSite(request);
         Store store = storeModel.getStoreByStoreId(storeId);
-        if(WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)){
+        Integer state = store.getState();
+        String serviceScore = store.getServiceScore();
+        String deliverScore = store.getDeliverScore();
+        String descriptionScore = store.getDescriptionScore();
+        if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
             store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(storeId, webSite);
             if (!StringUtils.isEmpty(store.getStoreId())) {
                 StoreNameExample storeNameExample = new StoreNameExample();
@@ -220,6 +176,10 @@ public class FrontStoreController {
                 storeNameExample.setWebSite(webSite);
                 StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
                 store.setStoreName(storeName != null ? storeName.getStoreName() : null);
+                store.setState(state);
+                store.setServiceScore(serviceScore);
+                store.setDeliverScore(deliverScore);
+                store.setDescriptionScore(descriptionScore);
             }
         }
         if (store.getState() != StoreConst.STORE_STATE_OPEN && store.getBusinessState() != StoreConst.STORE_BUSINESS_STATE_OPEN) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/front/FrontPcDecoController.java

@@ -34,8 +34,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.context.request.async.WebAsyncUtils;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
@@ -124,6 +122,7 @@ public class FrontPcDecoController {
         String webSite = WebUtil.getWebSite(request);
         //查询店铺信息
         Store storeDb = storeModel.getStoreByStoreId(storeId);
+        Integer state = storeDb.getState();
         if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
             storeDb = storeSiteInfoModel.getStoreByStoreIdAndWebSite(storeDb.getStoreId(), WebSiteConstant.MEMBER_DISTRIBUTOR);
             if (!StringUtils.isEmpty(storeDb.getStoreId())) {
@@ -132,9 +131,10 @@ public class FrontPcDecoController {
                 storeNameExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
                 StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
                 storeDb.setStoreName(storeName != null ? storeName.getStoreName() : null);
+                storeDb.setState(state);
             }
         }
-        if (storeDb.getState().equals(StoreConst.STORE_STATE_CLOSE)) {
+        if (storeDb.getState().equals(StoreConst.STORE_STATE_CLOSE) && !storeDb.getBusinessState().equals(StoreConst.STORE_BUSINESS_STATE_OPEN)) {
             JsonResult jsonResult = SldResponse.fail("店铺已关闭");
             jsonResult.setState(ResponseConst.STATE_STORE_CLOSE);
             return jsonResult;

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/goods/FrontGoodsCategoryVO.java

@@ -57,9 +57,4 @@ public class FrontGoodsCategoryVO {
         this.mobileImage = category.getMobileImage();
         this.homeShow = category.getHomeShow();
     }
-
-    public FrontGoodsCategoryVO(StoreBindCategory  category) {
-        this.categoryId = category.getGoodsCategoryId1();
-        this.webSite = category.getWebSite();
-    }
 }