fubojin 1 місяць тому
батько
коміт
6bd1859d51

+ 2 - 0
yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopDetailController.java

@@ -62,6 +62,8 @@ public class ShopDetailController {
         shopHeadInfoDto.setIntro(shopDetail.getIntro());
         shopHeadInfoDto.setFansCount(fansCount);
         shopHeadInfoDto.setTel(shopDetail.getTel());
+        shopHeadInfoDto.setLat(shopDetail.getShopLat());
+        shopHeadInfoDto.setLon(shopDetail.getShopLng());
         shopHeadInfoDto.setThirdPartyCode(shopDetail.getThirdPartyCode());
         return ResponseEntity.ok(shopHeadInfoDto);
     }

+ 7 - 7
yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopCategoryServiceImpl.java

@@ -78,7 +78,7 @@ public class ShopCategoryServiceImpl extends ServiceImpl<ShopCategoryMapper, Sho
                 .collect(Collectors.groupingBy(ShopCategory::getPid));
 
         // 初始层级为一级分类(grade = 1)
-        return buildCategoryTree(parentMap.getOrDefault(0L, Collections.emptyList()), parentMap, 0);
+        return buildCategoryTree(parentMap.getOrDefault(0L, Collections.emptyList()), parentMap, 1);
     }
     private List<ShopCategory> buildCategoryTree(List<ShopCategory> categories, Map<Long, List<ShopCategory>> parentMap, int currentLevel) {
         if (CollectionUtil.isEmpty(categories)) return Collections.emptyList();
@@ -94,16 +94,16 @@ public class ShopCategoryServiceImpl extends ServiceImpl<ShopCategoryMapper, Sho
                     shopCategory.setLevel(currentLevel);
 
                     // 判断是否为二级或三级分类,并设置level字段(原productBeBound)
-                    int level = 0;
-                    if (currentLevel == 1 || currentLevel == 2) {
+                    int level = 1;
+                    if (currentLevel == 2 || currentLevel == 3) {
                         // 三级分类直接绑定商品
-                        if (currentLevel == 2) {
-                            level = 1;
+                        if (currentLevel == 3) {
+                            level = 2;
                         }
                         // 二级分类若无子分类(三级分类),则允许绑定商品
-                        else if (currentLevel == 1) {
+                        else if (currentLevel == 2) {
                             List<ShopCategory> children = parentMap.getOrDefault(category.getId(), Collections.emptyList());
-                            level = children.isEmpty() ? 1 : 0;
+                            level = children.isEmpty() ? 2 : 1;
                         }
                     }
                     shopCategory.setLevel(level);