邀请码已使用人数

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/InvitationCodeServiceImpl.java

@@ -117,7 +117,7 @@ public class InvitationCodeServiceImpl implements InvitationCodeService {
                 if (CollectionUtils.isEmpty(inviteRecordVoList)) {
                     invitationCodeVo.setUsedNum(0);
                 } else {
-                    invitationCodeVo.setUsedNum(invitationCodeVoList.size());
+                    invitationCodeVo.setUsedNum(inviteRecordVoList.size());
                 }
                 invitationCodeVoList.add(invitationCodeVo);
             });

ch-dao/src/main/java/com/wwdz/ch/db/dao/CategoryDao.java

@@ -19,6 +19,8 @@ public interface CategoryDao {
 
     List<Category> queryByPid(Integer pid);
 
+    List<Category> queryByPids(List<Integer> pidList);
+
     Category findById(Integer id);
 
     /**

ch-dao/src/main/java/com/wwdz/ch/db/impl/CategoryDaoImpl.java

@@ -56,6 +56,17 @@ public class CategoryDaoImpl implements CategoryDao {
 		return categoryMapper.selectByExampleWithBLOBs(example);
 	}
 
+
+	@Override
+	public List<Category> queryByPids(List<Integer> pidList) {
+		CategoryExample example = new CategoryExample();
+		CategoryExample.Criteria criteria = example.createCriteria();
+		criteria.andPidIn(pidList).andIsDeletedEqualTo(false);
+		return categoryMapper.selectByExample(example);
+	}
+
+
+
 	public Category findById(Integer id) {
 		return categoryMapper.selectByPrimaryKey(id);
 	}

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/TransverseCategory.java

+package com.wwdz.ch.wx.entity;
+
+import com.wwdz.ch.db.domain.Category;
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+@Data
+public class TransverseCategory implements Entity {
+
+    private Integer id;
+
+    private String name;
+
+    private Integer pid;
+
+    private Integer level;
+
+    private Boolean isLeaf;
+
+
+    public TransverseCategory() {
+    }
+
+    public TransverseCategory(Integer id, String name, Integer pid, Integer level, Boolean isLeaf) {
+        this.id = id;
+        this.name = name;
+        this.pid = pid;
+        this.level = level;
+        this.isLeaf = isLeaf;
+    }
+
+
+    public static TransverseCategory ofTitle(Category category) {
+        TransverseCategory transverseCategory = new TransverseCategory();
+        transverseCategory.setId(category.getId());
+        transverseCategory.setName(category.getName());
+        transverseCategory.setLevel(category.getLevel());
+        transverseCategory.setIsLeaf(category.getIsLeaf());
+        transverseCategory.setPid(category.getPid());
+        return transverseCategory;
+    }
+
+}

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/CategoryRequestDto.java

@@ -10,4 +10,5 @@ public class CategoryRequestDto implements Entity {
     private Integer page;
     private Integer size;
     private String name;
+    private Integer pid;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/CategoryVo.java

@@ -185,6 +185,15 @@ public class CategoryVo implements Serializable {
         return new CategoryVo(category);
     }
 
+    public static CategoryVo ofTitle(Category category) {
+        CategoryVo categoryVo = new CategoryVo();
+        categoryVo.setId(category.getId());
+        categoryVo.setName(category.getName());
+        categoryVo.setLevel(category.getLevel());
+        categoryVo.setIsLeaf(category.getIsLeaf());
+        return categoryVo;
+    }
+
     public Integer getId() {
         return id;
     }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/TransverseCategoryVo.java

+package com.wwdz.ch.wx.entity.vo;
+
+import com.wwdz.ch.wx.entity.TransverseCategory;
+import lombok.Data;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 横向类目展示
+ */
+@Data
+public class TransverseCategoryVo {
+
+    private List<TransverseCategory> firstCategory;
+
+    private List<Map<String, Object>>  childCategory;
+
+}

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/CategoryServiceImpl.java

@@ -5,8 +5,11 @@ import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.CategoryDao;
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.dto.request.CategorySearchRequestDto;
+import com.wwdz.ch.wx.entity.TransverseCategory;
 import com.wwdz.ch.wx.entity.request.CategoryRequestDto;
 import com.wwdz.ch.wx.entity.vo.CategoryResponseVo;
+import com.wwdz.ch.wx.entity.vo.CategoryVo;
+import com.wwdz.ch.wx.entity.vo.TransverseCategoryVo;
 import com.wwdz.ch.wx.service.CategoryService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -21,6 +24,9 @@ import java.util.stream.Collectors;
 @Service
 public class CategoryServiceImpl implements CategoryService {
     private static final Logger logger = LoggerFactory.getLogger(CategoryServiceImpl.class);
+
+    private static final Integer TOP_PID = 0;
+
     @Autowired
     private CategoryDao categoryDao;
 
@@ -168,4 +174,38 @@ public class CategoryServiceImpl implements CategoryService {
         vo.setIsChosen(0);
         return vo;
     }
+
+
+    @Override
+    public Result findCategoryByTransverse(CategoryRequestDto dto) {
+        try {
+            TransverseCategoryVo transverseCategoryVo = new TransverseCategoryVo();
+            //查询所有的第一级类目
+            List<Category> categoryList = categoryDao.queryByPid(TOP_PID);
+            List<TransverseCategory> firstCategoryVoList = categoryList.stream().map(e -> TransverseCategory.ofTitle(e)).collect(Collectors.toList());
+            transverseCategoryVo.setFirstCategory(firstCategoryVoList);
+            List<Map<String, Object>> childList = new ArrayList<>();
+            categoryList.forEach(firstCategory -> {
+                int firstCategoryId = firstCategory.getId();
+                //查询第二级类目
+                List<Category> secondCategoryList = categoryDao.queryByPid(firstCategoryId);
+                List<Integer> secondCategoryIdList = secondCategoryList.stream().map(Category::getId).collect(Collectors.toList());
+                //查询三级类目
+                List<Category> thirdCategoryList = categoryDao.queryByPids(secondCategoryIdList);
+
+                List<TransverseCategory> secondCategoryVoList = secondCategoryList.stream().map(e -> TransverseCategory.ofTitle(e)).collect(Collectors.toList());
+                List<TransverseCategory> thirdCategoryVoList = thirdCategoryList.stream().map(e -> TransverseCategory.ofTitle(e)).collect(Collectors.toList());
+                Map<String, Object> valueMap = new HashMap<>();
+                valueMap.put("firstCategoryId", firstCategory.getId());
+                valueMap.put("secondCategory", secondCategoryVoList);
+                valueMap.put("thirdCategory", thirdCategoryVoList);
+                childList.add(valueMap);
+            });
+            transverseCategoryVo.setChildCategory(childList);
+            return Result.success(transverseCategoryVo);
+        } catch (Exception e) {
+            logger.error("获取类目横向展示出错:{}", e);
+        }
+        return Result.failed();
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/CategoryService.java

@@ -42,4 +42,12 @@ public interface CategoryService {
      * @return
      */
     Result findNames(CategoryRequestDto dto);
+
+
+    /**
+     * 查价页面横向展示类目
+     * @param dto
+     * @return
+     */
+    Result findCategoryByTransverse(CategoryRequestDto dto);
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/QueryPriceController.java

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.wwdz.ch.core.consts.ResultCode;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
+import com.wwdz.ch.wx.entity.request.CategoryRequestDto;
 import com.wwdz.ch.wx.entity.request.QueryPriceRequestDto;
+import com.wwdz.ch.wx.service.CategoryService;
 import com.wwdz.ch.wx.service.QueryPriceService;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -26,6 +28,9 @@ public class QueryPriceController {
     @Autowired
     QueryPriceService queryPriceService;
 
+    @Autowired
+    CategoryService categoryService;
+
     @ApiOperation(value = "查价价格详情")
     @PostMapping("/findDetails")
     public Result findDetails(@RequestBody QueryPriceRequestDto dto) {
@@ -45,4 +50,11 @@ public class QueryPriceController {
         }
         return queryPriceService.findBidRecord(dto);
     }
+
+
+    @ApiOperation(value = "横向类目查询")
+    @PostMapping("/findTransverseCategory")
+    public Result findTransverseCategory(@RequestBody CategoryRequestDto dto) {
+        return categoryService.findCategoryByTransverse(dto);
+    }
 }