From 9e2f4f75c13ad932d3b0408c19f715953d144cec Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Wed, 11 Oct 2023 13:39:24 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E5=AF=BC=E5=87=BA=E5=96=9C=E6=AC=A2=20?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8D=E7=A7=B0=E6=B7=BB=E5=8A=A0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/model/vo/DesignLikeVO.java |  2 ++
 .../ai/da/service/impl/DesignServiceImpl.java | 20 ++++++++++++-------
 .../da/service/impl/WorkspaceServiceImpl.java |  1 +
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ai/da/model/vo/DesignLikeVO.java b/src/main/java/com/ai/da/model/vo/DesignLikeVO.java
index c9ab1c25..2a38f8bd 100644
--- a/src/main/java/com/ai/da/model/vo/DesignLikeVO.java
+++ b/src/main/java/com/ai/da/model/vo/DesignLikeVO.java
@@ -17,6 +17,8 @@ public class DesignLikeVO {
     @ApiModelProperty("分组详情id")
     private Long groupDetailId;
 
+    private String pictureName;
+
     public DesignLikeVO() {
     }
 }
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 b754b62b..9fb2ab0c 100644
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -658,6 +658,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         AuthPrincipalVo userInfo = UserContext.getUserHolder();
         DesignItem designItem = designItemService.getById(designLikeDTO.getDesignItemId());
         Assert.notNull(designItem, "designItem does not exist!");
+        String pictureName = null;
+        UserLike userLike = null;
         if (Objects.nonNull(designLikeDTO.getUserGroupId())) {
             userGroupId = designLikeDTO.getUserGroupId();
 
@@ -684,10 +686,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
             if (CollectionUtils.isEmpty(tDesignPythonOutfits)) {
                 throw new BusinessException("DesignItemId not found elements for ax  elements to like! ["+designLikeDTO.getDesignItemId());
             }
-            UserLike userLike = resolveUserLike(designLikeDTO.getUserGroupId(), designItem.getDesignId(),
+            userLike = resolveUserLike(designLikeDTO.getUserGroupId(), designItem.getDesignId(),
                     designLikeDTO.getDesignItemId(), designLikeDTO.getDesignPythonOutfitId(), tDesignPythonOutfits.get(0).getDesignUrl(), designLikeDTO.getTimeZone());
-            userLikeService.save(userLike);
-            groupDetailId = userLike.getId();
+
         } else {
             //第一次like
             userGroupId = userLikeGroupService.insertUserGroup(userInfo.getId(), designItem.getCollectionId(), designLikeDTO.getTimeZone());
@@ -697,14 +698,19 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
             if (CollectionUtils.isEmpty(tDesignPythonOutfits)) {
                 throw new BusinessException("DesignItemId not found elements for ax  elements to like! ["+designLikeDTO.getDesignItemId());
             }
-            UserLike userLike = resolveUserLike(userGroupId,
+            userLike = resolveUserLike(userGroupId,
                     designItem.getDesignId(), designLikeDTO.getDesignItemId(), designLikeDTO.getDesignPythonOutfitId(), tDesignPythonOutfits.get(0).getDesignUrl(), designLikeDTO.getTimeZone());
-            userLikeService.save(userLike);
-            groupDetailId = userLike.getId();
+        }
+        userLikeService.save(userLike);
+        groupDetailId = userLike.getId();
+        String designUrl = designPythonOutfitMapper.selectById(userLike.getDesignPythonOutfitId()).getDesignUrl();
+        if (designUrl.contains("/")) {
+            int i = designUrl.lastIndexOf("/");
+            pictureName = designUrl.substring(i + 1);
         }
         //修改designItem为like状态
         designItemService.updateLikeStatus(designLikeDTO.getDesignItemId(), (byte) 1);
-        return new DesignLikeVO(userGroupId, groupDetailId);
+        return new DesignLikeVO(userGroupId, groupDetailId, pictureName);
     }
 
     private List<Long> validateMergeElement(List<CollectionElement> oldElements, List<DesignItemDetail> designItemDetails) {
diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
index a3a993a4..650d8d95 100644
--- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
@@ -245,6 +245,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
         QueryWrapper<Library> libraryQueryWrapper = new QueryWrapper<>();
         libraryQueryWrapper.lambda().eq(Library::getAccountId, userInfo.getId());
         libraryQueryWrapper.lambda().eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName());
+        libraryQueryWrapper.lambda().eq(Library::getLevel2Type, sex);
         List<Library> libraries = libraryMapper.selectList(libraryQueryWrapper);
         if (!CollectionUtils.isEmpty(libraries)) {
             List<ModelVO> modelVOList = new ArrayList<>();