展示默认的标签

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

@@ -70,4 +70,9 @@ public class CollectionBookRequestDto extends BaseRequestDto implements Entity
     private String sortInfo;
 
     private Boolean isMine;
+
+    /**
+     * 1：展示默认的标签,为空不展示
+     */
+    private Integer viewLabelType;
 }

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

@@ -19,6 +19,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -154,8 +157,10 @@ public class CollectionBookServiceImpl implements CollectionBookService {
                             continue;
                         }
                     } else if (CollectionBookConstants.DefaultBookEnum.getNameByCode(sortNum) != null) {
+                        if (dto.getViewLabelType() == null || (dto.getViewLabelType().intValue() != 1)) {
+                            continue;
+                        }
                         map.put("title", CollectionBookConstants.DefaultBookEnum.getNameByCode(sortNum));
-
                     } else {
                         map.put("title", bookMap.get(sortNum));
                     }
@@ -171,6 +176,7 @@ public class CollectionBookServiceImpl implements CollectionBookService {
 
 
     @Override
+    @Transactional
     public Result delete(CollectionBookRequestDto dto) {
         try {
             collectionBookDao.delete(dto.getId());
@@ -183,7 +189,8 @@ public class CollectionBookServiceImpl implements CollectionBookService {
             CollectionBookSort collectionBookSort = collectionBookSortDao.find(dto.getUserId());
             if (collectionBookSort != null) {
                 String sortInfo = collectionBookSort.getSortInfo();
-                List<String> list = Arrays.asList(sortInfo.split(","));
+                List<String> arrayList = Arrays.asList(sortInfo.split(","));
+                List<String> list = new ArrayList<>(arrayList);
                 list.remove("" + dto.getId());
                 sortInfo = String.join("," , list);
                 collectionBookSortDao.update(dto.getUserId(), sortInfo);
@@ -191,6 +198,7 @@ public class CollectionBookServiceImpl implements CollectionBookService {
             return Result.success();
         } catch (Exception e) {
             logger.error("删除收藏册 error: {}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return Result.failed();
     }

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

@@ -680,7 +680,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             if (supplierItem.getCreatorId().longValue() != targetUserId) {
                 supplierItemVo.setIsMine(false);
                 targetUserId = supplierItem.getCreatorId();
-                boolean isCollected = itemCollectedRecordDao.isExisted(itemId, targetUserId);
+                boolean isCollected = itemCollectedRecordDao.isExisted(itemId, dto.getUserId());
                 if (isCollected) {
                     supplierItemVo.setIsCollected(true);
                 } else {
@@ -689,7 +689,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 if (supplierItem.getIsDeleted()) {
                     //判断是否有相关收藏记录，有则删除
                     if (isCollected) {
-                        itemCollectedRecordDao.cancel(itemId, targetUserId);
+                        itemCollectedRecordDao.cancel(itemId, dto.getUserId());
                     }
                     return Result.failed("该藏品已删除");
                 }