diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java index 2899849f8..54fd4e0fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java @@ -6,9 +6,11 @@ import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.web.controller.xkt.vo.storeProdStock.StoreProdStockClearZeroVO; import com.ruoyi.web.controller.xkt.vo.storeProdStock.StoreProdStockPageVO; import com.ruoyi.web.controller.xkt.vo.storeProdStock.StoreProdStockResVO; import com.ruoyi.web.controller.xkt.vo.storeProdStock.StoreProdStockVO; +import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockClearZeroDTO; import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockDTO; import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageDTO; import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageResDTO; @@ -63,9 +65,9 @@ public class StoreProductStockController extends XktBaseController { // @PreAuthorize("@ss.hasPermi('system:stock:edit')") @ApiOperation(value = "档口商品库存清零", httpMethod = "PUT", response = R.class) @Log(title = "档口商品库存清零", businessType = BusinessType.UPDATE) - @PutMapping("/clear-zero/{storeId}/{storeProdStockId}") - public R clearStockToZero(@PathVariable("storeId") Long storeId, @PathVariable("storeProdStockId") Long storeProdStockId) { - return R.ok(storeProdStockService.clearStockToZero(storeId, storeProdStockId)); + @PutMapping("/clear-zero") + public R clearStockToZero(@Validated @RequestBody StoreProdStockClearZeroVO clearZeroVO) { + return R.ok(storeProdStockService.clearStockToZero(BeanUtil.toBean(clearZeroVO, StoreProdStockClearZeroDTO.class))); } /** @@ -75,7 +77,7 @@ public class StoreProductStockController extends XktBaseController { @ApiOperation(value = "直接调整档口商品库存值", httpMethod = "PUT", response = R.class) @Log(title = "直接调整档口商品库存值", businessType = BusinessType.UPDATE) @PutMapping("/update-stock/{storeId}") - public R updateStock(@PathVariable("storeId") Long storeId, @RequestBody StoreProdStockVO prodStockVO) { + public R updateStock(@PathVariable("storeId") Long storeId,@Validated @RequestBody StoreProdStockVO prodStockVO) { return R.ok(storeProdStockService.updateStock(storeId, Collections.singletonList(BeanUtil.toBean(prodStockVO, StoreProdStockDTO.class)), 0)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockClearZeroVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockClearZeroVO.java new file mode 100644 index 000000000..9ed6048ae --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockClearZeroVO.java @@ -0,0 +1,26 @@ +package com.ruoyi.web.controller.xkt.vo.storeProdStock; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @author liujiang + * @version v1.0 + * @date 2025/3/27 15:12 + */ +@ApiModel("档口库存清零") +@Data +public class StoreProdStockClearZeroVO { + + @ApiModelProperty(value = "档口ID", required = true) + @NotNull(message = "档口ID不能为空") + private Long storeId; + @NotNull(message = "商品库存ID列表不能为空") + @ApiModelProperty(value = "商品货号") + private List storeProdStockIdList; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockResVO.java index 20e190750..6698243fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockResVO.java @@ -23,6 +23,10 @@ public class StoreProdStockResVO { private String mainPicUrl; @ApiModelProperty(value = "商品货号") private String prodArtNum; + @ApiModelProperty(value = "档口商品颜色ID") + private Long storeProdColorId; + @ApiModelProperty(value = "档口颜色ID") + private Long storeColorId; @ApiModelProperty(value = "颜色名称") private String colorName; @ApiModelProperty(value = "分类类目") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockVO.java index 2298cbda3..a89d5748a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdStockVO.java @@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * @author liujiang * @version v1.0 @@ -15,8 +18,20 @@ import lombok.Data; @JsonInclude(JsonInclude.Include.NON_NULL) public class StoreProdStockVO { + @NotNull(message = "档口商品库存ID不能为空") @ApiModelProperty(value = "档口商品库存ID") private Long storeProdStockId; + @NotNull(message = "档口商品ID不能为空") + @ApiModelProperty(value = "档口商品ID") + private Long storeProdId; + @NotBlank(message = "商品货号不能为空") + @ApiModelProperty(value = "商品货号") + private String prodArtNum; + @NotNull(message = "档口商品颜色ID不能为空") + @ApiModelProperty(value = "档口商品颜色ID") + private Long storeProdColorId; + @ApiModelProperty(value = "档口颜色ID") + private Long storeColorId; @ApiModelProperty(value = "颜色名称") private String colorName; @ApiModelProperty(value = "尺码30") diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AdType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/AdType.java index 592239952..b22485e88 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AdType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/AdType.java @@ -39,14 +39,11 @@ public enum AdType { // 首页两侧固定挂耳 PC_HOME_FIXED_EAR(12, "首页两侧固定挂耳", "/url"), // 首页搜索框下名称 - PC_HOME_SEARCH_DOWN_NAME(13, "首页搜索框下名称", "/url"), - // 首页搜索框商品 - PC_HOME_SEARCH_PRODUCT(14, "首页搜索框商品", "/url"), - // 首页搜索框档口 - PC_HOME_SEARCH_STORE(15, "首页搜索框档口", "/url"), - // 首页以图搜款商品 - PC_HOME_PIC_SEARCH_PRODUCT(16, "首页以图搜款商品", "/url"), - + PC_HOME_SEARCH_DOWN_NAME(13, "首页搜索框下档口名称", "/url"), + // 首页搜索框中推荐商品 + PC_HOME_SEARCH_PRODUCT(14, "首页搜索框中推荐商品", "/url"), + // 首页以图搜款框商品、以图搜款结果商品、点击以图搜款界面 + PC_HOME_PIC_SEARCH_PRODUCT(15, "首页以图搜款商品", "/url"), // 新品馆顶部横向大图 diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockClearZeroDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockClearZeroDTO.java new file mode 100644 index 000000000..db2aa282e --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockClearZeroDTO.java @@ -0,0 +1,24 @@ +package com.ruoyi.xkt.dto.storeProductStock; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @author liujiang + * @version v1.0 + * @date 2025/3/27 15:12 + */ +@ApiModel("档口库存清零") +@Data +public class StoreProdStockClearZeroDTO { + + @NotNull(message = "档口ID不能为空") + private Long storeId; + @ApiModelProperty(value = "商品货号") + private List storeProdStockIdList; + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockPageResDTO.java index 45e2a8447..25f8ccb2a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockPageResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockPageResDTO.java @@ -23,6 +23,10 @@ public class StoreProdStockPageResDTO { private String mainPicUrl; @ApiModelProperty(value = "商品货号") private String prodArtNum; + @ApiModelProperty(value = "档口商品颜色ID") + private Long storeProdColorId; + @ApiModelProperty(value = "档口颜色ID") + private Long storeColorId; @ApiModelProperty(value = "颜色名称") private String colorName; @ApiModelProperty(value = "分类类目") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockResDTO.java index 54d9e3155..f8ad84295 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockResDTO.java @@ -23,6 +23,10 @@ public class StoreProdStockResDTO { private String mainPicUrl; @ApiModelProperty(value = "商品货号") private String prodArtNum; + @ApiModelProperty(value = "档口商品颜色ID") + private Long storeProdColorId; + @ApiModelProperty(value = "档口颜色ID") + private Long storeColorId; @ApiModelProperty(value = "颜色名称") private String colorName; @ApiModelProperty(value = "分类类目") diff --git a/xkt/src/main/java/com/ruoyi/xkt/enums/AdDisplayType.java b/xkt/src/main/java/com/ruoyi/xkt/enums/AdDisplayType.java index 1b6113299..7a6ff4c0d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/enums/AdDisplayType.java +++ b/xkt/src/main/java/com/ruoyi/xkt/enums/AdDisplayType.java @@ -21,6 +21,8 @@ public enum AdDisplayType { PRODUCT(2, "商品"), // 图和商品 PIC_AND_PROD(3, "图和商品"), + // 档口名称 + STORE_NAME(4, "档口名称"), ; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IAdvertRoundService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IAdvertRoundService.java index f01621d92..afa065907 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IAdvertRoundService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IAdvertRoundService.java @@ -44,8 +44,6 @@ public interface IAdvertRoundService { */ void initAdvertLockMap(); - void test(); - /** * 每晚11:30更新广告位轮次状态 将biddingTempStatus赋值给biddingStatus * diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductStockService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductStockService.java index b125116fb..0f7dfd195 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductStockService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductStockService.java @@ -2,10 +2,7 @@ package com.ruoyi.xkt.service; import com.ruoyi.common.core.page.Page; import com.ruoyi.xkt.domain.StoreProductStock; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageResDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockResDTO; +import com.ruoyi.xkt.dto.storeProductStock.*; import java.util.List; @@ -23,47 +20,7 @@ public interface IStoreProductStockService { * @param storeProdStockId 档口商品库存主键 * @return 档口商品库存 */ - public StoreProdStockResDTO selectByStoreProdStockId(Long storeId, Long storeProdStockId); - - /** - * 查询档口商品库存列表 - * - * @param storeProductStock 档口商品库存 - * @return 档口商品库存集合 - */ - public List selectStoreProductStockList(StoreProductStock storeProductStock); - - /** - * 新增档口商品库存 - * - * @param storeProductStock 档口商品库存 - * @return 结果 - */ - public int insertStoreProductStock(StoreProductStock storeProductStock); - - /** - * 修改档口商品库存 - * - * @param storeProductStock 档口商品库存 - * @return 结果 - */ - public int updateStoreProductStock(StoreProductStock storeProductStock); - - /** - * 批量删除档口商品库存 - * - * @param storeProdStockIds 需要删除的档口商品库存主键集合 - * @return 结果 - */ - public int deleteStoreProductStockByStoreProdStockIds(Long[] storeProdStockIds); - - /** - * 删除档口商品库存信息 - * - * @param storeProdStockId 档口商品库存主键 - * @return 结果 - */ - public int deleteStoreProductStockByStoreProdStockId(Long storeProdStockId); + StoreProdStockResDTO selectByStoreProdStockId(Long storeId, Long storeProdStockId); /** * 增加库存 @@ -86,11 +43,10 @@ public interface IStoreProductStockService { /** * 清空库存 * - * @param storeId 档口ID - * @param storeProdStockId 清空库存 + * @param clearZeroDTO 清空库存dto * @return int */ - int clearStockToZero(Long storeId, Long storeProdStockId); + int clearStockToZero(StoreProdStockClearZeroDTO clearZeroDTO); /** * 直接调整库存 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java index 4d75de8da..791e9352b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java @@ -380,10 +380,10 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { .setSysIntercept(AdSysInterceptType.UN_INTERCEPT.getValue()) .setStoreId(createDTO.getStoreId()).setPayPrice(createDTO.getPayPrice()).setVoucherDate(java.sql.Date.valueOf(LocalDate.now())) .setBiddingStatus(AdBiddingStatus.BIDDING.getValue()).setBiddingTempStatus(AdBiddingStatus.BIDDING_SUCCESS.getValue()) - .setPicSetType(!Objects.equals(minPriceAdvert.getDisplayType(), AdDisplayType.PRODUCT.getValue()) ? AdPicSetType.UN_SET.getValue() : null) - .setPicAuditStatus(!Objects.equals(minPriceAdvert.getDisplayType(), AdDisplayType.PRODUCT.getValue()) ? AdPicAuditStatus.UN_AUDIT.getValue() : null) - .setPicDesignType(!Objects.equals(minPriceAdvert.getDisplayType(), AdDisplayType.PRODUCT.getValue()) ? createDTO.getPicDesignType() : null) - .setPicAuditStatus(!Objects.equals(minPriceAdvert.getDisplayType(), AdDisplayType.PRODUCT.getValue()) ? AdPicAuditStatus.UN_AUDIT.getValue() : null) + .setPicSetType(this.hasPic(minPriceAdvert.getDisplayType()) ? AdPicSetType.UN_SET.getValue() : null) + .setPicAuditStatus(this.hasPic(minPriceAdvert.getDisplayType()) ? AdPicAuditStatus.UN_AUDIT.getValue() : null) + .setPicDesignType(this.hasPic(minPriceAdvert.getDisplayType()) ? createDTO.getPicDesignType() : null) + .setPicAuditStatus(this.hasPic(minPriceAdvert.getDisplayType()) ? AdPicAuditStatus.UN_AUDIT.getValue() : null) .setProdIdStr(createDTO.getProdIdStr()); this.advertRoundMapper.updateById(minPriceAdvert); // 扣除推广费 @@ -392,6 +392,8 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { return 1; } + + /** * 档口已订购推广列表 * @@ -829,4 +831,13 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { return prefix + middle + suffix; } + /** + * 判断当前推广类型是否为 推广图 或者 图及商品类型 + * @param displayType 推广类型 + * @return true 是 false 不是 + */ + private boolean hasPic(Integer displayType) { + return Objects.equals(displayType, AdDisplayType.PICTURE.getValue()) || Objects.equals(displayType, AdDisplayType.PIC_AND_PROD.getValue()); + } + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertServiceImpl.java index fff0c9bee..d9a88678f 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertServiceImpl.java @@ -67,7 +67,8 @@ public class AdvertServiceImpl implements IAdvertService { advert.setOnlineStatus(AdOnlineStatus.ONLINE.getValue()); // 推广类型为 推广图 或者 图及商品 则新增系统文件 - if (!Objects.equals(createDTO.getDisplayType(), AdDisplayType.PRODUCT.getValue()) && ObjectUtils.isNotEmpty(createDTO.getExample())) { + if ((Objects.equals(createDTO.getDisplayType(), AdDisplayType.PICTURE.getValue()) || Objects.equals(createDTO.getDisplayType(), AdDisplayType.PIC_AND_PROD.getValue())) + && ObjectUtils.isNotEmpty(createDTO.getExample())) { // 将文件插入到SysFile表中 SysFile file = BeanUtil.toBean(createDTO.getExample(), SysFile.class); this.fileMapper.insert(file); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java index ab41529f3..ecc8ab15b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStockServiceImpl.java @@ -8,15 +8,11 @@ import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.DateUtils; import com.ruoyi.xkt.domain.StoreProductFile; import com.ruoyi.xkt.domain.StoreProductStock; import com.ruoyi.xkt.domain.SysFile; import com.ruoyi.xkt.dto.storeProductFile.StoreProdMainPicDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageResDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockResDTO; +import com.ruoyi.xkt.dto.storeProductStock.*; import com.ruoyi.xkt.enums.FileType; import com.ruoyi.xkt.mapper.StoreProductFileMapper; import com.ruoyi.xkt.mapper.StoreProductStockMapper; @@ -138,19 +134,19 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService { /** * 清空库存 * - * @param storeId 档口ID - * @param storeProdStockId 清空库存 + * @param clearZeroDTO 清空库存入参 * @return int */ @Override @Transactional - public int clearStockToZero(Long storeId, Long storeProdStockId) { - StoreProductStock stock = Optional.ofNullable(this.storeProdStockMapper.selectOne(new LambdaQueryWrapper() - .eq(StoreProductStock::getId, storeProdStockId).eq(StoreProductStock::getStoreId, storeId).eq(StoreProductStock::getDelFlag, Constants.UNDELETED))) + public int clearStockToZero(StoreProdStockClearZeroDTO clearZeroDTO) { + List stockList = Optional.ofNullable(this.storeProdStockMapper.selectList(new LambdaQueryWrapper() + .eq(StoreProductStock::getStoreId, clearZeroDTO.getStoreId()).eq(StoreProductStock::getDelFlag, Constants.UNDELETED) + .in(StoreProductStock::getId, clearZeroDTO.getStoreProdStockIdList()))) .orElseThrow(() -> new ServiceException("档口商品库存不存在!", HttpStatus.ERROR)); - stock.setSize30(0).setSize31(0).setSize32(0).setSize33(0).setSize34(0).setSize35(0).setSize36(0).setSize37(0) - .setSize38(0).setSize39(0).setSize40(0).setSize41(0).setSize42(0).setSize43(0); - return this.storeProdStockMapper.updateById(stock); + stockList.forEach(stock -> stock.setSize30(0).setSize31(0).setSize32(0).setSize33(0).setSize34(0).setSize35(0).setSize36(0).setSize37(0) + .setSize38(0).setSize39(0).setSize40(0).setSize41(0).setSize42(0).setSize43(0)); + return this.storeProdStockMapper.updateById(stockList).size(); } @@ -256,69 +252,6 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService { .setStoreProdStockId(stock.getId()).setMainPicUrl(file.getFileUrl()); } - /** - * 查询档口商品库存列表 - * - * @param storeProductStock 档口商品库存 - * @return 档口商品库存 - */ - @Override - @Transactional(readOnly = true) - public List selectStoreProductStockList(StoreProductStock storeProductStock) { - return storeProdStockMapper.selectStoreProductStockList(storeProductStock); - } - - /** - * 新增档口商品库存 - * - * @param storeProductStock 档口商品库存 - * @return 结果 - */ - @Override - @Transactional - public int insertStoreProductStock(StoreProductStock storeProductStock) { - storeProductStock.setCreateTime(DateUtils.getNowDate()); - return storeProdStockMapper.insertStoreProductStock(storeProductStock); - } - - /** - * 修改档口商品库存 - * - * @param storeProductStock 档口商品库存 - * @return 结果 - */ - @Override - @Transactional - public int updateStoreProductStock(StoreProductStock storeProductStock) { - storeProductStock.setUpdateTime(DateUtils.getNowDate()); - return storeProdStockMapper.updateStoreProductStock(storeProductStock); - } - - /** - * 批量删除档口商品库存 - * - * @param storeProdStockIds 需要删除的档口商品库存主键 - * @return 结果 - */ - @Override - @Transactional - public int deleteStoreProductStockByStoreProdStockIds(Long[] storeProdStockIds) { - return storeProdStockMapper.deleteStoreProductStockByStoreProdStockIds(storeProdStockIds); - } - - /** - * 删除档口商品库存信息 - * - * @param storeProdStockId 档口商品库存主键 - * @return 结果 - */ - @Override - @Transactional - public int deleteStoreProductStockByStoreProdStockId(Long storeProdStockId) { - return storeProdStockMapper.deleteStoreProductStockByStoreProdStockId(storeProdStockId); - } - - /** * 通过数量diff增减或扣减库存 * diff --git a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml index 3f1cef40c..25fb73cfd 100644 --- a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml @@ -156,21 +156,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"