|
|
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 |
|
|
|
c649907222
|
数据迁移代码
|
2025-08-31 14:16:08 +08:00 |
|
|
|
c93ae85b65
|
BUGFIX: 1、singleDesign使用generate的印花没有传minio导致出现错误
2、项目中没有保存生成和上传的印花的类型
|
2025-08-29 14:18:17 +08:00 |
|
|
|
6441bfbbba
|
BUGFIX: 子账号信息无法正确导出为excel
|
2025-08-28 19:22:55 +08:00 |
|
|
|
933522482b
|
TASK:审批affiliate
|
2025-08-28 14:01:48 +08:00 |
|
|
|
56b56981b1
|
TASK:便利查询，查询所有用户id时根据用户身份限定查询范围
|
2025-08-28 11:29:30 +08:00 |
|
|
|
9e2ea2de62
|
TASK:导出数据时添加校验
|
2025-08-27 17:40:05 +08:00 |
|
|
|
7005b75e11
|
TASK:导出数据时添加校验
|
2025-08-27 15:24:43 +08:00 |
|
|
|
5b09d2cbf5
|
BUGFIX:查询design使用情况数据不对
|
2025-08-27 14:57:15 +08:00 |
|
|
|
126ac209c6
|
BUGFIX:普通生成积分扣除有误
|
2025-08-27 14:15:58 +08:00 |
|
|
|
98eb29eeb5
|
BUGFIX:普通生成积分扣除有误
|
2025-08-27 13:44:32 +08:00 |
|
|
|
ee551a0be2
|
BUGFIX:编辑子账号邮箱时积分回流策略有漏洞
|
2025-08-27 11:41:07 +08:00 |
|
|
|
c3cbb61c16
|
BUGFIX:积分扣除失败
|
2025-08-27 11:22:08 +08:00 |
|
|
|
71f0293cd9
|
BUGFIX:修改用户邮箱异常时事务没回滚
|
2025-08-27 10:39:46 +08:00 |
|
|
|
35604e5130
|
BUGFIX:超管创建机构管理员
|
2025-08-27 10:15:59 +08:00 |
|
|
|
18c38b020e
|
TASK:默认积分分配改为平均分配；超级管理员可新增教育、企业管理员账户；组织成员使用积分时需要记录creditsUsage；试用用户初始50积分
|
2025-08-26 23:53:40 +08:00 |
|
|
|
6e9213ec5a
|
BUGFIX:获取brand dna计算时间为空
|
2025-08-26 16:24:52 +08:00 |
|
|
|
83ba69c950
|
BUGFIX:子账号批量导入、brand dna返回计算时间、按权限范围查询design频次
|
2025-08-26 15:49:02 +08:00 |
|
|
|
3cc329f983
|
param change
|
2025-08-26 14:49:43 +08:00 |
|
|
|
c42ee8a1bf
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-08-26 14:27:50 +08:00 |
|
|
|
9a650afc7d
|
TASK:优化查询子账号design试用频次，根据管理员身份限定查询范围
|
2025-08-26 14:10:28 +08:00 |
|
|
|
45a336ced3
|
TASK:brand dna获取进度 返回计算时间
|
2025-08-26 13:33:28 +08:00 |
|
|
|
e258166a16
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-08-26 11:54:24 +08:00 |
|
|
|
f9ec733f07
|
BUGFIX: 编辑referral状态
|
2025-08-26 11:53:53 +08:00 |
|
|
|
54b09b4940
|
TASK:万相补偿获取结果之后通知用户
|
2025-08-26 09:35:18 +08:00 |
|
|
|
6d0c29f5c3
|
TASK:motion生成完成后邮件通知
|
2025-08-25 18:16:57 +08:00 |
|
|
|
23523f73da
|
TASK:教育版子账号积分刷新策略更新
|
2025-08-25 18:07:37 +08:00 |
|
|
|
e45d572078
|
TASK:Stripe订阅，添加月付（经济版）及相应费用、积分的更新
|
2025-08-25 15:02:34 +08:00 |
|
|
|
eebb790aeb
|
BUGFIX:教育子账号新增-积分分配问题
|
2025-08-25 09:18:07 +08:00 |
|
|
|
9c6573f1a6
|
BUGFIX:删除library元素时没有将brand中关联的数据删除，导致出现空指针
|
2025-08-22 15:27:09 +08:00 |
|
|
|
6a5282e4d5
|
BUGFIX:将已存在的账号添加到子账号中，积分计算混乱
|
2025-08-21 16:03:24 +08:00 |
|
|
|
3c5a5ff225
|
Merge branch 'dev/dev' into dev/dev_xp
|
2025-08-21 13:22:48 +08:00 |
|
|
|
e4ce7e9e63
|
TASK:获取affiliate的用户名和id;BUGFIX:模特无法保存
|
2025-08-21 13:22:22 +08:00 |
|
|
|
1089a5a2a5
|
TASK:flux 生成pattern时输出图片比例设置为1：1
|
2025-08-20 18:15:46 +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 |
|
|
|
b02009bf14
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-08-19 17:45:11 +08:00 |
|
|
|
caa9985d11
|
TASK: 1.affiliate 新增referral新增、查询、修改以及其他相关的自动结算佣金的功能；2.删除affiliate_income表及相关mapper
|
2025-08-19 17:44:34 +08:00 |
|
|
|
80957bfc00
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-08-19 09:33:16 +08:00 |
|
|
|
552ec828ab
|
BUGFIX:1、删除模特后保存失败
2、获取个人库中的模特不准确
|
2025-08-18 16:18:51 +08:00 |
|
|
|
42273750f4
|
BUGFIX:从缓存获取模特
|
2025-08-15 18:00:41 +08:00 |
|
|
|
45d6af92e8
|
BUGFIX:1、教育通过上传文件批量创建子账号没有任何校验
2、下载子账号所有信息接口缺失（原下载模板接口保留）
3、保存个人模特到collection时类型设置为System
4、创建子账号时设置积分无效
|
2025-08-15 17:44:45 +08:00 |
|
|
|
c28db81893
|
BUGFIX:同一浏览器切换版本登录时，密码被置空
|
2025-08-13 16:45:30 +08:00 |
|
|
|
1e25ae36f1
|
TASK:1、教育版添加新用户、修改用户、移除用户需求更改；2、修改登入校验条件
BUGFIX:当用户积分为空时报错
|
2025-08-13 15:52:19 +08:00 |
|
|
|
9bf40d879f
|
BUGFIX: 用户选择作品进行二创后，无法正确展示原作品中被like的design
|
2025-08-05 16:50:54 +08:00 |
|
|
|
878f556a0b
|
BUGFIX:分页查询所有项目历史记录，根据更新时间排序，解决项目记录没有更新时间导致空指针问题
|
2025-08-04 13:29:12 +08:00 |
|
|
|
4ad2cd027c
|
TASK:1. 通过定时任务，补偿获取第三方api的运行结果；
2. pose 生成，对使用万相模型的生成限流，最大支持5个并发
3. Slogan限流，一分钟内，最多接收3个请求
|
2025-08-01 17:21:41 +08:00 |
|
