fix bug app/productCategory/list 接口的sql修改，同时加两个返回参数 count stockCount

hiver-admin/src/main/resources/application.yml

@@ -347,6 +347,7 @@ ignored:
     - /hiver/app/logisticsEntruckingLog/getDateLogisticsEntruckingLogPageList
     - /hiver/app/logisticsEntruckingLog/batchAddLogisticsEntruckingLog
     - /hiver/purchaseOcrPicture/getLogisticsOrderOfAi
+    - /hiver/app/productCategory/**
   # 限流及黑名单不拦截的路径
   limitUrls:
     - /**/*.js

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductCategoryController.java

@@ -5,6 +5,7 @@ import cc.hiver.core.common.utils.SecurityUtil;
 import cc.hiver.core.common.vo.Result;
 import cc.hiver.mall.entity.ProductCategory;
 import cc.hiver.mall.pojo.vo.ProductCategoryVo;
+import cc.hiver.mall.pojo.vo.ProductCategoryVo2;
 import cc.hiver.mall.service.mybatis.ProductCategoryService;
 import cc.hiver.mall.service.mybatis.ProductService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -82,13 +83,13 @@ public class ProductCategoryController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(value = "查询货品类别列表")
     public Result list() {
-        QueryWrapper<ProductCategory> queryWrapper = new QueryWrapper<>();
+//        QueryWrapper<ProductCategory> queryWrapper = new QueryWrapper<>();
         // shopId从缓存中设置
         final String shopId = securityUtil.getShopId();
 //        final String shopId  = "1759768115375378438";
 //        queryWrapper.eq("shop_id", shopId);
-        List<ProductCategory> list = productCategoryService.getCategoryListByShopId(shopId);
+        List<ProductCategoryVo2> list = productCategoryService.getCategoryListByShopId(shopId);
-        return new ResultUtil<List<ProductCategory>>().setData(list);
+        return new ResultUtil<List<ProductCategoryVo2>>().setData(list);
     }
 
     /**

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductCategoryMapper.java

@@ -3,6 +3,7 @@ package cc.hiver.mall.dao.mapper;
 import cc.hiver.mall.entity.ProductCategory;
 import cc.hiver.mall.entity.ProductCategoryExample;
 import cc.hiver.mall.pojo.vo.ProductCategoryVo;
+import cc.hiver.mall.pojo.vo.ProductCategoryVo2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -41,5 +42,5 @@ public interface ProductCategoryMapper extends BaseMapper<ProductCategory> {
     ProductCategoryVo getDefaultCategory(String shopId);
 
 
-    List<ProductCategory> getCategoryListByShopId(@Param("shopId") String shopId);
+    List<ProductCategoryVo2> getCategoryListByShopId(@Param("shopId") String shopId);
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java

@@ -17,11 +17,5 @@ public class ProductCategory  extends HiverBaseEntity {
     @ApiModelProperty(value = "店铺id")
     private String shopId;
 
-    @ApiModelProperty(value = "数量")
-    private int count;
-
-    @ApiModelProperty(value = "盘点数量")
-    private int stockCount;
-
     private static final long serialVersionUID = 1L;
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/ProductCategoryVo2.java

@@ -0,0 +1,27 @@
+package cc.hiver.mall.pojo.vo;
+
+import cc.hiver.core.base.HiverBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "商品类别表")
+@TableName(value = "t_product_category", autoResultMap = true)
+public class ProductCategoryVo2 extends HiverBaseEntity {
+
+    @ApiModelProperty(value = "商品类别名称")
+    private String categoryName;
+
+    @ApiModelProperty(value = "店铺id")
+    private String shopId;
+
+    @ApiModelProperty(value = "数量")
+    private int count;
+
+    @ApiModelProperty(value = "盘点数量")
+    private int stockCount;
+
+    private static final long serialVersionUID = 1L;
+}

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ProductCategoryService.java

@@ -3,6 +3,7 @@ package cc.hiver.mall.service.mybatis;
 import cc.hiver.mall.entity.ProductCategory;
 import cc.hiver.mall.pojo.vo.ProductCategoryAiVo;
 import cc.hiver.mall.pojo.vo.ProductCategoryVo;
+import cc.hiver.mall.pojo.vo.ProductCategoryVo2;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -58,5 +59,5 @@ public interface ProductCategoryService extends IService<ProductCategory> {
     ProductCategoryVo getCategoryOfshop();
 
 
-    List<ProductCategory> getCategoryListByShopId(String shopId);
+    List<ProductCategoryVo2> getCategoryListByShopId(String shopId);
 }

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductCategoryServiceImpl.java

@@ -7,10 +7,7 @@ import cc.hiver.mall.entity.ProductAttribute;
 import cc.hiver.mall.entity.ProductAttributeValue;
 import cc.hiver.mall.entity.ProductCategory;
 import cc.hiver.mall.entity.Shop;
-import cc.hiver.mall.pojo.vo.ProductAttributeOfAddVo;
+import cc.hiver.mall.pojo.vo.*;
-import cc.hiver.mall.pojo.vo.ProductAttributeValueVo;
-import cc.hiver.mall.pojo.vo.ProductCategoryAiVo;
-import cc.hiver.mall.pojo.vo.ProductCategoryVo;
 import cc.hiver.mall.service.ShopService;
 import cc.hiver.mall.service.mybatis.ProductAttributeService;
 import cc.hiver.mall.service.mybatis.ProductAttributeValueService;
@@ -500,7 +497,7 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
     }
 
     @Override
-    public List<ProductCategory> getCategoryListByShopId(String shopId){
+    public List<ProductCategoryVo2> getCategoryListByShopId(String shopId){
         return productCategoryMapper.getCategoryListByShopId(shopId);
     }
 }

hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml

@@ -282,7 +282,7 @@
   </select>
 
 
-  <select id="getCategoryListByShopId" parameterType="java.lang.String" resultType="cc.hiver.mall.entity.ProductCategory">
+  <select id="getCategoryListByShopId" parameterType="java.lang.String" resultType="cc.hiver.mall.pojo.vo.ProductCategoryVo2">
     SELECT
     sum( count ) AS count,
     sum( stockCount ) AS stockCount,