From 0c227a1efa16ad60b37fa1a7cc30aa27c97baf6e Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 15 Oct 2025 18:03:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?BUGFIX:=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/service/impl/CollectionSortServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java
index afb355bf..727cbb72 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java
@@ -227,8 +227,8 @@ public class CollectionSortServiceImpl extends ServiceImpl<CollectionSortMapper,
         }
         child.setSort(collectionSort.getSort());
         // 原来排序的大于等于userLikeSortId的排序的，都要＋1
-//        baseMapper.increaseGenerateSortAbove(parentId, /*relationType,*/ collectionSort.getSort() - 1);
-        resort(collectionSort.getProjectId(), parentId);
+        baseMapper.increaseGenerateSortAbove(parentId, /*relationType,*/ collectionSort.getSort() - 1);
+//        resort(collectionSort.getProjectId(), parentId);
         // 当前的生成结果则填入userLikeSortId的排序位置
         child.setUpdateTime(LocalDateTime.now());
         baseMapper.updateById(child);

From a3e63c9877cfc7cb0ab99935c9c36f8725a5bf0d Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 15 Oct 2025 18:32:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?BUGFIX:=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
index 770aa0e0..a4a8f628 100644
--- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
@@ -2554,7 +2554,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         if (Objects.nonNull(poseTransformDTO.getParentId())
                 && !poseTransformDTO.getParentId().equals(0L)) {
             return disOrLikePose(poseTransformationId, "like",
-                    poseTransformDTO.getProjectId(), poseTransformDTO.getParentId());
+                    poseTransformDTO.getProjectId(), poseTransformDTO.getUserLikeSortId());
         }
         return null;
     }

From cd74022d04acccd7d801dc87a077574e8e620086 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Thu, 16 Oct 2025 10:03:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?BUGFIX:generateLike=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B9=B4=E9=BE=84=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java       | 3 +++
 .../java/com/ai/da/service/impl/GenerateServiceImpl.java     | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java b/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java
index 58734272..9e76dae3 100644
--- a/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java
+++ b/src/main/java/com/ai/da/model/dto/GenerateLikeDTO.java
@@ -22,6 +22,9 @@ public class GenerateLikeDTO {
     @ApiModelProperty("当一级类型为Sketchboard时，二级类型 Outwear Dress Blouse Skirt Trousers；当一级类型为Printboard时，二级类型 Slogan Logo Pattern")
     private String level2Type;
 
+    @ApiModelProperty("年龄段")
+    private String ageGroup;
+
     @ApiModelProperty("性别")
     private String gender;
 
diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
index a4a8f628..5e7243ea 100644
--- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
@@ -521,7 +521,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         // 2.2、添加到library
         AuthPrincipalVo userInfo = UserContext.getUserHolder();
         Long accountId = userInfo.getId();
-        Library library = setLibrary(accountId, generateLikeDTO, generateDetail.getUrl());
+        Library library = setLibrary(accountId, generateLikeDTO, generateDetail.getUrl(), generateLikeDTO.getAgeGroup());
         libraryService.save(library);
 
         // 3、更新generateDetail表的isLike列和libraryId列
@@ -555,12 +555,13 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         return Boolean.TRUE;
     }
 
-    public Library setLibrary(Long accountId, GenerateLikeDTO generateLikeDTO, String imageUrl) {
+    public Library setLibrary(Long accountId, GenerateLikeDTO generateLikeDTO, String imageUrl, String ageGroup) {
         Library library = new Library();
         library.setAccountId(accountId);
         library.setLevel1Type(generateLikeDTO.getLevel1Type());
         library.setLevel2Type(StringUtil.isNullOrEmpty(generateLikeDTO.getLevel2Type()) ? null : generateLikeDTO.getLevel2Type());
         library.setLevel3Type(StringUtil.isNullOrEmpty(generateLikeDTO.getGender()) ? null : generateLikeDTO.getGender());
+        library.setAgeGroup(ageGroup);
         library.setName(DateUtil.getTimeStamp(generateLikeDTO.getTimeZone()) + "_N_G");
         library.setUrl(imageUrl);
         try {