Commit Graph

426 Commits

Author SHA1 Message Date
6e98f295c5 Merge branch 'dev/3.1_release_merge' into temp_PromotionCode 2026-05-04 11:07:26 +08:00
cf02b59722 TASK:Stripe支付模块重构-逻辑优化与完善、Stripe版本升级 2026-04-29 17:16:48 +08:00
litianxiang
6b5bacc49b GlobalAward返回最大的参赛者编号 2026-04-13 14:34:05 +08:00
litianxiang
029b96ae99 GlobalAward下载到浏览器 2026-04-13 11:47:20 +08:00
litianxiang
14002e7331 GlobalAward下载补充和数量接口 2026-04-13 10:22:43 +08:00
72602eb245 BUGFIX 2026-04-10 22:51:00 +08:00
f3aeeb3584 DEBUG 2026-04-10 22:21:56 +08:00
litianxiang
0646484fba 按编号导出参赛选手文件 2026-02-09 10:21:40 +08:00
litianxiang
d1123aedcc fix:导出为页面下载 2026-02-04 14:45:11 +08:00
litianxiang
1decd8e258 参赛选手加入编号,增加导出功能 2026-02-04 13:41:09 +08:00
a526b122d1 Merge branch 'release/3.1' into dev/3.1_release_merge 2026-01-23 15:11:45 +08:00
litianxiang
6db0afd515 GlobalAward保存成功发送站内信,根据url可跳转且召回已填写资料 2026-01-21 14:59:41 +08:00
litianxiang
b1e6183dd1 GlobalAward接口token验证,id更换为uuid 2026-01-21 14:34:43 +08:00
30d08356c0 Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2026-01-21 14:14:17 +08:00
64cc29f456 TASK:Global Award邮箱验证 2026-01-21 14:13:33 +08:00
litianxiang
40518cab37 Merge remote-tracking branch 'origin/dev/3.1_release_merge' into dev-ltx
# Conflicts:
#	src/main/java/com/ai/da/controller/GlobalAwardController.java
#	src/main/java/com/ai/da/model/dto/ContestantDTO.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application-prod.properties
2026-01-20 16:20:41 +08:00
litianxiang
46d61cb73f GlobalAward上传文件 2026-01-20 15:58:27 +08:00
d7edc166b3 TASK:Global Award邮箱验证 2026-01-20 13:14:50 +08:00
litianxiang
7b619aa4cb GlobalAward首次提交 2026-01-16 16:37:03 +08:00
litianxiang
401910901a Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge
# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java
2026-01-15 17:21:30 +08:00
litianxiang
3f5ce6e0e7 接口SegAnything返回值处理 2026-01-15 17:17:08 +08:00
litianxiang
c5e27cd220 Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge 2026-01-14 13:55:01 +08:00
litianxiang
112e9c3bc9 对接前端和py接口SegAnything 2026-01-14 13:31:33 +08:00
72ad977dcb BUGFIX: 获取近期新用户图表数据允许userType为null 2026-01-12 11:55:43 +08:00
9f523d5953 TASK:分页获取所有用户id,添加按邮箱模糊查询 2026-01-07 11:26:39 +08:00
e64add14af BUGFIX:更新订阅计划时根据业务需要对参数进行判断并在需要时更新管理员信息 2026-01-06 17:29:33 +08:00
3beb27e491 TASK:获取用户id信息做分页;订阅计划添加国家或地区字段 2026-01-06 09:56:21 +08:00
ca7121dcda BUGFIX:订阅计划 2025-12-16 16:24:52 +08:00
81c0d7eeac TASK:订阅计划相关 2025-12-15 18:30:28 +08:00
ce3516916d CONFIG: 2025-12-11 16:18:37 +08:00
0692b29065 Merge branch 'dev/dev_xp' into dev/3.1_release_merge
# Conflicts:
#	src/main/java/com/ai/da/controller/AccountController.java
2025-12-11 16:12:41 +08:00
94cafbd10c TASK:flux积分不足,邮件通知 2025-12-11 16:07:14 +08:00
5c2008ec4a TASK:订阅计划,测试修改 2025-12-11 15:26:20 +08:00
litianxiang
9c19d061be fix:升级swagger注解 2025-12-11 10:35:08 +08:00
7f094265da TASK:新增订阅计划概念 2025-12-11 09:44:25 +08:00
litianxiang
a2ff345da5 升级JDK到21 2025-11-25 16:46:05 +08:00
litianxiang
9166bf1a1a Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge 2025-11-20 10:50:17 +08:00
litianxiang
b86f3c9f7e 1.fix:高级工具转产品图不需要也没有ageGroup,会导致报错
2.上传sketch模板代码
2025-11-20 10:48:36 +08:00
2f3fa695b2 BUGFIX: 解决部分循环注入问题 2025-11-18 10:27:29 +08:00
88ce191950 TASK:1.订阅成功和续签成功,通知商家的邮件中添加邮件和国家 2.在getModuleContent的回参中添加motion相关数据 3.修改Affiliate账号状态与修改佣金比例接口合并 2025-11-14 14:51:30 +08:00
3886aeaa46 Merge branch 'dev/dev_xp' into dev/3.1_release_merge
# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
2025-11-13 13:41:31 +08:00
8750ea355a TASK:1.修改affiliate状态 2.添加系统sketch到个人library 3.视频生成新增生成模型 4.获取所有pose,从过去gif改为获取video 2025-11-13 11:40:37 +08:00
42aed5804b BUGFIX:1.生成的图案在design时未加入到library
2.获取组织名时出现空字符串
TASK:1. 允许超级管理员按组织名查询用户design频次
2025-10-08 21:04:19 +08:00
c00c2e738b BUGFIX:1.查询组织接口完善 2.设置默认的二级印花分类 3.教育管理员登录时过期处理 2025-10-06 18:09:11 +08:00
1d006342fb BUGFIX:创建优惠券设置开始结束时间失败;开启stripe模块的接口文档 2025-09-23 16:24:00 +08:00
9386a2c6c4 隐藏检查管理员账号到期接口 2025-09-17 17:49:48 +08:00
106528ce08 TASK: 教育管理员账号到期后降为游客并移除所有子账号 2025-09-16 17:01:18 +08:00
5f5f2c83d7 管理员允许查看各功能使用数据表 2025-09-09 18:49:08 +08:00
4c5d8d3c61 修改管理员页面权限校验 2025-09-09 17:32:12 +08:00
de16437d08 BUGFIX:1. 所有作品中无法查看个人刚发布的作品
2. 100月付用户的邮件中续订金额不对,发送给商家的邮件中夹杂中文
3. 推广码没有截止有效期时使用该推广码报错
2025-09-04 18:29:52 +08:00