进销存需要一个开放接口 根据shop_id查分类（用现有的就行，只不过shopid是前台传的）

后台 getShaerList接口去掉7天销量联查

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

@@ -337,6 +337,8 @@ ignored:
     # 物流订单详情
     - /hiver/app/logisticsOrder/getLogisticsOrderDetail
     - /hiver/app/customer/findByUserPhoneAndShopId
+    # 分享页获取店铺分类
+    - app/productCategory/listByShopId
 
     # 临时增加
     - /hiver/app/logisticsOrder/addLogisticsOrder

hiver-admin/test-output/test-report.html

@@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">九月 06, 2024 13:53:46</span></a>
+<a href="#"><span class="badge badge-primary">九月 06, 2024 15:28:59</span></a>
 </li>
 </ul>
 </div>
@@ -84,7 +84,7 @@
           <div class="test-detail">
             <span class="meta text-white badge badge-sm"></span>
             <p class="name">passTest</p>
-            <p class="text-sm"><span>13:53:47 下午</span> / <span>0.017 secs</span></p>
+            <p class="text-sm"><span>15:29:00 下午</span> / <span>0.026 secs</span></p>
           </div>
           <div class="test-contents d-none">
 <div class="detail-head">
@@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>09.06.2024 13:53:47</span>
+<span class='badge badge-success'>09.06.2024 15:29:00</span>
-<span class='badge badge-danger'>09.06.2024 13:53:47</span>
+<span class='badge badge-danger'>09.06.2024 15:29:00</span>
-<span class='badge badge-default'>0.017 secs</span>
+<span class='badge badge-default'>0.026 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@@ -104,7 +104,7 @@
   <tbody>
       <tr class="event-row">
         <td><span class="badge log pass-bg">Pass</span></td>
-        <td>13:53:47</td>
+        <td>15:29:00</td>
         <td>
           Test passed
         </td>
@@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>九月 06, 2024 13:53:46</h3>
+<h3>九月 06, 2024 15:28:59</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>九月 06, 2024 13:53:47</h3>
+<h3>九月 06, 2024 15:29:00</h3>
 </div></div>
 </div>
 <div class="col-md-3">

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

@@ -90,6 +90,25 @@ public class ProductCategoryController {
         return new ResultUtil<List<ProductCategory>>().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<ProductCategory> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("shop_id", shopId);
+        List<ProductCategory> list = productCategoryService.list(queryWrapper);
+        return new ResultUtil<List<ProductCategory>>().setData(list);
+    }
+
 
     /**
      * 获取店铺下所有分类及分类的规格及规格的属性值
@@ -122,6 +141,23 @@ public class ProductCategoryController {
         return new ResultUtil<ProductCategoryVo>().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<ProductCategoryVo>().setData(defaultCategory);
+    }
+
     @RequestMapping(value = "/getCategoryOfshop", method = RequestMethod.POST)
     @ApiOperation(value = "查询店铺规格")
     public Result getCategoryOfshop(){

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

@@ -574,6 +574,7 @@
         ) ss
         ON ss.product_id = t.id
         and ss.shop_id = t.shop_id
+        <if test='queryParams.startDate !=null and queryParams.startDate.trim() neq "" and queryParams.endDate !=null and queryParams.endDate.trim() neq ""'>
             LEFT JOIN (
                 SELECT
                 sd.product_id,
@@ -584,15 +585,14 @@
                 WHERE
                 s.del_flag = '0'
                 AND s.status = '4'
-            <if test='queryParams.startDate !=null and queryParams.startDate.trim() neq "" and queryParams.endDate !=null and queryParams.endDate.trim() neq ""'>
                 and s.create_time BETWEEN #{queryParams.startDate} AND #{queryParams.endDate}
-            </if>
+                <!--<if test='(queryParams.startDate == null or queryParams.startDate eq "" ) and (queryParams.endDate == null or queryParams.endDate eq "")'>
-            <if test='(queryParams.startDate == null or queryParams.startDate eq "" ) and (queryParams.endDate == null or queryParams.endDate eq "")'>
                     and s.create_time >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
-            </if>
+                </if>-->
                 GROUP BY
                 product_id
             ) sd ON t.id = sd.product_id
+        </if>
         <where>
             <!--已上架的-->
             AND t.del_flag != '2'
@@ -637,9 +637,12 @@
         </where>
         ORDER BY
         <!--销量排序-->
+        <if test='queryParams.startDate !=null and queryParams.startDate.trim() neq "" and queryParams.endDate !=null and queryParams.endDate.trim() neq ""'>
             <if test='queryParams.sortField!=null and queryParams.sortField.trim() neq "" and queryParams.sortField eq "totalSold"'>
                 sd.total_sold desc,
             </if>
+        </if>
+
         t.in_storage_status asc, t.del_flag desc,t.create_time desc, id
     </select>