修改 小程序详情和足迹

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/ItemRequestDto.java

@@ -34,4 +34,5 @@ public class ItemRequestDto implements Entity {
     private Integer page;
     private Integer size;
     private String path;
+    private Integer type;
 }

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

@@ -23,6 +23,7 @@ public class ItemResponseVo implements Entity {
     private String createTime;
     private String videos;
     private Map<String, Object> homePageImage;
-    private Integer isDeleted;
+    private Boolean isDeleted;
     private String itemNickname;
+    private Integer timeType;
 }

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

@@ -241,21 +241,13 @@ public class FavoritesServiceImpl implements FavoritesService {
 
                 ItemResponseVo vo = new ItemResponseVo();
                 Item item = itemDao.findDetails(relation.getItemId());
-                if (item.getIsDeleted()) {
-                    vo.setId(relation.getItemId());
-                    vo.setHomePageImage(getImage(item));
-                    vo.setIsDeleted(1);
-                    agentTranceResponseVo.setDetail(vo);
-                    list.add(agentTranceResponseVo);
-                    continue;
-                }
-                vo.setIsDeleted(0);
                 // 设置基本信息
                 vo.setId(relation.getItemId());
                 vo.setName(item.getName());
                 vo.setImages(item.getImages());
                 vo.setDetail(item.getDetail());
                 vo.setFavoritesId(dto.getId());
+                vo.setIsDeleted(item.getIsDeleted());
                 // 设置价格
                 vo.setPrice(getPrice(item.getPrice()));
                 // 设置是否收藏或是否是自己发布的

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

@@ -220,10 +220,11 @@ public class ItemServiceImpl implements ItemService {
         try {
             Item item = itemDao.findById(dto.getId());
             if (Objects.isNull(item)) {
-                //TODO 足迹如果删除如何处理
-                if (Objects.nonNull(dto.getUserId()) && !dto.getUserId().equals(0L)) {
-                    // 如果当前用户已收藏该藏品，则删除收藏关联
-                    favoritesItemsRelationDao.deleteByUserIdItemId(dto.getUserId(), dto.getId());
+                if (Objects.nonNull(dto.getType()) && dto.getType().equals(1)) {
+                    if (Objects.nonNull(dto.getUserId()) && !dto.getUserId().equals(0L)) {
+                        // 如果当前用户已收藏该藏品，则删除收藏关联
+                        favoritesItemsRelationDao.deleteByUserIdItemId(dto.getUserId(), dto.getId());
+                    }
                 }
                 return Result.failed(ResultCode.INVALID_DATA.getCode(), "该藏品已经被移除");
             }

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/FootPrintService.java

@@ -4,14 +4,6 @@ import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.wx.entity.request.FootPrintRequestDto;
 
 public interface FootPrintService {
-    /**
-     * 用户足迹列表查询
-     *
-     * @param dto
-     * @return
-     */
-    Result listAll(FootPrintRequestDto dto);
-
     /**
      * 用户足迹分页查询
      *