From 53273743a9154370adaedfa67c4eb5996dbe4cd1 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 18 Sep 2025 16:15:39 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=95=86=E5=9F=8E=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=BA=93=E5=AD=98=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/StoreProductStockController.java | 7 ++ .../StoreProdWebsiteStockPageVO.java | 22 ++++++ .../StoreProdStockWebsitePageResDTO.java | 67 +++++++++++++++++++ .../StoreProdWebsiteStockPageDTO.java | 22 ++++++ .../xkt/mapper/StoreProductStockMapper.java | 16 +++-- .../service/IStoreProductStockService.java | 9 +++ .../impl/StoreProductStockServiceImpl.java | 17 +++++ .../mapper/StoreProductStockMapper.xml | 42 ++++++++++++ 8 files changed, 198 insertions(+), 4 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdWebsiteStockPageVO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockWebsitePageResDTO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdWebsiteStockPageDTO.java 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 ac153a2f2..afb4fad48 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 @@ -52,6 +52,13 @@ public class StoreProductStockController extends XktBaseController { return R.ok(storeProdStockService.selectPage(BeanUtil.toBean(pageVO, StoreProdStockPageDTO.class))); } + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") + @ApiOperation(value = "商城首页库存查询", httpMethod = "POST", response = R.class) + @PostMapping("/website/page") + public R> selectWebsitePage(@Validated @RequestBody StoreProdWebsiteStockPageVO websitePageVO) { + return R.ok(storeProdStockService.selectWebsitePage(BeanUtil.toBean(websitePageVO, StoreProdWebsiteStockPageDTO.class))); + } + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") @ApiOperation(value = "档口商品库存清零", httpMethod = "PUT", response = R.class) @Log(title = "档口商品库存清零", businessType = BusinessType.UPDATE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdWebsiteStockPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdWebsiteStockPageVO.java new file mode 100644 index 000000000..950e55d43 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProdStock/StoreProdWebsiteStockPageVO.java @@ -0,0 +1,22 @@ +package com.ruoyi.web.controller.xkt.vo.storeProdStock; + +import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author liujiang + * @version v1.0 + * @date 2025/3/27 15:12 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel +public class StoreProdWebsiteStockPageVO extends BasePageVO { + + @ApiModelProperty(value = "商品货号") + private String prodArtNum; + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockWebsitePageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockWebsitePageResDTO.java new file mode 100644 index 000000000..56de6c9bf --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdStockWebsitePageResDTO.java @@ -0,0 +1,67 @@ +package com.ruoyi.xkt.dto.storeProductStock; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + * @author liujiang + * @version v1.0 + * @date 2025/3/27 15:12 + */ +@ApiModel +@Data +@Accessors(chain = true) +public class StoreProdStockWebsitePageResDTO { + + @ApiModelProperty(value = "档口商品库存ID") + private Long storeProdStockId; + @ApiModelProperty(value = "档口ID") + private Long storeId; + @ApiModelProperty(value = "档口名称") + private String storeName; + @ApiModelProperty(value = "档口商品ID") + private Long storeProdId; + @ApiModelProperty(value = "档口商品主图url") + private String mainPicUrl; + @ApiModelProperty(value = "商品货号") + private String prodArtNum; + @ApiModelProperty(value = "颜色名称") + private String colorName; + @ApiModelProperty(value = "商品价格") + private BigDecimal price; + @ApiModelProperty(value = "尺码30") + private Integer size30; + @ApiModelProperty(value = "尺码31") + private Integer size31; + @ApiModelProperty(value = "尺码32") + private Integer size32; + @ApiModelProperty(value = "尺码33") + private Integer size33; + @ApiModelProperty(value = "尺码34") + private Integer size34; + @ApiModelProperty(value = "尺码35") + private Integer size35; + @ApiModelProperty(value = "尺码36") + private Integer size36; + @ApiModelProperty(value = "尺码37") + private Integer size37; + @ApiModelProperty(value = "尺码38") + private Integer size38; + @ApiModelProperty(value = "尺码39") + private Integer size39; + @ApiModelProperty(value = "尺码40") + private Integer size40; + @ApiModelProperty(value = "尺码41") + private Integer size41; + @ApiModelProperty(value = "尺码42") + private Integer size42; + @ApiModelProperty(value = "尺码43") + private Integer size43; + @ApiModelProperty(value = "总数量") + private Integer totalStock; + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdWebsiteStockPageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdWebsiteStockPageDTO.java new file mode 100644 index 000000000..f0f9865cc --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductStock/StoreProdWebsiteStockPageDTO.java @@ -0,0 +1,22 @@ +package com.ruoyi.xkt.dto.storeProductStock; + +import com.ruoyi.xkt.dto.BasePageDTO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author liujiang + * @version v1.0 + * @date 2025/3/27 15:12 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel +public class StoreProdWebsiteStockPageDTO extends BasePageDTO { + + @ApiModelProperty(value = "商品货号") + private String prodArtNum; + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStockMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStockMapper.java index e50e05ecf..c140cff9e 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStockMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStockMapper.java @@ -3,10 +3,7 @@ package com.ruoyi.xkt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xkt.domain.StoreProductStock; import com.ruoyi.xkt.dto.dailyStoreTag.DailyStoreTagDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockAppPageResDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockDownloadDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageDTO; -import com.ruoyi.xkt.dto.storeProductStock.StoreProdStockPageResDTO; +import com.ruoyi.xkt.dto.storeProductStock.*; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -19,6 +16,7 @@ import java.util.List; * @date 2025-03-26 */ public interface StoreProductStockMapper extends BaseMapper { + /** * 档口商品库存分页查询 * @@ -29,6 +27,7 @@ public interface StoreProductStockMapper extends BaseMapper { /** * 查询APP库存列表 + * * @param pageDTO 入参 * @return List */ @@ -57,4 +56,13 @@ public interface StoreProductStockMapper extends BaseMapper { * @return List */ List selectAllStockList(); + + /** + * 筛选商城库存列表 + * + * @param pageDTO 入参 + * @return List + */ + List selectWebsitePage(StoreProdWebsiteStockPageDTO pageDTO); + } 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 58965562d..0d778a182 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductStockService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductStockService.java @@ -106,4 +106,13 @@ public interface IStoreProductStockService { * @return List */ Page selectAppPage(StoreProdStockPageDTO pageDTO); + + /** + * 商城首页库存查询 + * + * @param pageDTO 查询入参 + * @return Page + */ + Page selectWebsitePage(StoreProdWebsiteStockPageDTO pageDTO); + } 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 7a343efa4..4b6a2f4ac 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 @@ -73,6 +73,23 @@ public class StoreProductStockServiceImpl implements IStoreProductStockService { return Page.convert(new PageInfo<>(stockList)); } + /** + * 商城首页库存查询 + * + * @param pageDTO 查询入参 + * @return Page + */ + @Override + @Transactional(readOnly = true) + public Page selectWebsitePage(StoreProdWebsiteStockPageDTO pageDTO) { + PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize()); + List stockList = this.storeProdStockMapper.selectWebsitePage(pageDTO); + if (CollectionUtils.isEmpty(stockList)) { + return Page.empty(pageDTO.getPageSize(), pageDTO.getPageNum()); + } + return CollectionUtils.isEmpty(stockList) ? Page.empty(pageDTO.getPageSize(), pageDTO.getPageNum()) : Page.convert(new PageInfo<>(stockList)); + } + @Override @Transactional(readOnly = true) public Page selectPage(StoreProdStockPageDTO pageDTO) { diff --git a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml index 6ac3effc0..300191e79 100644 --- a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml @@ -154,5 +154,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sps.del_flag = 0 + + \ No newline at end of file