Commit Graph

1854 Commits

Author SHA1 Message Date
f667099f4f 修改管理员页面权限校验 2025-09-09 17:31:51 +08:00
d5a74c1ff3 新建子账号 默认密码修改 2025-09-09 12:04:37 +08:00
c187d25d74 新建子账号时已使用积分为空 2025-09-08 16:20:24 +08:00
4f93ec144b BUGFIX:添加已存在的子账号时,不指定密码则不会修改原账号密码 2025-09-04 21:18:21 +08:00
de16437d08 BUGFIX:1. 所有作品中无法查看个人刚发布的作品
2. 100月付用户的邮件中续订金额不对,发送给商家的邮件中夹杂中文
3. 推广码没有截止有效期时使用该推广码报错
2025-09-04 18:29:52 +08:00
c67d197da0 BUGFIX:无法通过谷歌登录/教育管理员无法查看design使用频次 2025-09-03 18:15:23 +08:00
d8f0188596 BUGFIX:无法通过谷歌登录 2025-09-03 15:50:13 +08:00
ddc089faa4 BUGFIX:印花pin的数量为9时无法design 2025-09-03 15:48:45 +08:00
f5ecd34a9c BUGFIX:无法查看我喜欢的作品 2025-09-03 00:23:32 +08:00
3c071378ad BUGFIX:无法查看我的作品 2025-09-02 23:46:40 +08:00
8b2aab2e5e Merge branch 'dev/3.1_release_merge' into release/3.1 2025-09-02 22:28:58 +08:00
c4a42b03f6 BUGFIX:发布作品中没有like的衣服导致查看作品详细报错 2025-09-02 22:28:33 +08:00
0dad9ff618 切换端口9994->9990 2025-09-02 21:12:34 +08:00
a59acb0903 BUGFIX: 2025-09-02 20:09:37 +08:00
feca192f53 BUGFIX: 无法二创 2025-09-01 23:13:54 +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
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