商品列表

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionItemsRelationServiceImpl.java

@@ -172,7 +172,8 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                     }
                 }
                 //查询所有的上传藏品
-                supplierItemRequestDto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
+                supplierItemRequestDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.COLLECT.getCode(),
+                        DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
                 supplierItemRequestDto.setCreatorId(targetUserId);
                 supplierItemRequestDto.setIsDeleted(false);
                 supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
@@ -195,14 +196,16 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
             } else if (dto.getCollectionBookId().longValue() == CollectionBookConstants.DefaultBookEnum.SALEING.getId()) {
                 //换藏中, 表示上架售卖中
                 supplierItemRequestDto.setCreatorId(targetUserId);
-                supplierItemRequestDto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
+                supplierItemRequestDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.COLLECT.getCode(),
+                        DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
                 supplierItemRequestDto.setIsOnSale(true);
                 supplierItemRequestDto.setIsDeleted(false);
                 supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
                 pageInfo = new PageInfo<>(supplierItemList);
             } else if (dto.getCollectionBookId().longValue() == CollectionBookConstants.DefaultBookEnum.FINISHED.getId()) {
                 //已结缘, 表示卖完了
-                supplierItemRequestDto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
+                supplierItemRequestDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.COLLECT.getCode(),
+                        DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
                 supplierItemRequestDto.setCreatorId(targetUserId);
                 supplierItemRequestDto.setStock(0);
                 supplierItemList = supplierItemDao.findSellOutList(supplierItemRequestDto);