From a9172dcd366219512167b0e645b42bad024829e1 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Tue, 3 Jun 2025 14:31:51 +0800
Subject: [PATCH] =?UTF-8?q?TASK:collection=20sort=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/service/impl/DesignServiceImpl.java |  5 ++---
 .../impl/UserLikeGroupServiceImpl.java        | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
index 8bd2ba60..aa8c2f13 100644
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -1313,9 +1313,6 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         //修改designItem为dislike状态
         designItemService.updateLikeStatus(userLike.getDesignItemId(), (byte) 0);
         //删除关联的collection,先不做
-
-        //删除对应的history
-        userLikeService.removeById(disDesignLikeDTO.getGroupDetailId());
         List<UserLikeVO> userLikeVOS = userLikeService.getGroupDetail(userLike.getUserLikeGroupId());
         if (CollectionUtils.isEmpty(userLikeVOS)) {
             //group 下面没有元素时候 直接删除
@@ -1323,6 +1320,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         }
 
         deleteCollectionSort(userLike.getId(), CollectionType.DESIGN.getValue(), disDesignLikeDTO.getProjectId());
+        //删除对应的history
+        userLikeService.removeById(disDesignLikeDTO.getGroupDetailId());
         return Boolean.TRUE;
     }
 
diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
index ee5d8354..0d52b9ea 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -782,15 +782,16 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
     @Override
     public Boolean productImageUnLike(ProductImageLikeDTO productImageLikeDTO) {
         List<Long> toProductImageResultId = productImageLikeDTO.getToProductImageResultId();
-        QueryWrapper<ToProductImageResult> qw = new QueryWrapper<>();
-        qw.lambda().in(ToProductImageResult::getId, toProductImageResultId);
-        ToProductImageResult toProductImageResult = new ToProductImageResult();
-        toProductImageResult.setIsLike(0);
-        toProductImageResultMapper.update(toProductImageResult, qw);
-        if (toProductImageResult.getResultType().equals("Relight")) {
-            designService.deleteCollectionSort(toProductImageResult.getId(), CollectionType.RELIGHT.getValue(), productImageLikeDTO.getProjectId());
-        }else {
-            designService.deleteCollectionSort(toProductImageResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(), productImageLikeDTO.getProjectId());
+        if (!CollectionUtils.isEmpty(toProductImageResultId)) {
+            Long toProductImageId = toProductImageResultId.get(0);
+            ToProductImageResult toProductImageResult = toProductImageResultMapper.selectById(toProductImageId);
+            toProductImageResult.setIsLike(0);
+            toProductImageResultMapper.updateById(toProductImageResult);
+            if (toProductImageResult.getResultType().equals("Relight")) {
+                designService.deleteCollectionSort(toProductImageResult.getId(), CollectionType.RELIGHT.getValue(), productImageLikeDTO.getProjectId());
+            }else {
+                designService.deleteCollectionSort(toProductImageResult.getId(), CollectionType.TO_PRODUCT_IMAGE.getValue(), productImageLikeDTO.getProjectId());
+            }
         }
         return Boolean.TRUE;
     }