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 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 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 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 validateMergeElement(List oldElements, List 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 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 libraries = libraryMapper.selectList(libraryQueryWrapper); if (!CollectionUtils.isEmpty(libraries)) { List modelVOList = new ArrayList<>();