aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,177 Commits 15 Branches 0 Tags
2f59fe074fd7565f9cc23350be1da7d881315838
Commit Graph

323 Commits

Author SHA1 Message Date
xupei
652f82b6a4 Merge branch 'dev/dev_xp' into dev/3.1_release_merge 2026-01-22 13:56:44 +08:00
xupei
7ca2528dcf BUGFIX: design后未存储undivided layers 2026-01-22 13:56:07 +08:00
litianxiang
b1e6183dd1 GlobalAward接口token验证，id更换为uuid 2026-01-21 14:34:43 +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
xupei
d7edc166b3 TASK:Global Award邮箱验证 2026-01-20 13:14:50 +08:00
litianxiang
5bae785a9f Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge 2026-01-16 16:37:49 +08:00
litianxiang
7b619aa4cb GlobalAward首次提交 2026-01-16 16:37:03 +08:00
xupei
39d8c7efcf TASK:取消存储/返回UndividedLayer和UndividedLayerWithSinglePrint字段 2026-01-15 17:35:55 +08:00
xupei
5bbf1326bb TASK:design single部分cv操作前置，新增merge | default两种designType 2026-01-14 14:26:47 +08:00
litianxiang
6400e79929 Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge 2026-01-09 14:49:25 +08:00
litianxiang
dd8c72f7d7 切换用户sketch点赞记录存储方式；新增镜像和角度字段，存储前端需要的object 2026-01-09 10:14:46 +08:00
xupei
13151b65f5 TASK:限制同一个管理员不允许绑定不同组织的订阅计划 2026-01-07 15:24:38 +08:00
xupei
3beb27e491 TASK：获取用户id信息做分页；订阅计划添加国家或地区字段 2026-01-06 09:56:21 +08:00
xupei
8e984eb283 BUGFIX:订阅计划 2025-12-17 13:18:24 +08:00
xupei
da84e1e4b4 注解修改 2025-12-15 18:39:16 +08:00
xupei
95a9c81a1b Merge branch 'dev/dev_xp' into dev/3.1_release_merge 
# Conflicts:
#	src/main/java/com/ai/da/model/dto/SubscriptionPlanDTO.java
#	src/main/java/com/ai/da/model/vo/SubscriptionPlanVO.java
 2025-12-15 18:34:30 +08:00
xupei
81c0d7eeac TASK:订阅计划相关 2025-12-15 18:30:28 +08:00
litianxiang
9f48a2ce09 fix：升级swagger注解 2025-12-15 13:38:44 +08:00
xupei
7f094265da TASK:新增订阅计划概念 2025-12-11 09:44:25 +08:00
litianxiang
a2ff345da5 升级JDK到21 2025-11-25 16:46:05 +08:00
xupei
f36e0488ea TASK: video生成成功后添加站内信通知 2025-11-17 16:55:45 +08:00
xupei
f239c8c02b TASK: 订阅或试用用户账号到期邮件通知 2025-11-14 18:08:40 +08:00
xupei
88ce191950 TASK:1.订阅成功和续签成功，通知商家的邮件中添加邮件和国家 2.在getModuleContent的回参中添加motion相关数据 3.修改Affiliate账号状态与修改佣金比例接口合并 2025-11-14 14:51:30 +08:00
xupei
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
xupei
8750ea355a TASK:1.修改affiliate状态 2.添加系统sketch到个人library 3.视频生成新增生成模型 4.获取所有pose，从过去gif改为获取video 2025-11-13 11:40:37 +08:00
xupei
cd74022d04 BUGFIX:generateLike添加年龄段 2025-10-16 10:03:57 +08:00
xupei
ebb19ea15e BUGFIX:漏传 2025-10-09 15:18:05 +08:00
xupei
42aed5804b BUGFIX:1.生成的图案在design时未加入到library 
2.获取组织名时出现空字符串
TASK:1. 允许超级管理员按组织名查询用户design频次
 2025-10-08 21:04:19 +08:00
litianxiang
ad2bb7062e Merge remote-tracking branch 'origin/release/3.1' into dev-ltx 2025-10-08 13:09:39 +08:00
xupei
c00c2e738b BUGFIX:1.查询组织接口完善 2.设置默认的二级印花分类 3.教育管理员登录时过期处理 2025-10-06 18:09:11 +08:00
xupei
9110e0dd34 dev环境暂时不上生产的变更 2025-09-26 21:46:49 +08:00
xupei
dab253c313 BUGFIX:检查所有异常提示的语言是否都做了多语言 2025-09-24 14:21:07 +08:00
xupei
814324430c dev切换到prod,部分功能不上传 2025-09-23 17:34:08 +08:00
xupei
24fe265172 BUGFIX:1.微信注册后绑定邮箱失败；2.按类别查项目历史记录 2025-09-23 14:48:44 +08:00
xupei
5bac740efd TASK: Affiliate审批通过后，邮件中添加邀请链接 2025-09-16 11:20:09 +08:00
xupei
c922563919 TASK: Affiliate审批通过后，邮件中添加邀请链接 2025-09-12 16:25:34 +08:00
xupei
a59acb0903 BUGFIX: 2025-09-02 20:09:37 +08:00
xupei
179b79812a release 3.1 dev与prod代码合并冲突处理 2025-08-31 22:02:28 +08:00
xupei
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
xupei
35604e5130 BUGFIX:超管创建机构管理员 2025-08-27 10:15:59 +08:00
xupei
18c38b020e TASK:默认积分分配改为平均分配；超级管理员可新增教育、企业管理员账户；组织成员使用积分时需要记录creditsUsage；试用用户初始50积分 2025-08-26 23:53:40 +08:00
xupei
3cc329f983 param change 2025-08-26 14:49:43 +08:00
xupei
23523f73da TASK:教育版子账号积分刷新策略更新 2025-08-25 18:07:37 +08:00
xupei
e45d572078 TASK:Stripe订阅，添加月付（经济版）及相应费用、积分的更新 2025-08-25 15:02:34 +08:00
xupei
6a5282e4d5 BUGFIX:将已存在的账号添加到子账号中，积分计算混乱 2025-08-21 16:03:24 +08:00
xupei
156fcfae6b Merge branch 'dev/dev_xp' into dev/dev 2025-08-20 18:02:18 +08:00
xupei
7436fa17c0 TASK:添加接口说明 2025-08-20 18:01:28 +08:00
xupei
d9f19f1728 Merge branch 'dev/dev_xp' into dev/dev 2025-08-20 16:41:14 +08:00
xupei
81c417ed76 BUGFIX:1、子账号查询，无法批量根据用户名或邮箱查 
2、教育版子账号创建及修改涉及的积分问题
 2025-08-20 16:40:44 +08:00