|
|
68a9b2281a
|
管理员系统部分优化、stripe异常通知优化
|
2025-02-21 17:16:44 +08:00 |
|
|
|
c4dbd10a85
|
to dev
|
2025-02-20 11:10:00 +08:00 |
|
|
|
041a407978
|
Merge branch 'release/3.0' into dev/dev
|
2025-02-20 11:00:41 +08:00 |
|
|
|
f73c997c38
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-02-20 10:59:58 +08:00 |
|
|
|
db2a955dea
|
生成结果均低于输出标准时的提示语句更换
|
2025-02-20 10:57:43 +08:00 |
|
|
|
a91643d2ec
|
to prod
|
2025-02-19 17:44:14 +08:00 |
|
|
|
269cf7ea03
|
关闭merchant邮箱，test支付环境不通知商家
|
2025-02-19 16:40:12 +08:00 |
|
|
|
e3aa964db8
|
切换支付环境为test
|
2025-02-19 16:32:28 +08:00 |
|
|
|
fa2fa66d4a
|
打开商家邮箱 用于接收邮件通知
|
2025-02-19 14:54:24 +08:00 |
|
|
|
6d2a189fef
|
更换支付方式
|
2025-02-19 14:43:42 +08:00 |
|
|
|
4e2222966f
|
修改邮件模板ID
|
2025-02-19 14:23:43 +08:00 |
|
|
|
fbe9dc87e9
|
Stripe 回调添加异常处理和异常情况下邮件通知
|
2025-02-19 14:14:20 +08:00 |
|
|
|
d6f078ab60
|
添加判断，确认邮件是否发送成功
|
2025-02-18 17:07:16 +08:00 |
|
|
|
a940863799
|
stripe 一次订阅 bug修复
|
2025-02-18 15:00:57 +08:00 |
|
|
|
11ffa66851
|
stripe 一次订阅 添加日志打印
|
2025-02-18 14:09:27 +08:00 |
|
|
|
fc3fa22bee
|
更换stripe-webhook回调密钥
|
2025-02-18 11:31:49 +08:00 |
|
|
|
37ff60fcfb
|
Stripe 添加一次订阅服务（默认关闭自动续订功能）
|
2025-02-17 17:14:30 +08:00 |
|
|
|
d2d5eebe12
|
to dev
|
2025-02-17 10:52:11 +08:00 |
|
|
|
9cfb5aa344
|
Merge remote-tracking branch 'origin/release/3.0' into release/3.0
|
2025-02-17 10:19:17 +08:00 |
|
|
|
5e7f898840
|
BUGFIX: 用户支付后获取账号到期时间为空，无法更新账号信息
|
2025-02-17 10:18:57 +08:00 |
|
shahaibo
|
6d3253aed3
|
BUGFIX: bindEmail;
|
2025-02-14 11:49:37 +08:00 |
|
shahaibo
|
52e5f246ce
|
Merge branch 'dev/dev' into release/3.0
|
2025-02-13 12:57:37 +08:00 |
|
shahaibo
|
6222377bc5
|
BUGFIX: dev恢复toProductImage、relight消费;
|
2025-02-13 11:57:00 +08:00 |
|
shahaibo
|
2d10f57643
|
BUGFIX: dev关闭toProductImage、relight消费;
|
2025-02-13 11:42:45 +08:00 |
|
shahaibo
|
5f27a95498
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-02-13 11:07:02 +08:00 |
|
shahaibo
|
7fdf832f44
|
BUGFIX: toProductImage、relight;
|
2025-02-13 11:06:19 +08:00 |
|
|
|
43d2f83677
|
BUGFIX:For input string: "[0.3400879, 0.3400879]"
|
2025-02-12 13:20:12 +08:00 |
|
|
|
e882a15aa0
|
Merge branch 'dev/dev' into release/3.0
|
2025-02-12 13:07:25 +08:00 |
|
|
|
1a3f16119b
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-02-12 12:13:52 +08:00 |
|
|
|
8e2e515af3
|
BUGFIX:印花 不等比缩放适配历史数据
|
2025-02-12 12:13:25 +08:00 |
|
|
|
f1a2495431
|
Merge branch 'dev/dev' into release/3.0
|
2025-02-12 10:34:02 +08:00 |
|
|
|
c66b794daa
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-02-12 10:33:39 +08:00 |
|
|
|
b9f7ea2722
|
BUGFIX: 多个印花 不等比缩放适配历史数据
|
2025-02-12 10:33:11 +08:00 |
|
|
|
455e17d4b1
|
Merge branch 'dev/dev' into release/3.0
|
2025-02-12 10:19:45 +08:00 |
|
|
|
a1a6a78dac
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-02-12 10:14:17 +08:00 |
|
|
|
07f91aef74
|
BUGFIX: 印花不等比缩放适配历史数据
|
2025-02-12 10:13:54 +08:00 |
|
shahaibo
|
079ab4d98f
|
BUGFIX: name 信息绑定邮箱录入;
|
2025-02-12 09:56:55 +08:00 |
|
shahaibo
|
6e53bc3ca5
|
TASK: 定时任务;
|
2025-02-12 09:28:04 +08:00 |
|
shahaibo
|
34ee8fa11d
|
TASK: name信息;
|
2025-02-11 13:08:00 +08:00 |
|
shahaibo
|
b7dc95af26
|
TASK:name信息;
|
2025-02-11 11:35:57 +08:00 |
|
shahaibo
|
297391d57e
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-11 11:27:08 +08:00 |
|
shahaibo
|
aff870fba7
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-02-11 10:25:08 +08:00 |
|
|
|
7b1ac47228
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-02-10 16:15:20 +08:00 |
|
|
|
7eb9abbdb5
|
优化接收Stripe回调时数据重复存储问题（添加唯一索引）
|
2025-02-10 16:11:59 +08:00 |
|
|
|
521bd5071a
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/mapper/primary/entity/DesignItemDetailPrint.java
# src/main/java/com/ai/da/model/vo/DesignSinglePrint.java
# src/main/java/com/ai/da/python/PythonService.java
# src/main/java/com/ai/da/python/vo/DesignPythonItemElement.java
# src/main/java/com/ai/da/python/vo/DesignPythonItemPrint.java
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
|
2025-02-10 11:21:52 +08:00 |
|
|
|
ab7e1705c4
|
修改print scale的数据结构
|
2025-02-10 11:18:04 +08:00 |
|
shahaibo
|
a2390a6ab2
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:34:01 +08:00 |
|
shahaibo
|
8dc5dcb1bd
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:11:59 +08:00 |
|
shahaibo
|
5d010d2f77
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:08:48 +08:00 |
|
shahaibo
|
cec5544472
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:05:57 +08:00 |
|
