个人主页2

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

@@ -128,7 +128,8 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
             }
             //查询所有的上传藏品
             SupplierItemRequestDto supplierItemRequestDto = new SupplierItemRequestDto();
-            supplierItemRequestDto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
+            supplierItemRequestDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.COLLECT.getCode(),
+                    DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
             supplierItemRequestDto.setCreatorId(searchUserId);
             supplierItemRequestDto.setIsDeleted(false);
             supplierItemRequestDto.setPage(dto.getPage());

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

@@ -233,6 +233,8 @@ public class ExchangeOrderServiceImpl implements ExchangeOrderService {
             exchangeOrderDetailVo.setStateTitle(exchangeOrderDetailVo.getStateName());
             if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) {
                 exchangeOrderDetailVo.setStateDesc("藏品验货不通过，订单取消，交换关闭。");
+            } else if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_EXCHANGE.getCode()) {
+
             }
             Date date = distributionOrder.getCreateTime();
             Instant instant = date.toInstant().plus(Duration.ofHours(48));