diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductCategoryController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductCategoryController.java
index 62ebff20..6d290842 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductCategoryController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ProductCategoryController.java
@@ -85,8 +85,9 @@ public class ProductCategoryController {
         QueryWrapper<ProductCategory> queryWrapper = new QueryWrapper<>();
         // shopId从缓存中设置
         final String shopId = securityUtil.getShopId();
-        queryWrapper.eq("shop_id", shopId);
-        List<ProductCategory> list = productCategoryService.list(queryWrapper);
+//        final String shopId  = "1759768115375378438";
+//        queryWrapper.eq("shop_id", shopId);
+        List<ProductCategory> list = productCategoryService.getCategoryListByShopId(shopId);
         return new ResultUtil<List<ProductCategory>>().setData(list);
     }
 
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductCategoryMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductCategoryMapper.java
index e0322dea..f8af8eed 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductCategoryMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/ProductCategoryMapper.java
@@ -39,4 +39,7 @@ public interface ProductCategoryMapper extends BaseMapper<ProductCategory> {
     void insertBatch(List<ProductCategory> addProductCategory);
 
     ProductCategoryVo getDefaultCategory(String shopId);
+
+
+    List<ProductCategory> getCategoryListByShopId(@Param("shopId") String shopId);
 }
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java
index e629cde7..13b842a6 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ProductCategory.java
@@ -17,5 +17,11 @@ 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;
 }
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ProductCategoryService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ProductCategoryService.java
index 6755bfed..11a7fd70 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ProductCategoryService.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/ProductCategoryService.java
@@ -56,4 +56,7 @@ public interface ProductCategoryService extends IService<ProductCategory> {
     void batchSaveCategoryOfShop(ProductCategoryVo productCategoryVo);
 
     ProductCategoryVo getCategoryOfshop();
+
+
+    List<ProductCategory> getCategoryListByShopId(String shopId);
 }
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
index 479bec78..0d75401c 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/SalesAndDetailsServiceImpl.java
@@ -266,7 +266,10 @@ public class SalesAndDetailsServiceImpl implements SalesAndDetailsService {
         // 获取销售员的手机号
         final User user = securityUtil.getCurrUser();
         sale.setCreateByPhone(user.getMobile());
-        sale.setCreateTime(new Date());
+        // 前台没传时间的话，创建当前时间
+        if(sale.getCreateTime() == null) {
+            sale.setCreateTime(new Date());
+        }
         sale.setDelFlag(CommonConstant.DEL_FLAG_FALSE);
         // 客户id
         // sale.setUserId();
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductCategoryServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductCategoryServiceImpl.java
index f7870830..8cf3e1c3 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductCategoryServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductCategoryServiceImpl.java
@@ -498,4 +498,9 @@ public class ProductCategoryServiceImpl extends ServiceImpl<ProductCategoryMappe
             return null;
         }
     }
+
+    @Override
+    public List<ProductCategory> getCategoryListByShopId(String shopId){
+        return productCategoryMapper.getCategoryListByShopId(shopId);
+    }
 }
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml
index 1716ed9d..09fddd33 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductCategoryMapper.xml
@@ -280,4 +280,50 @@
     where shop_id = #{shopId,jdbcType=VARCHAR}
       and category_name = '默认分类'
   </select>
+
+
+  <select id="getCategoryListByShopId" parameterType="java.lang.String" resultType="cc.hiver.mall.entity.ProductCategory">
+    SELECT
+    sum( count ) AS count,
+    sum( stockCount ) AS stockCount,
+    dd.id,
+    dd.category_name,
+    dd.shop_id,
+    dd.create_by,
+    dd.create_time,
+    dd.update_by,
+    dd.update_time,
+    dd.del_flag
+    FROM
+    t_product_category dd
+    LEFT JOIN (
+    SELECT
+    count( * ) AS count,
+    sum( COALESCE ( ss.stock_count, 0 ) ) AS stockCount,
+    t.category_id
+    FROM
+    t_product t
+    LEFT JOIN (
+    SELECT
+    sum( CASE WHEN s.stock_count &lt; 0 THEN 0 ELSE s.stock_count END ) AS stock_count,
+    shop_id,
+    product_id
+    FROM
+    t_stock s
+    GROUP BY
+    shop_id,
+    product_id
+    ) ss ON ss.product_id = t.id
+    AND ss.shop_id = t.shop_id
+    WHERE
+    t.del_flag != '2'
+    AND t.shop_id = #{shopId,jdbcType=VARCHAR}
+    GROUP BY
+    t.id
+    ) aa ON dd.id = aa.category_id
+    WHERE
+    dd.shop_id = #{shopId,jdbcType=VARCHAR}
+    GROUP BY
+    dd.id
+  </select>
 </mapper>
\ No newline at end of file