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 8a9efdb4..83b3e9c9 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -314,7 +314,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl userLikeGroupList = userLikeGroupMapper.selectList(qw); if (CollectionUtil.isEmpty(userLikeGroupList)) { - throw new BusinessException("Lack of associated userLikeGroup."); + return null; } return userLikeGroupList.get(0); } @@ -1267,35 +1267,37 @@ public class UserLikeGroupServiceImpl extends ServiceImpl list = new ArrayList<>(); - for (CollectionElement collectionElement : collectionElements) { - CollectionElementVO collectionElementVO = CopyUtil.copyObject(collectionElement, CollectionElementVO.class); - collectionElementVO.setDesignType(DesignTypeEnum.COLLECTION.getRealName()); - String url = collectionElement.getUrl(); - collectionElementVO.setOriginalUrl(url); - if (minioUtil.doesObjectExist(url)) { - collectionElementVO.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60)); + if (collection.getMoodTemplateId() != null) { + CollectionElement layoutElement = collectionElementMapper.selectById(collection.getMoodTemplateId()); + moodBoardModuleChooseVO.setMoodTemplateId(collection.getMoodTemplateId()); + moodBoardModuleChooseVO.setMoodTemplateName(layoutElement.getName()); + moodBoardModuleChooseVO.setMoodTemplateUrl(minioUtil.getPreSignedUrl(layoutElement.getUrl(), 24 * 60)); } - if (minioUtil.doesObjectExist(collectionElementVO.getOriginalUrl())) { - list.add(collectionElementVO); + List list = new ArrayList<>(); + for (CollectionElement collectionElement : collectionElements) { + CollectionElementVO collectionElementVO = CopyUtil.copyObject(collectionElement, CollectionElementVO.class); + collectionElementVO.setDesignType(DesignTypeEnum.COLLECTION.getRealName()); + String url = collectionElement.getUrl(); + collectionElementVO.setOriginalUrl(url); + if (minioUtil.doesObjectExist(url)) { + collectionElementVO.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60)); + } + if (minioUtil.doesObjectExist(collectionElementVO.getOriginalUrl())) { + list.add(collectionElementVO); + } } + moodBoardModuleChooseVO.setMoodBoards(list); + moduleChooseVO.setMoodBoard(moodBoardModuleChooseVO); } - moodBoardModuleChooseVO.setMoodBoards(list); - moduleChooseVO.setMoodBoard(moodBoardModuleChooseVO); }else if (module.equals(Module.printBoard.name())) { QueryWrapper qw = new QueryWrapper<>(); @@ -1349,56 +1351,60 @@ public class UserLikeGroupServiceImpl extends ServiceImpl userLikeVOS = userLikeService.getGroupDetail(userGroupId); - String sex = null; + List userLikeVOS = userLikeService.getGroupDetail(userGroupId); + String sex = null; - QueryWrapper userLikeSortQw = new QueryWrapper<>(); - userLikeSortQw.lambda().eq(UserLikeSort::getUserLikeGroupId, userGroupId); - List userLikeSortList = userLikeSortMapper.selectList(userLikeSortQw); - if (CollectionUtil.isEmpty(userLikeSortList)) { - Integer sort = 1; - for (UserLikeVO userLikeVO : userLikeVOS) { - UserLikeSort userLikeSort = new UserLikeSort(); - userLikeSort.setUserLikeId(userLikeVO.getId()); - userLikeSort.setUserLikeGroupId(userGroupId); - userLikeSort.setSort(sort); - userLikeSortMapper.insert(userLikeSort); - sort ++; + QueryWrapper userLikeSortQw = new QueryWrapper<>(); + userLikeSortQw.lambda().eq(UserLikeSort::getUserLikeGroupId, userGroupId); + List userLikeSortList = userLikeSortMapper.selectList(userLikeSortQw); + if (CollectionUtil.isEmpty(userLikeSortList)) { + Integer sort = 1; + for (UserLikeVO userLikeVO : userLikeVOS) { + UserLikeSort userLikeSort = new UserLikeSort(); + userLikeSort.setUserLikeId(userLikeVO.getId()); + userLikeSort.setUserLikeGroupId(userGroupId); + userLikeSort.setSort(sort); + userLikeSortMapper.insert(userLikeSort); + sort ++; + } } + + userLikeVOS.forEach(o -> { + TDesignPythonOutfit tDesignPythonOutfit1 = designPythonOutfitMapper.selectById(o.getDesignOutfitId()); + o.setUrl(tDesignPythonOutfit1.getDesignUrl()); + if (o.getUrl().contains("/")) { + int index = o.getUrl().lastIndexOf("/"); + o.setPictureName(o.getUrl().substring(index + 1)); + } + o.setDesignOutfitUrl(minioUtil.getPreSignedUrl(o.getUrl(), 24 * 60)); + QueryWrapper qw = new QueryWrapper<>(); + qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, o.getDesignItemId()); + List tDesignPythonOutfits = designPythonOutfitMapper.selectList(qw); + if (CollectionUtil.isNotEmpty(tDesignPythonOutfits)) { + TDesignPythonOutfit tDesignPythonOutfit = tDesignPythonOutfits.get(0); + o.setDesignOutfitId(tDesignPythonOutfit.getId()); + } + + QueryWrapper userLikeSortQueryWrapper = new QueryWrapper<>(); + userLikeSortQueryWrapper.lambda().eq(UserLikeSort::getUserLikeId, o.getId()); + List userLikeSorts = userLikeSortMapper.selectList(userLikeSortQueryWrapper); + if (CollectionUtil.isNotEmpty(userLikeSorts)) { + UserLikeSort userLikeSort = userLikeSorts.get(0); + o.setSort(userLikeSort.getSort()); + o.setUserLikeSortId(userLikeSort.getId()); + } + }); + vo.setUserGroupId(userGroupId); + vo.setUserLikeDetails(userLikeVOS); + moduleChooseVO.setDesign(vo); } - - userLikeVOS.forEach(o -> { - TDesignPythonOutfit tDesignPythonOutfit1 = designPythonOutfitMapper.selectById(o.getDesignOutfitId()); - o.setUrl(tDesignPythonOutfit1.getDesignUrl()); - if (o.getUrl().contains("/")) { - int index = o.getUrl().lastIndexOf("/"); - o.setPictureName(o.getUrl().substring(index + 1)); - } - o.setDesignOutfitUrl(minioUtil.getPreSignedUrl(o.getUrl(), 24 * 60)); - QueryWrapper qw = new QueryWrapper<>(); - qw.lambda().eq(TDesignPythonOutfit::getDesignItemId, o.getDesignItemId()); - List tDesignPythonOutfits = designPythonOutfitMapper.selectList(qw); - if (CollectionUtil.isNotEmpty(tDesignPythonOutfits)) { - TDesignPythonOutfit tDesignPythonOutfit = tDesignPythonOutfits.get(0); - o.setDesignOutfitId(tDesignPythonOutfit.getId()); - } - - QueryWrapper userLikeSortQueryWrapper = new QueryWrapper<>(); - userLikeSortQueryWrapper.lambda().eq(UserLikeSort::getUserLikeId, o.getId()); - List userLikeSorts = userLikeSortMapper.selectList(userLikeSortQueryWrapper); - if (CollectionUtil.isNotEmpty(userLikeSorts)) { - UserLikeSort userLikeSort = userLikeSorts.get(0); - o.setSort(userLikeSort.getSort()); - o.setUserLikeSortId(userLikeSort.getId()); - } - }); - vo.setUserGroupId(userGroupId); - vo.setUserLikeDetails(userLikeVOS); - moduleChooseVO.setDesign(vo); }else if (module.equals(Module.canvas.name())) { CavasModuleChooseVO vo = new CavasModuleChooseVO();