藏品状态

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

@@ -129,7 +129,7 @@ public class SysSpecialPerformanceServiceImpl implements SysSpecialPerformanceSe
                     supplierItemVo.setIsLimitBuy(false);
                 }
                 AuctionConfig auctionConfig = auctionConfigDao.findByItemId(supplierItem.getId());
-                if (auctionConfig != null && auctionConfig.getIsValid()) {
+                if (auctionConfig != null) {
                     supplierItemVo.setStartPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getStartPrice()));
                     supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
                     supplierItemVo.setAuctionState(auctionConfig.getState());

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/AuctionConfigDao.java

 package com.wwdz.ch.db.dao.distribution;
 
 import com.wwdz.ch.db.domain.distribution.AuctionConfig;
+import com.wwdz.ch.db.dto.request.distribution.AuctionConfigRequestDto;
 
 import java.util.Date;
 import java.util.List;
@@ -47,6 +48,8 @@ public interface AuctionConfigDao {
      */
     List<AuctionConfig> findList(Date startTime, Date endTime);
 
+    List<AuctionConfig> findList(AuctionConfigRequestDto dto);
+
 
     /**
      * 查询截拍后在一小时内的拍卖配置

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/AuctionConfigDaoImpl.java

 package com.wwdz.ch.db.impl.distribution;
 
+import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.dao.distribution.AuctionConfigDao;
 import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
 import com.wwdz.ch.db.domain.distribution.AuctionConfig;
 import com.wwdz.ch.db.domain.distribution.AuctionConfigExample;
 import com.wwdz.ch.db.domain.distribution.DistributionOrderExample;
 import com.wwdz.ch.db.domain.distribution.SupplierItem;
+import com.wwdz.ch.db.dto.request.distribution.AuctionConfigRequestDto;
 import com.wwdz.ch.db.mapper.distribution.AuctionConfigMapper;
+import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -65,6 +68,17 @@ public class AuctionConfigDaoImpl implements AuctionConfigDao {
         return auctionConfigMapper.selectByExample(example);
     }
 
+    @Override
+    public List<AuctionConfig> findList(AuctionConfigRequestDto dto) {
+        AuctionConfigExample example = new AuctionConfigExample();
+        AuctionConfigExample.Criteria criteria = example.createCriteria();
+        JdbcHelper.ifPresent(dto.getCreatorId(), criteria::andCreatorIdEqualTo);
+        JdbcHelper.ifPresent(dto.getState(), criteria::andStateEqualTo);
+        example.setOrderByClause(" update_time desc");
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        return auctionConfigMapper.selectByExample(example);
+    }
+
     @Override
     public int updateRealEndTime(long itemId, Date realEndTime) {
         AuctionConfigExample example = new AuctionConfigExample();

ch-wx-api/src/main/java/com/wwdz/ch/wx/constant/CollectionBookConstants.java

@@ -10,6 +10,7 @@ public class CollectionBookConstants {
     public enum DefaultBookEnum {
         SALEING(-1L, "换藏中"),
         FINISHED(-2L, "已结缘"),
+        AUCTIONING(-3L, "拍卖中"),
         ;
 
         private Long id;

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/AuctionDetailVo.java

@@ -114,4 +114,18 @@ public class AuctionDetailVo implements Entity {
      */
     private Boolean isExtend;
 
+    /**
+     * 头像
+     */
+    private String avatarUrl;
+
+    /**
+     * 简介
+     */
+    private String profile;
+
+    private Long creatorId;
+
+    private String creatorName;
+
 }

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

 package com.wwdz.ch.wx.impl.distribution;
 
 import com.github.pagehelper.PageInfo;
+import com.wwdz.ch.core.consts.AuctionEnum;
 import com.wwdz.ch.core.consts.DistributionEnum;
 import com.wwdz.ch.core.entity.SupplierItemVo;
 import com.wwdz.ch.core.type.PageSearchResult;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.MediaUtil;
 import com.wwdz.ch.core.util.PriceUtil;
-import com.wwdz.ch.db.dao.distribution.CollectionItemsRelationDao;
-import com.wwdz.ch.db.dao.distribution.CollectionShareRecordDao;
-import com.wwdz.ch.db.dao.distribution.ItemCollectedRecordDao;
-import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
+import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.CollectionBookRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.CollectionItemsRelationRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.ItemCollectedRecordRequestDto;
-import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.wwdz.ch.db.dto.request.distribution.*;
 import com.wwdz.ch.wx.constant.CollectionBookConstants;
 import com.wwdz.ch.wx.entity.vo.distribution.CollectionBookVo;
 import com.wwdz.ch.wx.service.FollowFansRecordService;
@@ -57,6 +52,9 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
     @Autowired
     FollowFansRecordService followFansRecordService;
 
+    @Autowired
+    AuctionConfigDao auctionConfigDao;
+
     @Override
     public Result create(CollectionItemsRelationRequestDto dto) {
         try {
@@ -184,9 +182,10 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                 pageInfo = new PageInfo<>(itemCollectedRecordList);
                 List<Long> itemIds = itemCollectedRecordList.stream().map(ItemCollectedRecord::getItemId).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(itemIds)) {
-                    supplierItemRequestDto.setIds(itemIds);
-                    supplierItemRequestDto.setIsDeleted(false);
-                    supplierItemList = supplierItemDao.findList(supplierItemRequestDto);
+                    SupplierItemRequestDto requestDto = new SupplierItemRequestDto();
+                    requestDto.setIds(itemIds);
+                    requestDto.setIsDeleted(false);
+                    supplierItemList = supplierItemDao.findList(requestDto);
                 }
             } else if (dto.getCollectionBookId().longValue() == CollectionBookConstants.DefaultBookEnum.SALEING.getId()) {
                 //换藏中, 表示上架售卖中
@@ -201,7 +200,22 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                 supplierItemRequestDto.setStock(0);
                 supplierItemList = supplierItemDao.findSellOutList(supplierItemRequestDto);
                 pageInfo = new PageInfo<>(supplierItemList);
-            } else {
+            } else if (dto.getCollectionBookId().longValue() == CollectionBookConstants.DefaultBookEnum.AUCTIONING.getId()) {
+                AuctionConfigRequestDto auctionConfigRequestDto = new AuctionConfigRequestDto();
+                auctionConfigRequestDto.setCreatorId(targetUserId);
+                auctionConfigRequestDto.setState(AuctionEnum.StateEnum.AUCTIONING.getCode());
+                List<AuctionConfig> auctionConfigList = auctionConfigDao.findList(auctionConfigRequestDto);
+                pageInfo = new PageInfo<>(auctionConfigList);
+                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);
+                }
+            }
+            else {
                 //查询对应标签下的商品
                 CollectionItemsRelationRequestDto collectionItemsRelationRequestDto = new CollectionItemsRelationRequestDto();
                 collectionItemsRelationRequestDto.setCollectionBookId(dto.getCollectionBookId());