修改 小程序详情和足迹

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/FootPrintServiceImpl.java

@@ -9,7 +9,7 @@ import com.wwdz.ch.db.dao.UserItemsRelationDao;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.wx.entity.request.FootPrintRequestDto;
-import com.wwdz.ch.wx.entity.vo.FootPrintResponseVo;
+import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo;
 import com.wwdz.ch.wx.entity.vo.ItemResponseVo;
 import com.wwdz.ch.wx.service.FootPrintService;
 import com.wwdz.ch.wx.util.StringUtil;
@@ -37,114 +37,6 @@ public class FootPrintServiceImpl implements FootPrintService {
     @Autowired
     private UserItemsRelationDao userItemsRelationDao;
 
-    @Override
-    public Result listAll(FootPrintRequestDto dto) {
-        try {
-            List<FootPrintResponseVo> result = new ArrayList<>();
-            List<Footprint> list = footPrintDao.listByUserId(dto.getUserId());
-            if (CollectionUtils.isEmpty(list)) {
-                return Result.success(result);
-            }
-            // 现在
-            Date now = new Date();
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            String todayFormat = simpleDateFormat.format(new Date()) + " 00:00:00";
-            // 今天
-            Date today = DateUtils.parseString(todayFormat);
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(today);
-            calendar.add(Calendar.DATE, -1);
-            // 昨天
-            Date yesterday = calendar.getTime();
-            // 一周内
-            calendar.setTime(now);
-            calendar.add(Calendar.DATE, -7);
-            Date week = calendar.getTime();
-            // 一月内
-            calendar.setTime(now);
-            calendar.add(Calendar.MONTH, -1);
-            Date month = calendar.getTime();
-            List<ItemResponseVo> todayList = new ArrayList<>();
-            List<ItemResponseVo> yesterdayList = new ArrayList<>();
-            List<ItemResponseVo> weekList = new ArrayList<>();
-            List<ItemResponseVo> monthList = new ArrayList<>();
-            for (Footprint footprint : list) {
-                ItemResponseVo itemResponseVo = new ItemResponseVo();
-                Item item = itemDao.findDetails(footprint.getItemId());
-                if (item.getIsDeleted()) {
-                    itemResponseVo.setId(item.getId());
-                    itemResponseVo.setHomePageImage(getImage(item));
-                    itemResponseVo.setIsDeleted(1);
-                    if (footprint.getAddTime().compareTo(today) >= 0) {
-                        todayList.add(itemResponseVo);
-                    }
-                    if (footprint.getAddTime().compareTo(yesterday) >= 0 && footprint.getAddTime().compareTo(today) <= 0) {
-                        yesterdayList.add(itemResponseVo);
-                    }
-                    if (footprint.getAddTime().compareTo(week) >= 0 && footprint.getAddTime().compareTo(yesterday) <= 0) {
-                        weekList.add(itemResponseVo);
-                    }
-                    if (footprint.getAddTime().compareTo(month) >= 0 && footprint.getAddTime().compareTo(week) <= 0) {
-                        monthList.add(itemResponseVo);
-                    }
-                    continue;
-                }
-                itemResponseVo.setIsDeleted(0);
-                // 设置基本信息
-                itemResponseVo.setId(footprint.getId());
-                itemResponseVo.setItemId(item.getId());
-                itemResponseVo.setName(item.getName());
-                itemResponseVo.setImages(item.getImages());
-                itemResponseVo.setDetail(item.getDetail());
-                // 设置价格
-                itemResponseVo.setPrice(getPrice(item.getPrice()));
-                // 设置是否收藏或是否是自己发布的
-                itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), footprint.getItemId()) ? 1 : 0);
-                itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
-                // 设置收藏数
-                itemResponseVo.setCollectCount(getCollectCount(item.getId(), item.getSourceType()));
-                // 设置图片或视频
-                itemResponseVo.setHomePageImage(getImage(item));
-
-                if (footprint.getAddTime().compareTo(today) >= 0) {
-                    todayList.add(itemResponseVo);
-                }
-                if (footprint.getAddTime().compareTo(yesterday) >= 0 && footprint.getAddTime().compareTo(today) <= 0) {
-                    yesterdayList.add(itemResponseVo);
-                }
-                if (footprint.getAddTime().compareTo(week) >= 0 && footprint.getAddTime().compareTo(yesterday) <= 0) {
-                    weekList.add(itemResponseVo);
-                }
-                if (footprint.getAddTime().compareTo(month) >= 0 && footprint.getAddTime().compareTo(week) <= 0) {
-                    monthList.add(itemResponseVo);
-                }
-            }
-
-            FootPrintResponseVo todayVo = new FootPrintResponseVo();
-            todayVo.setTimeType(1);
-            todayVo.setItems(todayList);
-            result.add(todayVo);
-            FootPrintResponseVo yesterdayVo = new FootPrintResponseVo();
-            yesterdayVo.setTimeType(2);
-            yesterdayVo.setItems(yesterdayList);
-            result.add(yesterdayVo);
-            FootPrintResponseVo weekVo = new FootPrintResponseVo();
-            weekVo.setTimeType(3);
-            weekVo.setItems(weekList);
-            result.add(weekVo);
-            FootPrintResponseVo monthVo = new FootPrintResponseVo();
-            monthVo.setTimeType(4);
-            monthVo.setItems(monthList);
-            result.add(monthVo);
-
-            logger.info("【请求结束】用户足迹列表查询成功");
-            return Result.success(result);
-        } catch (Exception e) {
-            logger.error("查询用户足迹列表失败", e);
-            return Result.failed("查询用户足迹列表失败");
-        }
-    }
-
     @Override
     public Result page(FootPrintRequestDto dto) {
         try {
@@ -154,7 +46,7 @@ public class FootPrintServiceImpl implements FootPrintService {
             map.put("total", 0);
             map.put("list", new ArrayList<>());
 
-            List<FootPrintResponseVo> result = new ArrayList<>();
+            List<AgentTranceResponseVo> resultList = new ArrayList<>();
             List<Footprint> list = footPrintDao.pageByUserId(dto.getUserId(), dto.getPage(), dto.getSize());
             if (CollectionUtils.isEmpty(list)) {
                 return Result.success(map);
@@ -180,38 +72,16 @@ public class FootPrintServiceImpl implements FootPrintService {
             calendar.setTime(now);
             calendar.add(Calendar.MONTH, -1);
             Date month = calendar.getTime();
-            List<ItemResponseVo> todayList = new ArrayList<>();
-            List<ItemResponseVo> yesterdayList = new ArrayList<>();
-            List<ItemResponseVo> weekList = new ArrayList<>();
-            List<ItemResponseVo> monthList = new ArrayList<>();
             for (Footprint footprint : list) {
                 ItemResponseVo itemResponseVo = new ItemResponseVo();
                 Item item = itemDao.findDetails(footprint.getItemId());
-                if (item.getIsDeleted()) {
-                    itemResponseVo.setId(item.getId());
-                    itemResponseVo.setHomePageImage(getImage(item));
-                    itemResponseVo.setIsDeleted(1);
-                    if (footprint.getAddTime().compareTo(today) >= 0) {
-                        todayList.add(itemResponseVo);
-                    }
-                    if (footprint.getAddTime().compareTo(yesterday) >= 0 && footprint.getAddTime().compareTo(today) <= 0) {
-                        yesterdayList.add(itemResponseVo);
-                    }
-                    if (footprint.getAddTime().compareTo(week) >= 0 && footprint.getAddTime().compareTo(yesterday) <= 0) {
-                        weekList.add(itemResponseVo);
-                    }
-                    if (footprint.getAddTime().compareTo(month) >= 0 && footprint.getAddTime().compareTo(week) <= 0) {
-                        monthList.add(itemResponseVo);
-                    }
-                    continue;
-                }
-                itemResponseVo.setIsDeleted(0);
                 // 设置基本信息
                 itemResponseVo.setId(footprint.getId());
                 itemResponseVo.setItemId(item.getId());
                 itemResponseVo.setName(item.getName());
                 itemResponseVo.setImages(item.getImages());
                 itemResponseVo.setDetail(item.getDetail());
+                itemResponseVo.setIsDeleted(item.getIsDeleted());
                 // 设置价格
                 itemResponseVo.setPrice(getPrice(item.getPrice()));
                 // 设置是否收藏或是否是自己发布的
@@ -222,42 +92,29 @@ public class FootPrintServiceImpl implements FootPrintService {
                 // 设置图片或视频
                 itemResponseVo.setHomePageImage(getImage(item));
 
-
+                // 设置日期类型
                 if (footprint.getAddTime().compareTo(today) >= 0) {
-                    todayList.add(itemResponseVo);
+                    itemResponseVo.setTimeType(1);
                 }
-                if (footprint.getAddTime().compareTo(yesterday) >= 0 && footprint.getAddTime().compareTo(today) <= 0) {
-                    yesterdayList.add(itemResponseVo);
+                if (footprint.getAddTime().compareTo(yesterday) >= 0 && footprint.getAddTime().compareTo(today) < 0) {
+                    itemResponseVo.setTimeType(2);
                 }
-                if (footprint.getAddTime().compareTo(week) >= 0 && footprint.getAddTime().compareTo(yesterday) <= 0) {
-                    weekList.add(itemResponseVo);
+                if (footprint.getAddTime().compareTo(week) >= 0 && footprint.getAddTime().compareTo(yesterday) < 0) {
+                    itemResponseVo.setTimeType(3);
                 }
-                if (footprint.getAddTime().compareTo(month) >= 0 && footprint.getAddTime().compareTo(week) <= 0) {
-                    monthList.add(itemResponseVo);
+                if (footprint.getAddTime().compareTo(month) >= 0 && footprint.getAddTime().compareTo(week) < 0) {
+                    itemResponseVo.setTimeType(4);
                 }
-            }
-
-            FootPrintResponseVo todayVo = new FootPrintResponseVo();
-            todayVo.setTimeType(1);
-            todayVo.setItems(todayList);
-            result.add(todayVo);
-            FootPrintResponseVo yesterdayVo = new FootPrintResponseVo();
-            yesterdayVo.setTimeType(2);
-            yesterdayVo.setItems(yesterdayList);
-            result.add(yesterdayVo);
-            FootPrintResponseVo weekVo = new FootPrintResponseVo();
-            weekVo.setTimeType(3);
-            weekVo.setItems(weekList);
-            result.add(weekVo);
-            FootPrintResponseVo monthVo = new FootPrintResponseVo();
-            monthVo.setTimeType(4);
-            monthVo.setItems(monthList);
-            result.add(monthVo);
 
-            map.put("dataList", result);
+                AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
+                agentTranceResponseVo.setAgentTraceInfo_("");
+                agentTranceResponseVo.setViewType(1);
+                agentTranceResponseVo.setDetail(itemResponseVo);
+                resultList.add(agentTranceResponseVo);
+            }
 
             logger.info("【请求结束】用户足迹分页查询成功");
-            return Result.success(map);
+            return Result.success(resultList);
         } catch (Exception e) {
             logger.error("用户足迹分页查询", e);
             return Result.failed("查询失败");

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

@@ -220,11 +220,12 @@ public class ItemServiceImpl implements ItemService {
         try {
             Item item = itemDao.findById(dto.getId());
             if (Objects.isNull(item)) {
-                //TODO 足迹如果删除如何处理
+                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(), "该藏品已经被移除");
             }
             ItemResponseVo itemResponseVo = new ItemResponseVo();

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);
-
     /**
      * 用户足迹分页查询
      *