Commit Graph

373 Commits

Author SHA1 Message Date
litianxiang
d837f0dc78 Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge
# Conflicts:
#	src/main/java/com/ai/da/service/WorkspaceService.java
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
#	src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
2025-10-02 00:41:04 +08:00
litianxiang
ab6cc04483 为模特和线稿设置性别
修改设置模特会增多问题
模型更换
设置可以切换男女兼容
TODO:扣除积分价格
转产品图模型未完成
2025-09-30 17:22:23 +08:00
dab253c313 BUGFIX:检查所有异常提示的语言是否都做了多语言 2025-09-24 14:21:07 +08:00
d59a69e6f4 切换dev环境的谷歌登录相关配置 2025-09-19 14:08:52 +08:00
litianxiang
950707ab44 Merge remote-tracking branch 'origin/dev-ltx' into dev/3.1_release_merge 2025-09-17 16:45:56 +08:00
litianxiang
b0e5f39765 perf:减少/api/project/getModuleContent数据库交互次数以优化速度 2025-09-17 16:14:08 +08:00
106528ce08 TASK: 教育管理员账号到期后降为游客并移除所有子账号 2025-09-16 17:01:18 +08:00
e3b0d3bc0a BUGFIX:1. 新建的教育管理员无法登录、无法分配积分
2. 填写个人信息时会覆盖其他人的信息
TASK:教育用户不能通过个人版登录入口登录
2025-09-10 22:05:45 +08:00
d5a74c1ff3 新建子账号 默认密码修改 2025-09-09 12:04:37 +08:00
f20a85a0e2 Google 回调地址修改 2025-09-07 20:52:49 +08:00
c67d197da0 BUGFIX:无法通过谷歌登录/教育管理员无法查看design使用频次 2025-09-03 18:15:23 +08:00
136bcdf82b 切换正式支付环境 2025-09-02 20:13:37 +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
18c38b020e TASK:默认积分分配改为平均分配;超级管理员可新增教育、企业管理员账户;组织成员使用积分时需要记录creditsUsage;试用用户初始50积分 2025-08-26 23:53:40 +08:00
83ba69c950 BUGFIX:子账号批量导入、brand dna返回计算时间、按权限范围查询design频次 2025-08-26 15:49:02 +08:00
9a650afc7d TASK:优化查询子账号design试用频次,根据管理员身份限定查询范围 2025-08-26 14:10:28 +08:00
e4ce7e9e63 TASK:获取affiliate的用户名和id;BUGFIX:模特无法保存 2025-08-21 13:22:22 +08:00
81c417ed76 BUGFIX:1、子账号查询,无法批量根据用户名或邮箱查
2、教育版子账号创建及修改涉及的积分问题
2025-08-20 16:40:44 +08:00
caa9985d11 TASK: 1.affiliate 新增referral新增、查询、修改以及其他相关的自动结算佣金的功能;2.删除affiliate_income表及相关mapper 2025-08-19 17:44:34 +08:00
45d6af92e8 BUGFIX:1、教育通过上传文件批量创建子账号没有任何校验
2、下载子账号所有信息接口缺失(原下载模板接口保留)
3、保存个人模特到collection时类型设置为System
4、创建子账号时设置积分无效
2025-08-15 17:44:45 +08:00
132f48eb60 CONFIG:dev添加死信队列信息 2025-08-01 11:29:47 +08:00
e16268a013 TASK: 邮件模板 2025-07-31 18:20:43 +08:00
6495bb2be3 TASK:语言适配 2025-07-02 19:02:39 +08:00
4273d0efc0 BUGFIX: 系列设计 修改模特后,原模特丢失问题 2025-06-30 19:32:16 +08:00
443b557623 BUGFIX:1、design 渐变色没存 2、展示文本更新 3、取消拼贴图入参日志打印 2025-06-25 17:10:56 +08:00
d6c5d0e95d TASK:查询交易记录 添加显示总金额和付款者邮箱 2025-06-23 10:53:30 +08:00
f5501db19e TASK: 接入第三方api 添加access key 2025-06-06 09:56:02 +08:00
shahaibo
448e6d2c40 TASK:mannequin; 2025-05-30 13:08:19 +08:00
shahaibo
131d782b54 TASK:test; 2025-05-30 11:49:10 +08:00
shahaibo
b6a7354322 TASK:mannequin; 2025-05-28 13:59:52 +08:00
shahaibo
6e96f38c90 TASK:mannequin; 2025-05-28 13:59:00 +08:00
eae4087b3e Stripe支付--添加推广码功能及相应佣金计算
(cherry picked from commit 0ba28588da)
2025-05-19 17:13:28 +08:00
6c625de936 Merge branch 'dev/dev_xp' into dev/dev 2025-05-19 14:04:40 +08:00
aeb372bc17 TASK:企业、教育版library元素共享、作品广场作品发布到公共gallery 2025-05-19 14:02:42 +08:00
shahaibo
59ffa38ff7 TASK:LLM; 2025-05-18 12:46:12 +08:00
shahaibo
eea57435e5 TASK:minio地址修改; 2025-05-07 22:04:10 +08:00
shahaibo
1240a57405 TASK:模块化; 2025-04-25 11:01:06 +08:00
shahaibo
a9acc83bdf TASK:模块化; 2025-04-25 10:19:12 +08:00
shahaibo
604c57c208 TASK:模块化; 2025-04-22 15:59:08 +08:00
shahaibo
b19bbf91f2 TASK:模块化; 2025-04-22 11:24:28 +08:00
shahaibo
0a4d6ff13b TASK:模块化; 2025-04-21 18:51:43 +08:00
shahaibo
acb37bc255 TASK:模块化; 2025-04-17 16:07:50 +08:00
2269662290 Stripe支付测试--切换支付方式配置 2025-04-15 11:20:03 +08:00
eaec1e4177 Stripe支付测试--切换支付环境 2025-04-15 10:38:10 +08:00
eaff87882e Merge branch 'dev/dev_xp' into dev/dev 2025-04-15 10:23:30 +08:00
0ba28588da Stripe支付--添加推广码功能及相应佣金计算 2025-04-15 10:22:45 +08:00
25f64831f3 Merge branch 'dev/dev_xp' into dev/dev 2025-04-14 15:20:32 +08:00
77a06e0edd bugfix:account mapper count 去重问题 2025-04-14 14:58:23 +08:00