From d0a1a0bca16989717fff3e594bf51be9f14dd8a6 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Tue, 11 Nov 2025 16:05:05 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=95=86=E5=93=81=E9=A2=9C=E8=89=B2=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/StoreProductColorController.java | 11 ++++---- .../StoreProductColorFuzzyPageVO.java | 27 +++++++++++++++++++ .../StoreProductColorFuzzyPageDTO.java | 24 +++++++++++++++++ .../xkt/mapper/StoreProductColorMapper.java | 9 +++---- .../service/IStoreProductColorService.java | 6 ++--- .../impl/StoreProductColorServiceImpl.java | 8 +++--- 6 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProductColorFuzzyPageVO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColor/StoreProductColorFuzzyPageDTO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java index ff641d5e6..0961a5e4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java @@ -5,6 +5,8 @@ import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.web.controller.xkt.vo.storePordColor.StoreProdColorResVO; import com.ruoyi.web.controller.xkt.vo.storePordColor.StoreProdColorSnResVO; +import com.ruoyi.web.controller.xkt.vo.storePordColor.StoreProductColorFuzzyPageVO; +import com.ruoyi.xkt.dto.storeProdColor.StoreProductColorFuzzyPageDTO; import com.ruoyi.xkt.service.IStoreProductColorService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,11 +29,10 @@ public class StoreProductColorController extends XktBaseController { final IStoreProductColorService storeProdColorService; - @ApiOperation(value = "模糊查询档口所有的商品颜色分类", httpMethod = "GET", response = R.class) - @GetMapping(value = "/fuzzy") - public R> fuzzyQueryColorList(@RequestParam(value = "prodArtNum", required = false) String prodArtNum, - @RequestParam("storeId") Long storeId) { - return success(BeanUtil.copyToList(storeProdColorService.fuzzyQueryColorList(storeId, prodArtNum), StoreProdColorResVO.class)); + @ApiOperation(value = "模糊查询档口所有的商品颜色分类", httpMethod = "POST", response = R.class) + @PostMapping(value = "/fuzzy") + public R> fuzzyQueryColorList(@RequestBody StoreProductColorFuzzyPageVO pageVO) { + return success(BeanUtil.copyToList(storeProdColorService.fuzzyQueryColorList(BeanUtil.toBean(pageVO, StoreProductColorFuzzyPageDTO.class)), StoreProdColorResVO.class)); } @ApiOperation(value = "根据商品ID查询颜色及已设置颜色条码", httpMethod = "GET", response = R.class) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProductColorFuzzyPageVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProductColorFuzzyPageVO.java new file mode 100644 index 000000000..f47f0673e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProductColorFuzzyPageVO.java @@ -0,0 +1,27 @@ +package com.ruoyi.web.controller.xkt.vo.storePordColor; + +import com.ruoyi.web.controller.xkt.vo.BasePageVO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; + +/** + * @author liujiang + * @version v1.0 + * @date 2025/3/27 15:12 + */ +@EqualsAndHashCode(callSuper = true) +@ApiModel +@Data +public class StoreProductColorFuzzyPageVO extends BasePageVO { + + @NotNull(message = "storeId不能为空") + @ApiModelProperty(value = "档口ID", required = true) + private Long storeId; + @ApiModelProperty(value = "商品货号") + private String prodArtNum; + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColor/StoreProductColorFuzzyPageDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColor/StoreProductColorFuzzyPageDTO.java new file mode 100644 index 000000000..c57934324 --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColor/StoreProductColorFuzzyPageDTO.java @@ -0,0 +1,24 @@ +package com.ruoyi.xkt.dto.storeProdColor; + +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) +@ApiModel +@Data +public class StoreProductColorFuzzyPageDTO extends BasePageDTO { + + @ApiModelProperty(value = "档口ID") + private Long storeId; + @ApiModelProperty(value = "商品货号") + private String prodArtNum; + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java index 443b89f45..5bb29364d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xkt.domain.StoreProductColor; import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorDTO; import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorResDTO; +import com.ruoyi.xkt.dto.storeProdColor.StoreProductColorFuzzyPageDTO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPricePageDTO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPriceResDTO; import com.ruoyi.xkt.dto.storeProduct.StoreProdPageDTO; @@ -12,7 +13,6 @@ import com.ruoyi.xkt.dto.storeProduct.StoreProdStatusCountResDTO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.util.Date; import java.util.List; /** @@ -50,11 +50,10 @@ public interface StoreProductColorMapper extends BaseMapper { /** * 输入商品货号模糊查询颜色分类 * - * @param storeId 档口ID - * @param prodArtNum 商品货号 + * @param pageDTO 查询入参 * @return List */ - List fuzzyQueryColorList(@Param("storeId") Long storeId, @Param("prodArtNum") String prodArtNum); + List fuzzyQueryColorList(StoreProductColorFuzzyPageDTO pageDTO); /** * 获取商品颜色价格列表 @@ -76,7 +75,7 @@ public interface StoreProductColorMapper extends BaseMapper { /** * 获取档口各个状态的数量 * - * @param storeId 档口ID + * @param storeId 档口ID * @return StoreProdStatusCountResDTO */ StoreProdStatusCountResDTO getStatusNum(@Param("storeId") Long storeId); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductColorService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductColorService.java index 4ceb72b8c..0694a59b0 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductColorService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductColorService.java @@ -3,6 +3,7 @@ package com.ruoyi.xkt.service; import com.ruoyi.common.core.page.Page; import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorResDTO; import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorSnResDTO; +import com.ruoyi.xkt.dto.storeProdColor.StoreProductColorFuzzyPageDTO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPricePageDTO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPriceResDTO; @@ -18,11 +19,10 @@ public interface IStoreProductColorService { /** * 根据商店ID和产品款式编号模糊查询颜色列表 * - * @param storeId 商店ID，用于限定查询范围 - * @param prodArtNum 产品款式编号，用于模糊匹配产品 + * @param pageDTO 查询入参 * @return 返回一个列表，包含匹配的产品颜色信息 */ - List fuzzyQueryColorList(Long storeId, String prodArtNum); + List fuzzyQueryColorList(StoreProductColorFuzzyPageDTO pageDTO); /** * 获取档口某个商品所有颜色对应的价格等 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductColorServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductColorServiceImpl.java index 192958a94..171c86cb2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductColorServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductColorServiceImpl.java @@ -12,6 +12,7 @@ import com.ruoyi.xkt.domain.StoreProductColor; import com.ruoyi.xkt.domain.StoreProductColorSize; import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorResDTO; import com.ruoyi.xkt.dto.storeProdColor.StoreProdColorSnResDTO; +import com.ruoyi.xkt.dto.storeProdColor.StoreProductColorFuzzyPageDTO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPricePageDTO; import com.ruoyi.xkt.dto.storeProdColorPrice.StoreProdColorPriceResDTO; import com.ruoyi.xkt.mapper.StoreProductColorMapper; @@ -45,14 +46,13 @@ public class StoreProductColorServiceImpl implements IStoreProductColorService { /** * 根据商店ID和产品款式编号模糊查询颜色列表 * - * @param storeId 商店ID，用于限定查询范围 - * @param prodArtNum 产品款式编号，用于模糊匹配产品 + * @param pageDTO 查询入参 * @return 返回一个列表，包含匹配的产品颜色信息 */ @Override @Transactional(readOnly = true) - public List fuzzyQueryColorList(Long storeId, String prodArtNum) { - return storeProdColorMapper.fuzzyQueryColorList(storeId, prodArtNum); + public List fuzzyQueryColorList(StoreProductColorFuzzyPageDTO pageDTO) { + return storeProdColorMapper.fuzzyQueryColorList(pageDTO); } /**