个人主页

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

@@ -112,6 +112,7 @@ public class ExchangeServiceImpl implements ExchangeService {
                 supplierItemRequestDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.COLLECT.getCode(),
                         DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
                 supplierItemRequestDto.setCreatorId(targetUserId);
+                supplierItemRequestDto.setStock(0);
                 supplierItemRequestDto.setIsDeleted(false);
                 supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
                 pageInfo =  new PageInfo<>(supplierItemList);
@@ -121,6 +122,7 @@ public class ExchangeServiceImpl implements ExchangeService {
                 supplierItemRequestDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.COLLECT.getCode(),
                         DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
                 supplierItemRequestDto.setIsOnSale(true);
+                supplierItemRequestDto.setStock(0);
                 supplierItemRequestDto.setIsDeleted(false);
                 supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
                 pageInfo = new PageInfo<>(supplierItemList);
@@ -129,7 +131,6 @@ public class ExchangeServiceImpl implements ExchangeService {
                 supplierItemRequestDto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.COLLECT.getCode(),
                         DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
                 supplierItemRequestDto.setCreatorId(targetUserId);
-                supplierItemRequestDto.setStock(0);
                 supplierItemList = supplierItemDao.findSellOutList(supplierItemRequestDto);
                 pageInfo = new PageInfo<>(supplierItemList);
             } else if (dto.getCollectionBookId().longValue() == CollectionBookConstants.DefaultBookEnum.AUCTIONING.getId()) {

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

@@ -145,6 +145,30 @@ public class SelfPageServiceImpl implements SelfPageService {
             });
             selfPageInfoVo.setOrderNum(distributionOrderNumList);
 
+            //换藏订单各状态数量统计
+            List<DistributionOrderNum> exchangeOrderNumList = distributionOrderDao.countGroupByStateForExchange(dto.getUserId());
+            List<Integer> exchangeOrderStateList = exchangeOrderNumList.stream().map(DistributionOrderNum::getState).collect(Collectors.toList());
+            exchangeOrderNumList.forEach(s -> {
+                s.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(s.getState()));
+            });
+            for (int state : EXCHANGE_ORDER_STATE_LIST) {
+                if (!exchangeOrderStateList.contains(state)) {
+                    DistributionOrderNum distributionOrderNum = new DistributionOrderNum();
+                    distributionOrderNum.setState(state);
+                    distributionOrderNum.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(state));
+                    distributionOrderNum.setNum(0);
+                    exchangeOrderNumList.add(distributionOrderNum);
+                }
+            }
+            exchangeOrderNumList = exchangeOrderNumList.stream().sorted(Comparator.comparing(DistributionOrderNum::getState)).collect(Collectors.toList());
+            selfPageInfoVo.setExchangeOrderNum(exchangeOrderNumList);
+
+            //统计申请单数量，我提交的和我收到的
+            long commitNum = exchangeApplyOrderDao.countPreHandleOrderOfCommit(dto.getUserId());
+            long receiveNum = exchangeApplyOrderDao.countPreHandleOrderOfReceive(dto.getUserId());
+            selfPageInfoVo.setExchangeApplyOrderNum(commitNum + receiveNum);
+
+
             //查询4天内出价记录
             Date now = new Date();
             Instant instant = now.toInstant().minus(Duration.ofDays(4));