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：档口商品列表查询已删除数据bug修复；

pull/1121/head
liujiang 2025-09-18 11:42:02 +08:00
parent 2a502e23d4
commit ead90730d4
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPageDTO.java
View File

@ -26,5 +26,7 @@ public class StoreProdPageDTO extends BasePageDTO {
private Long storeId;
@ApiModelProperty(value = "商品状态")
private List<Integer> prodStatusList;
@ApiModelProperty(value = "删除标志")
private String delFlag;
}

13
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
View File

@ -171,6 +171,9 @@ public class StoreProductServiceImpl implements IStoreProductService {
if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(pageDTO.getStoreId())) {
throw new ServiceException("当前用户非档口管理者或子账号，无权限操作!", HttpStatus.ERROR);
}
// 如果是已删除状态，则只查询已删除数据
pageDTO.setDelFlag(pageDTO.getProdStatusList().stream().allMatch(x -> Objects.equals(x, EProductStatus.REMOVED.getValue()))
? Constants.DELETED : Constants.UNDELETED);
PageHelper.startPage(pageDTO.getPageNum(), pageDTO.getPageSize());
// 调用Mapper方法查询商店产品分页信息
List<StoreProdPageResDTO> prodList = storeProdColorMapper.selectStoreProdColorPage(pageDTO);
@ -371,7 +374,7 @@ public class StoreProductServiceImpl implements IStoreProductService {
}
// 新增的商品颜色
dbProdColorList.add(new StoreProductColor().setStoreColorId(updateProdColorId).setStoreProdId(storeProdId).setStoreId(storeId)
.setColorName(updateProdColorNameList.get(i)).setOrderNum(i+1).setProdStatus(EProductStatus.ON_SALE.getValue()));
.setColorName(updateProdColorNameList.get(i)).setOrderNum(i + 1).setProdStatus(EProductStatus.ON_SALE.getValue()));
}
// 更新商品颜色或新增商品颜色
this.storeProdColorMapper.insertOrUpdate(dbProdColorList);
@ -475,7 +478,7 @@ public class StoreProductServiceImpl implements IStoreProductService {
final List<String> prodColorNameList = createDTO.getSizeList().stream().map(StoreProdDTO.SPCSizeDTO::getColorName).distinct().collect(Collectors.toList());
for (int i = 0; i < prodColorNameList.size(); i++) {
prodColorList.add(new StoreProductColor().setStoreColorId(storeColorMap.get(prodColorNameList.get(i))).setStoreProdId(storeProdId)
.setStoreId(storeId).setColorName(prodColorNameList.get(i)).setOrderNum(i+1).setProdStatus(EProductStatus.ON_SALE.getValue()));
.setStoreId(storeId).setColorName(prodColorNameList.get(i)).setOrderNum(i + 1).setProdStatus(EProductStatus.ON_SALE.getValue()));
}
this.storeProdColorMapper.insert(prodColorList);
// 新增档口颜色尺码对应价格
@ -610,9 +613,9 @@ public class StoreProductServiceImpl implements IStoreProductService {
public List<PicPackSimpleDTO> prepareGetPicPackDownloadUrl(Long storeProductId) {
Assert.notNull(storeProductId);
List<StoreProductFile> productFiles = storeProdFileMapper.selectList(Wrappers.lambdaQuery(StoreProductFile.class)
.eq(StoreProductFile::getStoreProdId, storeProductId)
.in(StoreProductFile::getFileType, FileType.picPackValues())
.eq(XktBaseEntity::getDelFlag, UNDELETED));
.eq(StoreProductFile::getStoreProdId, storeProductId)
.in(StoreProductFile::getFileType, FileType.picPackValues())
.eq(XktBaseEntity::getDelFlag, UNDELETED));
if (CollUtil.isEmpty(productFiles)) {
return ListUtil.empty();
}

2
xkt/src/main/resources/mapper/StoreProductColorMapper.xml
View File

@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
JOIN store_product_file spf ON sp.id = spf.store_prod_id AND spf.file_type = 1 AND spf.order_num = 1 AND spf.del_flag = 0
JOIN sys_file sf ON spf.file_id = sf.id
WHERE
spc.del_flag = 0 AND spc.store_id = #{storeId}
spc.del_flag = #{delFlag} AND spc.store_id = #{storeId}
<if test="prodStatusList != null and prodStatusList.size() > 0">
AND spc.prod_status IN
<foreach item="item" collection="prodStatusList" separator="," open="(" close=")" index="">