藏品详情新增标签2

ch-core/src/main/java/com/wwdz/ch/core/entity/SupplierItemVo.java

 package com.wwdz.ch.core.entity;
 
+import com.wwdz.ch.db.domain.distribution.CollectionBook;
 import com.wwdz.ch.db.domain.distribution.CollectionItemsRelation;
 import com.xxdxxs.entity.Entity;
 import lombok.Data;
@@ -233,7 +234,7 @@ public class SupplierItemVo implements Entity {
     /**
      * 商品所属标签id
      */
-    private List<CollectionItemsRelation> bookIdList;
+    private List<CollectionBook> bookIdList;
 
     /**
      * 商家自购价

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

@@ -4,6 +4,7 @@ import com.wwdz.ch.db.dto.request.BaseRequestDto;
 import com.xxdxxs.entity.Entity;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class CollectionBookRequestDto extends BaseRequestDto implements Entity  {
@@ -13,6 +14,11 @@ public class CollectionBookRequestDto extends BaseRequestDto implements Entity
      */
     private Long id;
 
+    /**
+     * 标签id
+     */
+    private List<Long> ids;
+
     /**
      * 用户id
      */

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

@@ -35,6 +35,7 @@ public class CollectionBookDaoImpl implements CollectionBookDao {
         CollectionBookExample example = new CollectionBookExample();
         CollectionBookExample.Criteria criteria = example.createCriteria();
         JdbcHelper.ifPresent(dto.getUserId(), criteria::andUserIdEqualTo);
+        JdbcHelper.ifPresent(dto.getIds(), criteria::andIdIn);
         criteria.andIsDeletedEqualTo(false);
         example.setOrderByClause("update_time desc");
         PageHelper.startPage(dto.getPage(), dto.getLimit());

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

@@ -5,5 +5,26 @@ package com.wwdz.ch.wx.constant;
  */
 public class CollectionBookConstants {
 
-    private String saleing;
+    public enum DefaultBookEnum {
+        SALEING(-1L, "换藏中"),
+        FINISHED(-2L, "已结缘"),
+        ;
+
+        private Long id;
+
+        private String name;
+
+        DefaultBookEnum(Long id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+
+        public Long getId() {
+            return id;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
 }

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

@@ -113,6 +113,9 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     @Autowired
     FollowFansRecordService followFansRecordService;
 
+    @Autowired
+    CollectionBookDao collectionBookDao;
+
 
 
     @Override
@@ -702,7 +705,11 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             supplierItemVo.setCollectedNum((int) countNum);
             //查询商品所属标签
             List<CollectionItemsRelation> collectionItemsRelations = collectionItemsRelationDao.findByItemId(itemId);
-            supplierItemVo.setBookIdList(collectionItemsRelations);
+            List<Long> collectBookIds = collectionItemsRelations.stream().map(CollectionItemsRelation::getCollectionBookId).collect(Collectors.toList());
+            CollectionBookRequestDto collectionBookRequestDto = new CollectionBookRequestDto();
+            collectionBookRequestDto.setIds(collectBookIds);
+            List<CollectionBook> collectionBookList = collectionBookDao.find(collectionBookRequestDto);
+            supplierItemVo.setBookIdList(collectionBookList);
             return Result.success(supplierItemVo);
         } catch (Exception e) {
             logger.error("查询上传的藏品详情 error : {}", e);