TASK:导出喜欢 图片名称添加;
This commit is contained in:
@@ -17,6 +17,8 @@ public class DesignLikeVO {
|
|||||||
@ApiModelProperty("分组详情id")
|
@ApiModelProperty("分组详情id")
|
||||||
private Long groupDetailId;
|
private Long groupDetailId;
|
||||||
|
|
||||||
|
private String pictureName;
|
||||||
|
|
||||||
public DesignLikeVO() {
|
public DesignLikeVO() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -658,6 +658,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
AuthPrincipalVo userInfo = UserContext.getUserHolder();
|
AuthPrincipalVo userInfo = UserContext.getUserHolder();
|
||||||
DesignItem designItem = designItemService.getById(designLikeDTO.getDesignItemId());
|
DesignItem designItem = designItemService.getById(designLikeDTO.getDesignItemId());
|
||||||
Assert.notNull(designItem, "designItem does not exist!");
|
Assert.notNull(designItem, "designItem does not exist!");
|
||||||
|
String pictureName = null;
|
||||||
|
UserLike userLike = null;
|
||||||
if (Objects.nonNull(designLikeDTO.getUserGroupId())) {
|
if (Objects.nonNull(designLikeDTO.getUserGroupId())) {
|
||||||
userGroupId = designLikeDTO.getUserGroupId();
|
userGroupId = designLikeDTO.getUserGroupId();
|
||||||
|
|
||||||
@@ -684,10 +686,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
if (CollectionUtils.isEmpty(tDesignPythonOutfits)) {
|
if (CollectionUtils.isEmpty(tDesignPythonOutfits)) {
|
||||||
throw new BusinessException("DesignItemId not found elements for ax elements to like! ["+designLikeDTO.getDesignItemId());
|
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());
|
designLikeDTO.getDesignItemId(), designLikeDTO.getDesignPythonOutfitId(), tDesignPythonOutfits.get(0).getDesignUrl(), designLikeDTO.getTimeZone());
|
||||||
userLikeService.save(userLike);
|
|
||||||
groupDetailId = userLike.getId();
|
|
||||||
} else {
|
} else {
|
||||||
//第一次like
|
//第一次like
|
||||||
userGroupId = userLikeGroupService.insertUserGroup(userInfo.getId(), designItem.getCollectionId(), designLikeDTO.getTimeZone());
|
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)) {
|
if (CollectionUtils.isEmpty(tDesignPythonOutfits)) {
|
||||||
throw new BusinessException("DesignItemId not found elements for ax elements to like! ["+designLikeDTO.getDesignItemId());
|
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());
|
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状态
|
//修改designItem为like状态
|
||||||
designItemService.updateLikeStatus(designLikeDTO.getDesignItemId(), (byte) 1);
|
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) {
|
private List<Long> validateMergeElement(List<CollectionElement> oldElements, List<DesignItemDetail> designItemDetails) {
|
||||||
|
|||||||
@@ -245,6 +245,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
|
|||||||
QueryWrapper<Library> libraryQueryWrapper = new QueryWrapper<>();
|
QueryWrapper<Library> libraryQueryWrapper = new QueryWrapper<>();
|
||||||
libraryQueryWrapper.lambda().eq(Library::getAccountId, userInfo.getId());
|
libraryQueryWrapper.lambda().eq(Library::getAccountId, userInfo.getId());
|
||||||
libraryQueryWrapper.lambda().eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName());
|
libraryQueryWrapper.lambda().eq(Library::getLevel1Type, LibraryLevel1TypeEnum.MODELS.getRealName());
|
||||||
|
libraryQueryWrapper.lambda().eq(Library::getLevel2Type, sex);
|
||||||
List<Library> libraries = libraryMapper.selectList(libraryQueryWrapper);
|
List<Library> libraries = libraryMapper.selectList(libraryQueryWrapper);
|
||||||
if (!CollectionUtils.isEmpty(libraries)) {
|
if (!CollectionUtils.isEmpty(libraries)) {
|
||||||
List<ModelVO> modelVOList = new ArrayList<>();
|
List<ModelVO> modelVOList = new ArrayList<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user