后台藏家订单列表

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

@@ -87,9 +87,15 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                     return Result.success();
                 }
             }
-            if (dto.getType() == null) {
-                dto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.AUCTION.getCode()
-                        , DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode()));
+            if (dto.getTypeStr() == null) {
+                dto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode()));
+            } else {
+                String[] types = dto.getTypeStr().split(",");
+                List<Integer> typeList = new ArrayList<>();
+                for (String type : types) {
+                    typeList.add(Integer.valueOf(type));
+                }
+                dto.setTypeList(typeList);
             }
             List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
             PageInfo pageInfo = new PageInfo<>(distributionOrderList);

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java

@@ -179,6 +179,8 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
      */
     private Integer type;
 
+    private String typeStr;
+
     private List<Integer> typeList;
 
     /**

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

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -55,6 +56,9 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
     @Autowired
     AuctionConfigDao auctionConfigDao;
 
+    @Autowired
+    AuctionRecordDao auctionRecordDao;
+
     @Override
     public Result create(CollectionItemsRelationRequestDto dto) {
         try {
@@ -240,8 +244,14 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                 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.setRealEndTime(map.get(supplierItem.getId()));
+                    Map<Long, AuctionConfig> map = auctionConfigList.stream().collect(Collectors.toMap(AuctionConfig::getItemId, Function.identity() , (k1, k2) ->k2));
+                    supplierItemVo.setRealEndTime(map.get(supplierItem.getId()).getRealEndTime());
+                    AuctionRecord auctionRecord = auctionRecordDao.findLastedRecord(dto.getItemId());
+                    if (auctionRecord != null) {
+                        supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(auctionRecord.getPrice()));
+                    } else {
+                        supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(map.get(supplierItem.getId()).getStartPrice()));
+                    }
                 }
                 list.add(supplierItemVo);
             }

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

@@ -255,8 +255,8 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrder.setDistributionOrderId(distributionOrderId);
                 distributionOrder.setBuyerId(auctionRecord.getUserId());
                 distributionOrder.setBuyerOpenid(auctionRecord.getUserOpenId());
-                distributionOrder.setShopId(firstAuctionRecord.getDistributorId());
-                distributionOrder.setSellerId(firstAuctionRecord.getDistributorId());
+                distributionOrder.setShopId(auctionConfig.getCreatorId());
+                distributionOrder.setSellerId(auctionConfig.getCreatorId());
                 distributionOrder.setAmount(auctionRecord.getPrice());
                 distributionOrder.setCreateTime(auctionConfig.getRealEndTime());
                 distributionOrder.setUpdateTime(now);