diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java index 7379a1bd..eef998a6 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java @@ -164,9 +164,6 @@ public class GoodsSku extends BaseEntity { @ApiModelProperty(value = "商品类型", required = true) private String goodsType; - @ApiModelProperty(value = "预警数量") - private Integer alertQuantity; - public Double getWeight() { if (weight == null) { return 0d; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java index af30b339..2187c484 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java @@ -90,9 +90,6 @@ public class GoodsSearchParams extends PageVO { @ApiModelProperty(value = "销售模式", required = true) private String salesModel; - @ApiModelProperty(value = "预警库存") - private Boolean alertQuantity; - public QueryWrapper queryWrapper() { QueryWrapper queryWrapper = new QueryWrapper<>(); if (CharSequenceUtil.isNotEmpty(goodsId)) { @@ -137,9 +134,6 @@ public class GoodsSearchParams extends PageVO { if (recommend != null) { queryWrapper.le("recommend", recommend); } - if(alertQuantity != null && alertQuantity){ - queryWrapper.apply("quantity < alert_quantity"); - } if (CharSequenceUtil.isNotEmpty(goodsType)) { queryWrapper.eq("goods_type", goodsType); } diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java index cde8789d..97181f83 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java @@ -21,8 +21,5 @@ public class GoodsSkuStockDTO { @ApiModelProperty(value = "库存") private Integer quantity; - @ApiModelProperty(value = "预警库存") - private Integer alertQuantity; - } diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java index 8e2fcfef..f31091ce 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java @@ -188,8 +188,6 @@ public interface GoodsSkuService extends IService { */ void updateStocks(List goodsSkuStockDTOS); - void updateAlertQuantity(List goodsSkuStockDTOS); - /** * 更新SKU库存 * diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index cbd21a86..ee49c388 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -536,26 +536,6 @@ public class GoodsSkuServiceImpl extends ServiceImpl i } } - @Override - public void updateAlertQuantity(List goodsSkuStockDTOS) { - List goodsSkuList = new ArrayList<>(); - List skuIds = goodsSkuStockDTOS.stream().map(GoodsSkuStockDTO::getSkuId).collect(Collectors.toList()); - List goodsSkuStockList = this.baseMapper.queryStocks(GoodsSearchParams.builder().ids(skuIds).build().queryWrapper()); - List goodsIdList = goodsSkuStockList.stream().map(GoodsSkuStockDTO::getGoodsId).collect(Collectors.toList()); - HashSet uniqueSet = new HashSet<>(goodsIdList); - // 将去重后的元素转回列表 - List uniqueGoodsIdList = new ArrayList<>(uniqueSet); - for (String goodsId : uniqueGoodsIdList) { - cache.remove(CachePrefix.GOODS.getPrefix() + goodsId); - } - - for (GoodsSkuStockDTO goodsSkuStockDTO : goodsSkuStockDTOS) { - GoodsSku goodsSku = this.getById(goodsSkuStockDTO.getSkuId()); - goodsSku.setAlertQuantity(goodsSkuStockDTO.getAlertQuantity()); - goodsSkuList.add(goodsSku); - } - this.updateBatchById(goodsSkuList); - } @Override @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java b/framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java index c3a42ba2..f7fb9771 100644 --- a/framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java +++ b/framework/src/main/java/cn/lili/modules/goods/sku/GoodsSkuBuilder.java @@ -64,7 +64,7 @@ public class GoodsSkuBuilder { Map specMap = new LinkedHashMap<>(); // 原始规格项 - String[] ignoreOriginKeys = {"id", "sn", "cost", "price", "quantity", "weight","alertQuantity"}; + String[] ignoreOriginKeys = {"id", "sn", "cost", "price", "quantity", "weight"}; //获取规格信息 for (Map.Entry spec : skuInfo.entrySet()) { //保存新增规格信息 @@ -91,7 +91,6 @@ public class GoodsSkuBuilder { goodsSku.setQuantity(Convert.toInt(skuInfo.get("quantity"), 0)); goodsSku.setSpecs(JSONUtil.toJsonStr(specMap)); goodsSku.setSimpleSpecs(simpleSpecs.toString()); - goodsSku.setAlertQuantity(Convert.toInt(skuInfo.get("alertQuantity"), 0)); } diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java index 20e30f0b..7e2639f7 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsService.java @@ -21,9 +21,6 @@ public interface GoodsStatisticsService extends IService { * @return 所有的已上架的商品数量 */ long goodsNum(GoodsStatusEnum goodsStatusEnum, GoodsAuthEnum goodsAuthEnum); - - long alertQuantityNum(); - /** * 获取今天的已上架的商品数量 * diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java index 67fd67aa..91242c63 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsServiceImpl.java @@ -52,17 +52,6 @@ public class GoodsStatisticsServiceImpl extends ServiceImpl queryWrapper = Wrappers.lambdaQuery(); diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java index a8861767..0ce96a9b 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java @@ -182,7 +182,6 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService { //商品总数量 storeIndexStatisticsVO.setGoodsNum(goodsStatisticsService.goodsNum(GoodsStatusEnum.UPPER, null)); -// storeIndexStatisticsVO.setAlertQuantityNum(goodsStatisticsService.alertQuantityNum()); //订单总数量、订单总金额 Map map = storeFlowStatisticsService.getOrderStatisticsPrice(); storeIndexStatisticsVO.setOrderNum(Convert.toInt(map.get("num").toString())); diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java index be4c580b..11d5b99a 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java @@ -93,8 +93,7 @@ public class GoodsStoreController { StoreDetail storeDetail = OperationalJudgment.judgment(storeDetailService.getStoreDetail(storeId)); Integer stockWarnNum = storeDetail.getStockWarning(); goodsSearchParams.setStoreId(storeId); -// goodsSearchParams.setLeQuantity(stockWarnNum); - goodsSearchParams.setAlertQuantity(true); + goodsSearchParams.setLeQuantity(stockWarnNum); goodsSearchParams.setMarketEnable(GoodsStatusEnum.UPPER.name()); IPage goodsSku = goodsSkuService.getGoodsSkuByPage(goodsSearchParams); StockWarningVO stockWarning = new StockWarningVO(stockWarnNum, goodsSku); @@ -182,22 +181,6 @@ public class GoodsStoreController { goodsSkuService.updateStocks(collect); return ResultUtil.success(); } - - @ApiOperation(value = "修改商品预警库存") - @PutMapping(value = "/update/alert/stocks", consumes = "application/json") - public ResultMessage updateAlertQuantity(@RequestBody List updateStockList) { - String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId(); - // 获取商品skuId集合 - List goodsSkuIds = updateStockList.stream().map(GoodsSkuStockDTO::getSkuId).collect(Collectors.toList()); - // 根据skuId集合查询商品信息 - List goodsSkuList = goodsSkuService.list(new LambdaQueryWrapper().in(GoodsSku::getId, goodsSkuIds).eq(GoodsSku::getStoreId, storeId)); - // 过滤不符合当前店铺的商品 - List filterGoodsSkuIds = goodsSkuList.stream().map(GoodsSku::getId).collect(Collectors.toList()); - List collect = updateStockList.stream().filter(i -> filterGoodsSkuIds.contains(i.getSkuId())).collect(Collectors.toList()); - goodsSkuService.updateAlertQuantity(collect); - return ResultUtil.success(); - } - @ApiOperation(value = "通过id获取商品信息") @ApiImplicitParams({ @ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "path"),