diff --git a/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java b/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java index 764ccdb2..fa3a6df0 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java @@ -75,7 +75,7 @@ public class CollectionElement implements Serializable { */ private String md5; -// private String gradientString; + private String gradientString; /** * 创建时间 diff --git a/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java index bfba71d1..969c306b 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetail.java @@ -64,7 +64,7 @@ public class DesignItemDetail implements Serializable { */ private String color; -// private String gradientString; + private String gradientString; /** * 对应的print图片的绝对路径 diff --git a/src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java b/src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java index 2bffc94a..9edb56a0 100644 --- a/src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java +++ b/src/main/java/com/ai/da/model/enums/PrintboardLevel2TypeEnum.java @@ -3,9 +3,10 @@ package com.ai.da.model.enums; import com.fasterxml.jackson.annotation.JsonValue; public enum PrintboardLevel2TypeEnum implements IEnumDisplay { - SLOGAN("标语", "Slogan"), + PATTERN("图案", "Pattern"), LOGO("标志", "Logo"), - PATTERN("图案", "Pattern"); + SLOGAN("标语", "Slogan") + ; private final String chinese; private final String english; diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 10b547c7..8bced01d 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -783,10 +783,10 @@ public class CollectionElementServiceImpl extends ServiceImpl impleme d.setPath(minioUtil.getPresignedUrl(o.getPath(), 24 * 60)); d.setMinIOPath(o.getPath()); d.setLevel1Type(converTypeToLevel1(o.getType())); -// d.setGradient(JSONObject.parseObject(o.getGradientString(), Gradient.class)); + d.setGradient(JSONObject.parseObject(o.getGradientString(), Gradient.class)); // 根据designItemDetailId获取印花 List prints = designItemDetailPrintService.getByDesignItemDetailId(o.getId(), "print"); // 判断有无印花 diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java index d3c91007..2e89c857 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -1,5 +1,6 @@ package com.ai.da.service.impl; +import com.ai.da.common.config.exception.BusinessException; import com.ai.da.common.context.UserContext; import com.ai.da.common.response.PageBaseResponse; import com.ai.da.common.response.Response; @@ -20,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.base.Function; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; @@ -165,6 +167,16 @@ public class PortfolioServiceImpl extends ServiceImpl designItemDetailQueryWrapper = new QueryWrapper<>(); - designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, designItemOld); + designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, designItemIdOld); List designItemDetailListOld = designItemDetailMapper.selectList(designItemDetailQueryWrapper); for (DesignItemDetail designItemDetailOld : designItemDetailListOld) { Long designItemDetailIdOld = designItemDetailOld.getId(); + designItemDetailOld.setId(null); designItemDetailOld.setAccountId(-1L); designItemDetailOld.setDesignId(-1L); designItemDetailOld.setDesignItemId(designItemIdNew); @@ -216,6 +218,7 @@ public class PortfolioServiceImpl extends ServiceImpl designItemDetailPrintQueryWrapper = new QueryWrapper<>(); designItemDetailPrintQueryWrapper.lambda().eq(DesignItemDetailPrint::getDesignItemDetailId, designItemDetailIdOld); DesignItemDetailPrint designItemDetailPrint = designItemDetailPrintMapper.selectOne(designItemDetailPrintQueryWrapper); + designItemDetailPrint.setId(null); designItemDetailPrint.setDesignItemDetailId(designItemDetailIdNew); designItemDetailPrintMapper.insert(designItemDetailPrint); } @@ -431,9 +434,18 @@ public class PortfolioServiceImpl extends ServiceImpl userLikeGroupQueryWrapper = new QueryWrapper<>(); + userLikeGroupQueryWrapper.lambda().eq(UserLikeGroup::getCollectionId, portfolio.getCollectionId()); + UserLikeGroup userLikeGroup = userLikeGroupMapper.selectOne(userLikeGroupQueryWrapper); + Long portfolioUserLikeGroupId = userLikeGroup.getId(); + if (Objects.isNull(userLikeGroup)) { + throw new BusinessException(""); + } +// UserLikeGroup userLikeGroup = userLikeGroupMapper.selectById(); UserLikeGroup userLikeGroupNew = userLikeGroup.setId(null); userLikeGroupNew.setAccountId(authPrincipalVo.getId()); Long collectionIdOld = userLikeGroup.getCollectionId(); @@ -479,7 +491,8 @@ public class PortfolioServiceImpl extends ServiceImpl userLikeList = userLikeService.getUserLikeList(portfolioDTO.getUserLikeGroupId()); + + List userLikeList = userLikeService.getUserLikeList(portfolioUserLikeGroupId); for (UserLike userLike : userLikeList) { Long designOutfitIdOld = userLike.getDesignOutfitId(); @@ -498,7 +511,7 @@ public class PortfolioServiceImpl extends ServiceImpl designItemDetailQueryWrapper = new QueryWrapper<>(); - designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, designItemOld); + designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, designItemIdOld); List designItemDetailListOld = designItemDetailMapper.selectList(designItemDetailQueryWrapper); for (DesignItemDetail designItemDetailOld : designItemDetailListOld) { Long designItemDetailIdOld = designItemDetailOld.getId(); + designItemDetailOld.setId(null); designItemDetailOld.setAccountId(authPrincipalVo.getId()); designItemDetailOld.setDesignId(design.getId()); designItemDetailOld.setDesignItemId(designItemIdNew); @@ -534,6 +548,7 @@ public class PortfolioServiceImpl extends ServiceImpl