aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/dev' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-01-07 11:26:16 +08:00
parent f08e36d100 eaaa99a946
commit 1a9f06d259
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/model/vo/DesignLikeVO.java
View File

@@ -12,6 +12,8 @@ import java.util.List;
@ApiModel("design like-响应") @ApiModel("design like-响应")
public class DesignLikeVO { public class DesignLikeVO {
private Long id;
@ApiModelProperty("分组id") @ApiModelProperty("分组id")
private Long userGroupId; private Long userGroupId;
@ApiModelProperty("分组详情id") @ApiModelProperty("分组详情id")

5
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -1089,12 +1089,14 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
} }
userLikeService.save(userLike); userLikeService.save(userLike);
Integer sortParam = 1; Integer sortParam = 1;
Long userLikeSortId;
if (isFirst) { if (isFirst) {
UserLikeSort userLikeSort = new UserLikeSort(); UserLikeSort userLikeSort = new UserLikeSort();
userLikeSort.setUserLikeGroupId(userGroupId); userLikeSort.setUserLikeGroupId(userGroupId);
userLikeSort.setUserLikeId(userLike.getId()); userLikeSort.setUserLikeId(userLike.getId());
userLikeSort.setSort(1); userLikeSort.setSort(1);
userLikeSortMapper.insert(userLikeSort); userLikeSortMapper.insert(userLikeSort);
userLikeSortId = userLikeSort.getId();
}else { }else {
QueryWrapper<UserLikeSort> qw = new QueryWrapper<>(); QueryWrapper<UserLikeSort> qw = new QueryWrapper<>();
qw.lambda().eq(UserLikeSort::getUserLikeGroupId, userGroupId); qw.lambda().eq(UserLikeSort::getUserLikeGroupId, userGroupId);
@@ -1107,6 +1109,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
userLikeSort.setSort(sort + 1); userLikeSort.setSort(sort + 1);
userLikeSortMapper.insert(userLikeSort); userLikeSortMapper.insert(userLikeSort);
sortParam = userLikeSort.getSort(); sortParam = userLikeSort.getSort();
userLikeSortId = userLikeSort.getId();
} }
groupDetailId = userLike.getId(); groupDetailId = userLike.getId();
String designUrl = designPythonOutfitMapper.selectById(userLike.getDesignOutfitId()).getDesignUrl(); String designUrl = designPythonOutfitMapper.selectById(userLike.getDesignOutfitId()).getDesignUrl();
@@ -1116,7 +1119,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
} }
//修改designItem为like状态 //修改designItem为like状态
designItemService.updateLikeStatus(designLikeDTO.getDesignItemId(), (byte) 1); designItemService.updateLikeStatus(designLikeDTO.getDesignItemId(), (byte) 1);
return new DesignLikeVO(userGroupId, groupDetailId, pictureName, userLike.getId(), sortParam); return new DesignLikeVO(userLikeSortId, userGroupId, groupDetailId, pictureName, userLike.getId(), sortParam);
} }
private List<Long> validateMergeElement(List<CollectionElement> oldElements, List<DesignItemDetail> designItemDetails) { private List<Long> validateMergeElement(List<CollectionElement> oldElements, List<DesignItemDetail> designItemDetails) {