BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：模糊查询商品颜色改为分页查询；

pull/1121/head
liujiang 2025-11-11 16:05:05 +08:00
parent 1cec83a8db
commit d0a1a0bca1
6 changed files with 68 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductColorController.java
View File

@ -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<List<StoreProdColorResVO>> 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<List<StoreProdColorResVO>> 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)

27
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storePordColor/StoreProductColorFuzzyPageVO.java 100644
View File

@ -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;
}

24
xkt/src/main/java/com/ruoyi/xkt/dto/storeProdColor/StoreProductColorFuzzyPageDTO.java 100644
View File

@ -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;
}

9
xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorMapper.java
View File

@ -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<StoreProductColor> {
/**
* 输入商品货号模糊查询颜色分类
*
* @param storeId 档口ID
* @param prodArtNum 商品货号
* @param pageDTO 查询入参
* @return List<StoreProdColorResDTO>
*/
List<StoreProdColorResDTO> fuzzyQueryColorList(@Param("storeId") Long storeId, @Param("prodArtNum") String prodArtNum);
List<StoreProdColorResDTO> fuzzyQueryColorList(StoreProductColorFuzzyPageDTO pageDTO);
/**
* 获取商品颜色价格列表
@ -76,7 +75,7 @@ public interface StoreProductColorMapper extends BaseMapper<StoreProductColor> {
/**
* 获取档口各个状态的数量
*
* @param storeId 档口ID
* @param storeId 档口ID
* @return StoreProdStatusCountResDTO
*/
StoreProdStatusCountResDTO getStatusNum(@Param("storeId") Long storeId);

6
xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductColorService.java
View File

@ -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<StoreProdColorResDTO> fuzzyQueryColorList(Long storeId, String prodArtNum);
List<StoreProdColorResDTO> fuzzyQueryColorList(StoreProductColorFuzzyPageDTO pageDTO);
/**
* 获取档口某个商品所有颜色对应的价格等

8
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductColorServiceImpl.java
View File

@ -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<StoreProdColorResDTO> fuzzyQueryColorList(Long storeId, String prodArtNum) {
return storeProdColorMapper.fuzzyQueryColorList(storeId, prodArtNum);
public List<StoreProdColorResDTO> fuzzyQueryColorList(StoreProductColorFuzzyPageDTO pageDTO) {
return storeProdColorMapper.fuzzyQueryColorList(pageDTO);
}
/**