Commit Graph

292 Commits

Author SHA1 Message Date
9110e0dd34 dev环境暂时不上生产的变更 2025-09-26 21:46:49 +08:00
dab253c313 BUGFIX:检查所有异常提示的语言是否都做了多语言 2025-09-24 14:21:07 +08:00
814324430c dev切换到prod,部分功能不上传 2025-09-23 17:34:08 +08:00
24fe265172 BUGFIX:1.微信注册后绑定邮箱失败;2.按类别查项目历史记录 2025-09-23 14:48:44 +08:00
5bac740efd TASK: Affiliate审批通过后,邮件中添加邀请链接 2025-09-16 11:20:09 +08:00
c922563919 TASK: Affiliate审批通过后,邮件中添加邀请链接 2025-09-12 16:25:34 +08:00
a59acb0903 BUGFIX: 2025-09-02 20:09:37 +08:00
179b79812a release 3.1 dev与prod代码合并冲突处理 2025-08-31 22:02:28 +08:00
94cf82340a Merge branch 'release/3.1' into dev/3.1_release_merge
# Conflicts:
#	src/main/java/com/ai/da/common/config/MyTaskScheduler.java
#	src/main/java/com/ai/da/common/enums/ProductEnum.java
#	src/main/java/com/ai/da/common/task/PaymentTask.java
#	src/main/java/com/ai/da/common/utils/LocalCacheUtils.java
#	src/main/java/com/ai/da/common/utils/RedisUtil.java
#	src/main/java/com/ai/da/controller/AffiliateController.java
#	src/main/java/com/ai/da/controller/ConvenientInquiryController.java
#	src/main/java/com/ai/da/controller/StripeController.java
#	src/main/java/com/ai/da/mapper/primary/entity/Library.java
#	src/main/java/com/ai/da/mapper/primary/entity/ProductCoupons.java
#	src/main/java/com/ai/da/model/dto/CreateCouponDTO.java
#	src/main/java/com/ai/da/model/vo/CheckCouponsVO.java
#	src/main/java/com/ai/da/service/AffiliateService.java
#	src/main/java/com/ai/da/service/PaymentInfoService.java
#	src/main/java/com/ai/da/service/StripeService.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
#	src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
#	src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
#	src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/java/com/ai/da/service/impl/PaymentInfoServiceImpl.java
#	src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
#	src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties
2025-08-31 17:54:44 +08:00
35604e5130 BUGFIX:超管创建机构管理员 2025-08-27 10:15:59 +08:00
18c38b020e TASK:默认积分分配改为平均分配;超级管理员可新增教育、企业管理员账户;组织成员使用积分时需要记录creditsUsage;试用用户初始50积分 2025-08-26 23:53:40 +08:00
3cc329f983 param change 2025-08-26 14:49:43 +08:00
23523f73da TASK:教育版子账号积分刷新策略更新 2025-08-25 18:07:37 +08:00
e45d572078 TASK:Stripe订阅,添加月付(经济版)及相应费用、积分的更新 2025-08-25 15:02:34 +08:00
6a5282e4d5 BUGFIX:将已存在的账号添加到子账号中,积分计算混乱 2025-08-21 16:03:24 +08:00
156fcfae6b Merge branch 'dev/dev_xp' into dev/dev 2025-08-20 18:02:18 +08:00
7436fa17c0 TASK:添加接口说明 2025-08-20 18:01:28 +08:00
d9f19f1728 Merge branch 'dev/dev_xp' into dev/dev 2025-08-20 16:41:14 +08:00
81c417ed76 BUGFIX:1、子账号查询,无法批量根据用户名或邮箱查
2、教育版子账号创建及修改涉及的积分问题
2025-08-20 16:40:44 +08:00
59a3015170 TASK:查affiliate列表接口添加参数校验;打开佣金计算定时器 2025-08-20 09:37:35 +08:00
caa9985d11 TASK: 1.affiliate 新增referral新增、查询、修改以及其他相关的自动结算佣金的功能;2.删除affiliate_income表及相关mapper 2025-08-19 17:44:34 +08:00
c28db81893 BUGFIX:同一浏览器切换版本登录时,密码被置空 2025-08-13 16:45:30 +08:00
020cfe9016 TASK:design single中添加单件衣服画布保存 2025-07-29 13:12:20 +08:00
c4d20cd522 TASK: 1、印花生成允许使用flux
2、修改sketch\print允许修改上传的元素
3、印花生成结果中添加level2Type
2025-07-23 16:59:41 +08:00
785ae33e86 BUGFIX: 旧作品中有的没有项目id 2025-07-17 17:34:03 +08:00
20f7dc0ef9 TASK:作品更新接口,将通过projectId替换userLikeGroupId 2025-07-17 17:21:14 +08:00
301f58bc62 TASK: 拼贴功能保存用户上传的图片并返回 2025-07-15 18:11:12 +08:00
daa88889d0 TASK:1、印花允许修改并保存
BUGFIX: 1、批量生成有的类型没有任务开始执行时间,任务结束时间有误
2025-07-10 17:50:31 +08:00
c7c69417ef TASK: 1、更换pose,重新生成templateId
2、brandDNA 开启分析attributes功能
2025-07-09 17:01:53 +08:00
ec44c2a6b5 TASK: 1、默认不like的元素,如有parentId,需要回传
2、project查询 需要按id查
2025-07-08 13:54:27 +08:00
1f77500d61 TASK:product/relight/pose transfer的入参添加是否需要默认like 2025-07-08 11:39:05 +08:00
0a2c5e028f BUGFIX:对项目进行各种生成修改时没有更新项目更新时间 2025-07-07 11:53:50 +08:00
4379b9cff1 BUGFIX:design中的排序问题 倒序问题 再次修改 2025-07-04 19:08:59 +08:00
1b7c2041be BUGFIX:design中的排序问题 2025-07-04 17:20:35 +08:00
d76a9e6afd 1、design流程中使用to product、relight、pose transfer默认加到like
2、万象的pose transfer结果存到redis
2025-07-04 12:02:05 +08:00
13514b277b BUGFIX:用户注册后重发验证码,验证不通过 2025-06-24 19:30:20 +08:00
shahaibo
df5bbc3675 TASK: 结果返回parentId; 2025-06-20 13:50:29 +08:00
3f13f64ab9 Merge branch 'dev/dev_xp' into dev/dev 2025-06-17 14:43:10 +08:00
5abe45ff34 TASK: 当选择童装时,sketch生成和to product的prompt需添加儿童限定词 2025-06-17 14:41:27 +08:00
shahaibo
0970127f68 TASK: collection sort; 2025-06-17 10:10:00 +08:00
shahaibo
8b0f9cfd11 TASK: cloud、posetransfer、sort; 2025-06-16 16:53:50 +08:00
78239d3ead Merge branch 'dev/dev_xp' into dev/dev 2025-06-13 16:41:15 +08:00
174d1bf0d0 TASK:1、将imageToSketch接口调用转为异步 2、imageToSketch加入flux 2025-06-13 16:37:45 +08:00
be42550d0a Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
#	src/main/java/com/ai/da/model/dto/ToProductImageDTO.java
2025-06-12 16:54:15 +08:00
6e32289b98 TASK:Flux接入,应用于to product image和relight 2025-06-12 16:50:27 +08:00
shahaibo
9586be40ce TASK:3d print; 2025-06-12 13:50:04 +08:00
shahaibo
290f6a9a35 BUGFIX:library ageGroup切换; 2025-06-11 11:37:29 +08:00
4b7fd649a3 TASK: 推广码 添加开始生效时间;优化数据计算类型,使用BigDecimal替换float;更新paidCommission后自动计算unpaidCommission 2025-06-06 19:37:38 +08:00
shahaibo
df678a12b9 TASK:cloud; 2025-06-06 11:57:10 +08:00
shahaibo
054c9fd604 TASK:cloud; 2025-06-06 10:46:57 +08:00