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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
caa9985d11
|
TASK: 1.affiliate 新增referral新增、查询、修改以及其他相关的自动结算佣金的功能；2.删除affiliate_income表及相关mapper
|
2025-08-19 17:44:34 +08:00 |
|
|
|
4273d0efc0
|
BUGFIX: 系列设计 修改模特后，原模特丢失问题
|
2025-06-30 19:32:16 +08:00 |
|
|
|
d6c5d0e95d
|
TASK:查询交易记录 添加显示总金额和付款者邮箱
|
2025-06-23 10:53:30 +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 |
|
|
|
aeb372bc17
|
TASK:企业、教育版library元素共享、作品广场作品发布到公共gallery
|
2025-05-19 14:02:42 +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 |
|
|
|
912c449161
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/service/CollectionElementService.java
# src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
|
2025-04-14 13:30:02 +08:00 |
|
|
|
cbc760ebaf
|
便利查询--各版本管理员查看用户的design频次和各生成功能使用频次以及积分使用情况
|
2025-04-13 17:20:14 +08:00 |
|
shahaibo
|
96ba29a9a2
|
TASK:模块化；
|
2025-04-03 15:31:39 +08:00 |
|
shahaibo
|
3159208a0a
|
TASK:AiDA模块化
|
2025-03-18 16:54:21 +08:00 |
|
shahaibo
|
8fa76c6732
|
TASK:AiDA模块化
|
2025-03-16 13:09:50 +08:00 |
|
|
|
68a9b2281a
|
管理员系统部分优化、stripe异常通知优化
|
2025-02-21 17:16:44 +08:00 |
|
|
|
37ff60fcfb
|
Stripe 添加一次订阅服务（默认关闭自动续订功能）
|
2025-02-17 17:14:30 +08:00 |
|
|
|
7eb9abbdb5
|
优化接收Stripe回调时数据重复存储问题（添加唯一索引）
|
2025-02-10 16:11:59 +08:00 |
|
|
|
8d9f51f50f
|
不再清空游客的到期时间
|
2025-02-05 11:22:45 +08:00 |
|
|
|
23460800d6
|
优化请求未携带token时的日志打印
|
2025-01-23 13:55:48 +08:00 |
|
|
|
b6a66bed41
|
查询交易记录 添加付款人字段
|
2025-01-15 10:45:51 +08:00 |
|
|
|
ef70598180
|
修改查询交易记录接口
1、添加按id排序
2、添加查询所有国家
3、添加接口，更新用户国家、职业信息
|
2025-01-10 16:13:45 +08:00 |
|
|
|
698fca8787
|
查询各平台交易记录
|
2025-01-10 13:27:27 +08:00 |
|
|
|
fa94667c0f
|
游客到期时间不置空
|
2024-12-23 16:07:05 +08:00 |
|
|
|
7283ace072
|
getAffiliateList 添加返回用户名
|
2024-12-23 14:31:48 +08:00 |
|
|
|
b15cc542e1
|
按id查询订单
|
2024-12-19 13:56:17 +08:00 |
|
|
|
7d8f047087
|
Affiliate功能-数据库表设计更新
|
2024-12-18 11:53:41 +08:00 |
|
|
|
bf8af41f3f
|
添加Affiliate功能
|
2024-12-16 10:26:02 +08:00 |
|
|
|
49f08d1191
|
管理员系统优化-1
|
2024-11-06 17:51:51 +08:00 |
|
|
|
903bafb245
|
管理员系统优化
|
2024-11-06 17:27:16 +08:00 |
|
shahaibo
|
ebd596d0d2
|
TASK:aida;
|
2024-10-20 10:52:14 +08:00 |
|
|
|
e684c4e547
|
Merge branch 'release/3.0' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/common/constant/CommonConstant.java
# src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
# src/main/java/com/ai/da/controller/PortfolioController.java
# src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
# src/main/java/com/ai/da/service/PortfolioService.java
# src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
# src/main/resources/messages_en.properties
# src/main/resources/messages_zh.properties
|
2024-10-10 23:26:20 +08:00 |
|
|
|
463ddf3cb2
|
1、为发布的作品添加标签
2、修改标签
3、不允许用户重复参与活动
4、查询所有参与活动的作品
|
2024-10-09 13:51:16 +08:00 |
|
|
|
a597f7a67a
|
为作品添加标签
|
2024-10-07 21:27:37 +08:00 |
|
shahaibo
|
fd12b9e571
|
TASK:male sketch style逻辑添加;
|
2024-10-04 10:40:32 +08:00 |
|
|
|
2f1b22d423
|
Merge branch 'refs/heads/release/3.0' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/utils/RedisUtil.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
|
2024-09-24 10:27:18 +08:00 |
|
|
|
a47e53b19e
|
mask 数据替换,代码暂存
|
2024-09-13 10:09:33 +08:00 |
|
|
|
969d7586fc
|
mask替换相关接口--未完善版，暂存
|
2024-09-06 12:34:36 +08:00 |
|
