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 72a09e59..62ebff20 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
@@ -90,6 +90,25 @@ public class ProductCategoryController {
return new ResultUtil
>().setData(list);
}
+ /**
+ * 前台传参查询店铺类别列表
+ * @author 王富康
+ * @date 2024/9/7
+ * @param shopId
+ * @return Result
+ */
+ @RequestMapping(value = "/listByShopId", method = RequestMethod.GET)
+ @ApiOperation(value = "前台传参查询店铺类别列表")
+ public Result listByShopId(String shopId) {
+ if(StringUtils.isEmpty(shopId)){
+ return ResultUtil.error("店铺信息不能为空");
+ }
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("shop_id", shopId);
+ List list = productCategoryService.list(queryWrapper);
+ return new ResultUtil>().setData(list);
+ }
+
/**
* 获取店铺下所有分类及分类的规格及规格的属性值
@@ -122,6 +141,23 @@ public class ProductCategoryController {
return new ResultUtil().setData(defaultCategory);
}
+ /**
+ * 根据前台传的shopId查询店铺默认分类
+ * @author 王富康
+ * @date 2024/9/7
+ * @param shopId
+ * @return Result
+ */
+ @RequestMapping(value = "/getDefaultCategoryByShopId", method = RequestMethod.POST)
+ @ApiOperation(value = "根据前台传的shopId查询店铺默认分类")
+ public Result getDefaultCategoryByShopId(String shopId){
+ if(StringUtils.isEmpty(shopId)){
+ return ResultUtil.error("店铺id不能为空");
+ }
+ ProductCategoryVo defaultCategory = productCategoryService.getDefaultCategory(shopId);
+ return new ResultUtil().setData(defaultCategory);
+ }
+
@RequestMapping(value = "/getCategoryOfshop", method = RequestMethod.POST)
@ApiOperation(value = "查询店铺规格")
public Result getCategoryOfshop(){
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml
index d8cbc886..339bd95a 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml
@@ -574,25 +574,25 @@
) ss
ON ss.product_id = t.id
and ss.shop_id = t.shop_id
- LEFT JOIN (
- SELECT
- sd.product_id,
- SUM(sd.product_count) AS total_sold
- FROM
- t_sale_detail sd
- INNER JOIN t_sale s ON sd.sale_id = s.id
- WHERE
- s.del_flag = '0'
- AND s.status = '4'
-
+
+ LEFT JOIN (
+ SELECT
+ sd.product_id,
+ SUM(sd.product_count) AS total_sold
+ FROM
+ t_sale_detail sd
+ INNER JOIN t_sale s ON sd.sale_id = s.id
+ WHERE
+ s.del_flag = '0'
+ AND s.status = '4'
and s.create_time BETWEEN #{queryParams.startDate} AND #{queryParams.endDate}
-
-
- and s.create_time >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
-
- GROUP BY
- product_id
- ) sd ON t.id = sd.product_id
+
+ GROUP BY
+ product_id
+ ) sd ON t.id = sd.product_id
+
AND t.del_flag != '2'
@@ -637,9 +637,12 @@
ORDER BY
-
- sd.total_sold desc,
+
+
+ sd.total_sold desc,
+
+
t.in_storage_status asc, t.del_flag desc,t.create_time desc, id