From 0c227a1efa16ad60b37fa1a7cc30aa27c97baf6e Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 15 Oct 2025 18:03:48 +0800 Subject: [PATCH 1/6] =?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 Date: Wed, 15 Oct 2025 18:32:19 +0800 Subject: [PATCH 2/6] =?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 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 Date: Thu, 16 Oct 2025 10:03:57 +0800 Subject: [PATCH 3/6] =?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 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 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 { From 1af705592aceadd76e3a16b963f8d43a7392652d Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 17 Oct 2025 17:59:43 +0800 Subject: [PATCH 4/6] =?UTF-8?q?BUGFIX:1.design=E4=B8=ADdislike=E5=90=8E?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=B7=B7=E4=B9=B1=202.=E7=BB=AD=E8=AE=A2?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E9=80=9A=E7=9F=A5=E4=BC=9A=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=8A=E4=B8=80=E6=AC=A1=E7=9A=84=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CollectionSortServiceImpl.java | 16 ++++++++----- .../service/impl/PaymentInfoServiceImpl.java | 2 ++ .../ai/da/service/impl/StripeServiceImpl.java | 24 ++++++++++++++++--- 3 files changed, 33 insertions(+), 9 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 727cbb72..52964140 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java @@ -269,13 +269,17 @@ public class CollectionSortServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper() + .eq(CollectionSort::getProjectId, projectId) + .orderByAsc(CollectionSort::getSort); + + if (parentId != null) { + wrapper.eq(CollectionSort::getParentId, parentId); + } else { + wrapper.isNull(CollectionSort::getParentId); + } // 2. 查询同组数据，按原排序升序 - List list = baseMapper.selectList( - new LambdaQueryWrapper() - .eq(CollectionSort::getProjectId, projectId) - .eq(CollectionSort::getParentId, parentId) - .orderByAsc(CollectionSort::getSort) - ); + List list = baseMapper.selectList(wrapper); // 3. 重新编号 sort，从 1 开始 for (int i = 0; i < list.size(); i++) { diff --git a/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java b/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java index 9442d076..b39843ce 100644 --- a/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java @@ -27,6 +27,7 @@ import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -224,6 +225,7 @@ public class PaymentInfoServiceImpl extends ServiceImpl qwSI = new QueryWrapper<>(); if (!StringUtil.isNullOrEmpty(subscriptionId)) { - qwSI.eq("subscription_id", subscriptionId); + // 区分当前订阅的时段，从而确定是新订单还是续订订单的记录 + qwSI.lambda().eq(SubscriptionInfo::getSubscriptionId, subscriptionId) + .lt(SubscriptionInfo::getCurrentPeriodStart, secondsTimestamp) + .gt(SubscriptionInfo::getCurrentPeriodEnd, secondsTimestamp); List subscriptionInfoList = subscriptionInfoMapper.selectList(qwSI); if (subscriptionInfoList.isEmpty()){ @@ -1024,7 +1035,9 @@ public class StripeServiceImpl implements StripeService { } } }else if (!StringUtil.isNullOrEmpty(orderNo)) { - qwSI.eq("order_no", orderNo); + qwSI.lambda().eq(SubscriptionInfo::getOrderNo, orderNo) + .gt(SubscriptionInfo::getCurrentPeriodStart, secondsTimestamp) + .lt(SubscriptionInfo::getCurrentPeriodEnd, secondsTimestamp); subscriptionInfo = subscriptionInfoMapper.selectOne(qwSI); if (Objects.isNull(subscriptionInfo)){ log.info("不发送邮件，原因：【根据order_no：{}，查询到的subscriptionInfo为空】", orderNo); @@ -1036,7 +1049,12 @@ public class StripeServiceImpl implements StripeService { } QueryWrapper qwPI = new QueryWrapper<>(); - qwPI.eq("order_no", subscriptionInfo.getOrderNo()).orderByDesc("id"); + String periodStart = DateUtil.changeTimeStampFormat(subscriptionInfo.getCurrentPeriodStart(), "seconds", CommonConstant.TIME_FORMAT_yyyy_MM_dd_HH_mm_ss); + String periodEnd = DateUtil.changeTimeStampFormat(subscriptionInfo.getCurrentPeriodEnd(), "seconds", CommonConstant.TIME_FORMAT_yyyy_MM_dd_HH_mm_ss); + + qwPI.lambda().eq(PaymentInfo::getOrderNo, subscriptionInfo.getOrderNo()) + .between(PaymentInfo::getCreateTime, periodStart, periodEnd) + .orderByDesc(PaymentInfo::getId); List paymentInfos = paymentInfoMapper.selectList(qwPI); if (paymentInfos.isEmpty()) { log.info("不发送邮件，原因：【根据order_no:{},查询到的paymentInfos为空】", orderNo); From e825c9bd752128058da52aba76829629e67007a7 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 22 Oct 2025 10:48:29 +0800 Subject: [PATCH 5/6] =?UTF-8?q?BUGFIX:=E7=94=A8=E6=88=B7=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=AE=A2=E9=98=85=E8=80=85=E5=92=8C=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E6=97=A0=E6=B3=95=E6=94=B6=E5=88=B0=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/AffiliateServiceImpl.java | 2 +- .../ai/da/service/impl/ConvenientInquiryServiceImpl.java | 8 ++------ .../java/com/ai/da/service/impl/StripeServiceImpl.java | 5 +++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java index 8d535cbf..551f86a2 100644 --- a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java @@ -173,7 +173,7 @@ public class AffiliateServiceImpl extends ServiceImpl qwSI = new QueryWrapper<>(); if (!StringUtil.isNullOrEmpty(subscriptionId)) { // 区分当前订阅的时段，从而确定是新订单还是续订订单的记录 @@ -1036,8 +1037,8 @@ public class StripeServiceImpl implements StripeService { } }else if (!StringUtil.isNullOrEmpty(orderNo)) { qwSI.lambda().eq(SubscriptionInfo::getOrderNo, orderNo) - .gt(SubscriptionInfo::getCurrentPeriodStart, secondsTimestamp) - .lt(SubscriptionInfo::getCurrentPeriodEnd, secondsTimestamp); + .lt(SubscriptionInfo::getCurrentPeriodStart, secondsTimestamp) + .gt(SubscriptionInfo::getCurrentPeriodEnd, secondsTimestamp); subscriptionInfo = subscriptionInfoMapper.selectOne(qwSI); if (Objects.isNull(subscriptionInfo)){ log.info("不发送邮件，原因：【根据order_no：{}，查询到的subscriptionInfo为空】", orderNo); From 5efaaf01b299531a793bdf700e55b48f5e20a424 Mon Sep 17 00:00:00 2001 From: xupei Date: Mon, 3 Nov 2025 13:10:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?task:motion=20=E6=9C=AC=E5=9C=B0=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/main/java/com/ai/da/python/PythonService.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 49023702..583388bc 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ log temp/ docker-compose.yml +/src/main/resources/application-local.properties diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 10dad374..83a31a0e 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -4092,9 +4092,11 @@ public class PythonService { content.put("pose_id", String.valueOf(poseId)); RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(content)); - log.info("poseTransformation 请求地址： {}", accessPythonIp + ":" + accessPythonPort + "/api/pose_transform"); +// String uri = "/api/pose_transform"; + String uri = "/api/comfyui_pose_transform"; + log.info("poseTransformation 请求地址： {}", accessPythonIp + ":" + accessPythonPort + uri); Request request = new Request.Builder() - .url(accessPythonIp + ":" + accessPythonPort + "/api/pose_transform") + .url(accessPythonIp + ":" + accessPythonPort + uri) .method("POST", body) .addHeader("Content-Type", "application/json") .build();