商品字段调整

foodnexus-module-mall/foodnexus-module-product/src/main/java/cn/iocoder/foodnexus/module/product/controller/admin/spu/ProductSpuController.java

@@ -126,12 +126,6 @@ public class ProductSpuController {
         return success(BeanUtils.toBean(pageResult, ProductSpuRespVO.class));
     }
 
-    @GetMapping("/get-count")
-    @Operation(summary = "获得商品 SPU 分页 tab count")
-    @PreAuthorize("@ss.hasPermission('product:spu:query')")
-    public CommonResult<Map<Integer, Long>> getSpuCount() {
-        return success(productSpuService.getTabsCount());
-    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出商品")

foodnexus-module-mall/foodnexus-module-product/src/main/java/cn/iocoder/foodnexus/module/product/dal/mysql/spu/ProductSpuMapper.java

@@ -50,12 +50,7 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
      * @return 触发警戒库存的 SPU 数量
      */
     default Long selectCount() {
-        LambdaQueryWrapperX<ProductSpuDO> queryWrapper = new LambdaQueryWrapperX<>();
-        // 库存小于等于警戒库存
-        queryWrapper.le(ProductSpuDO::getStock, ProductConstants.ALERT_STOCK)
-                // 如果库存触发警戒库存且状态为回收站的话则不计入触发警戒库存的个数
-                .notIn(ProductSpuDO::getStatus, ProductSpuStatusEnum.RECYCLE.getStatus());
-        return selectCount(queryWrapper);
+        return null;
     }
 
     /**
@@ -75,8 +70,6 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
             query.last(String.format(" ORDER BY (sales_count + virtual_sales_count) %s, sort DESC, id DESC",
                     pageReqVO.getSortAsc() ? "ASC" : "DESC"));
         } else if (Objects.equals(pageReqVO.getSortField(), AppProductSpuPageReqVO.SORT_FIELD_PRICE)) {
-            query.orderBy(true, pageReqVO.getSortAsc(), ProductSpuDO::getPrice)
-                    .orderByDesc(ProductSpuDO::getSort).orderByDesc(ProductSpuDO::getId);
         } else if (Objects.equals(pageReqVO.getSortField(), AppProductSpuPageReqVO.SORT_FIELD_CREATE_TIME)) {
             query.orderBy(true, pageReqVO.getSortAsc(), ProductSpuDO::getCreateTime)
                     .orderByDesc(ProductSpuDO::getSort).orderByDesc(ProductSpuDO::getId);
@@ -125,16 +118,6 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
         if (ObjectUtil.equals(ProductSpuPageReqVO.IN_WAREHOUSE, tabType)) {
             query.eqIfPresent(ProductSpuDO::getStatus, ProductSpuStatusEnum.DISABLE.getStatus());
         }
-        // 已售空商品
-        if (ObjectUtil.equals(ProductSpuPageReqVO.SOLD_OUT, tabType)) {
-            query.eqIfPresent(ProductSpuDO::getStock, 0);
-        }
-        // 警戒库存
-        if (ObjectUtil.equals(ProductSpuPageReqVO.ALERT_STOCK, tabType)) {
-            query.le(ProductSpuDO::getStock, ProductConstants.ALERT_STOCK)
-                    // 如果库存触发警戒库存且状态为回收站的话则不在警戒库存列表展示
-                    .notIn(ProductSpuDO::getStatus, ProductSpuStatusEnum.RECYCLE.getStatus());
-        }
         // 回收站
         if (ObjectUtil.equals(ProductSpuPageReqVO.RECYCLE_BIN, tabType)) {
             query.eqIfPresent(ProductSpuDO::getStatus, ProductSpuStatusEnum.RECYCLE.getStatus());

foodnexus-module-mall/foodnexus-module-product/src/main/java/cn/iocoder/foodnexus/module/product/service/spu/ProductSpuService.java

@@ -119,13 +119,6 @@ public interface ProductSpuService {
     void updateSpuStatus(ProductSpuUpdateStatusReqVO updateReqVO);
 
     /**
-     * 获取 SPU 列表标签对应的 Count 数量
-     *
-     * @return Count 数量
-     */
-    Map<Integer, Long> getTabsCount();
-
-    /**
      * 通过分类 categoryId 查询 SPU 个数
      *
      * @param categoryId 分类 categoryId

foodnexus-module-mall/foodnexus-module-product/src/main/java/cn/iocoder/foodnexus/module/product/service/spu/ProductSpuServiceImpl.java

@@ -240,27 +240,6 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     }
 
     @Override
-    public Map<Integer, Long> getTabsCount() {
-        Map<Integer, Long> counts = Maps.newLinkedHashMapWithExpectedSize(5);
-        // 查询销售中的商品数量
-        counts.put(ProductSpuPageReqVO.FOR_SALE,
-                productSpuMapper.selectCount(ProductSpuDO::getStatus, ProductSpuStatusEnum.ENABLE.getStatus()));
-        // 查询仓库中的商品数量
-        counts.put(ProductSpuPageReqVO.IN_WAREHOUSE,
-                productSpuMapper.selectCount(ProductSpuDO::getStatus, ProductSpuStatusEnum.DISABLE.getStatus()));
-        // 查询售空的商品数量
-        counts.put(ProductSpuPageReqVO.SOLD_OUT,
-                productSpuMapper.selectCount(ProductSpuDO::getStock, 0));
-        // 查询触发警戒库存的商品数量
-        counts.put(ProductSpuPageReqVO.ALERT_STOCK,
-                productSpuMapper.selectCount());
-        // 查询回收站中的商品数量
-        counts.put(ProductSpuPageReqVO.RECYCLE_BIN,
-                productSpuMapper.selectCount(ProductSpuDO::getStatus, ProductSpuStatusEnum.RECYCLE.getStatus()));
-        return counts;
-    }
-
-    @Override
     public Long getSpuCountByCategoryId(Long categoryId) {
         return productSpuMapper.selectCount(ProductSpuDO::getCategoryId, categoryId);
     }