拍卖中标签查询商品返回倒计时

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -362,7 +362,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
                 auctionConfig.setEndTime(StringUtils.isEmpty(dto.getAuctionEndTime()) ? new Date(): DateUtils.parseString(dto.getAuctionEndTime()));
                 auctionConfig.setRealEndTime(StringUtils.isEmpty(dto.getAuctionEndTime()) ? new Date(): DateUtils.parseString(dto.getAuctionEndTime()));
                 auctionConfig.setStartPrice(StringUtils.isEmpty(dto.getStartPrice()) ? 0 : PriceUtil.convertPriceFromStr(dto.getStartPrice()));
-                auctionConfig.setAddExtent(StringUtils.isEmpty(dto.getAddExtent()) ? 50 : PriceUtil.convertPriceFromStr(dto.getAddExtent()));
+                auctionConfig.setAddExtent(StringUtils.isEmpty(dto.getAddExtent()) ? 5000 : PriceUtil.convertPriceFromStr(dto.getAddExtent()));
                 //修改的截拍时间在当前时间之后，则重新上架，设置拍卖信息为有效
                 if (DateUtils.parseString(dto.getAuctionEndTime()).after(new Date())) {
                     auctionConfig.setIsValid(true);

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

@@ -209,7 +209,6 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                 List<Long> itemIds = auctionConfigList.stream().map(AuctionConfig::getItemId).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(itemIds)) {
                     SupplierItemRequestDto requestDto = new SupplierItemRequestDto();
-                    requestDto.setCreatorId(targetUserId);
                     requestDto.setIds(itemIds);
                     requestDto.setIsDeleted(false);
                     supplierItemList = supplierItemDao.findList(requestDto);
@@ -234,13 +233,18 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                 }
             }
             List<SupplierItemVo> list = new ArrayList<>();
-            supplierItemList.forEach(supplierItem -> {
+            for (SupplierItem supplierItem : supplierItemList) {
                 SupplierItemVo supplierItemVo = new SupplierItemVo();
                 EntityMapper.copyAttribute(supplierItem, supplierItemVo);
                 supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
+                if (dto.getCollectionBookId().longValue() == CollectionBookConstants.DefaultBookEnum.AUCTIONING.getId()){
+                    List<AuctionConfig> auctionConfigList = pageInfo.getList();
+                    Map<Long, Date> map = auctionConfigList.stream().collect(Collectors.toMap(AuctionConfig::getItemId, AuctionConfig::getRealEndTime , (k1, k2) ->k2));
+                    supplierItemVo.setAuctionEndTime(map.get(supplierItem.getId()));
+                }
                 list.add(supplierItemVo);
-            });
+            }
             logger.info("查询标签下的藏品列表:{}", list);
             return Result.success(PageSearchResult.of(pageInfo, list));
         }catch (Exception e) {