|
|
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 |
|
shahaibo
|
5f79c3276a
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:03:28 +08:00 |
|
|
|
aadb717c9f
|
to dev
|
2025-02-07 15:03:24 +08:00 |
|
|
|
e2e9201fdd
|
修改印花scale数据类型为数组
|
2025-02-07 14:57:28 +08:00 |
|
shahaibo
|
9053bdf10c
|
BUGFIX:试用注册;
|
2025-02-07 12:48:37 +08:00 |
|
shahaibo
|
b14297d1af
|
Merge branch 'dev/dev' into release/3.0
|
2025-02-07 11:58:36 +08:00 |
|
shahaibo
|
e90979bbdc
|
BUGFIX:试用注册;
|
2025-02-07 11:58:12 +08:00 |
|
shahaibo
|
e02c278e7a
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-02-07 10:25:20 +08:00 |
|
shahaibo
|
e60d9483a3
|
BUGFIX:试用订单邮件信息;
|
2025-02-07 10:25:11 +08:00 |
|
shahaibo
|
ba49312fd5
|
BUGFIX:试用订单邮件信息;
|
2025-02-07 10:23:41 +08:00 |
|
|
|
ba3c98771f
|
BUGFIX: 新建订阅时更新订阅不更新账号信息
|
2025-02-06 18:39:06 +08:00 |
|
|
|
4c738cc61d
|
BUGFIX: 返回最新的订阅号
|
2025-02-06 17:35:35 +08:00 |
|
|
|
d648a79ec4
|
BUGFIX: 订阅付款失败时仍有新建订阅
|
2025-02-06 16:36:07 +08:00 |
|
|
|
c325927418
|
to prod
|
2025-02-06 14:46:50 +08:00 |
|
|
|
dba5625446
|
正式支付环境下区分生产分支与测试分支
|
2025-02-06 14:42:45 +08:00 |
|
|
|
91189968e9
|
在dev测试生产环境的Stripe支付功能
|
2025-02-06 14:37:06 +08:00 |
|
|
|
433d8a460e
|
to dev
|
2025-02-06 14:22:27 +08:00 |
|
|
|
ec9857fe73
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-02-06 14:09:53 +08:00 |
|
|
|
a9b01566e1
|
优化积分购买
|
2025-02-06 14:09:15 +08:00 |
|
shahaibo
|
a384aba4df
|
TASK:定时任务开启;
|
2025-02-06 10:04:30 +08:00 |
|
|
|
e587ad3ca1
|
1、支付环境切换为prod
2、邮件通知对象添加Kim
3、打开定时任务
|
2025-02-06 09:53:03 +08:00 |
|
shahaibo
|
6a7c8b3d28
|
Merge branch 'dev/dev' into release/3.0
|
2025-02-05 14:26:33 +08:00 |
|
shahaibo
|
6f52c956ec
|
TASK:新的试用订单生成;
|
2025-02-05 14:20:22 +08:00 |
|
shahaibo
|
9e5d2f47e2
|
BUGFIX:绑定谷歌;
|
2025-02-05 13:38:10 +08:00 |
|
shahaibo
|
627f264ef3
|
BUGFIX:绑定谷歌;
|
2025-02-05 13:02:26 +08:00 |
|
shahaibo
|
464de4ee5a
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-02-05 12:05:07 +08:00 |
|
shahaibo
|
cf76235123
|
TASK:谷歌微信快捷区分登录注册;
|
2025-02-05 12:04:53 +08:00 |
|
|
|
8d9f51f50f
|
不再清空游客的到期时间
|
2025-02-05 11:22:45 +08:00 |
|
|
|
d840185ec7
|
测试 code-create DB最大连接时长
|
2025-02-05 10:56:17 +08:00 |
|
|
|
9f4ab20b9d
|
测试 code-create DB最大连接时长
|
2025-02-05 10:49:10 +08:00 |
|
|
|
0877ff8f66
|
支付 测试
|
2025-02-05 10:05:23 +08:00 |
|
|
|
78046e8707
|
支付 测试
|
2025-02-04 15:29:22 +08:00 |
|
shahaibo
|
9fb8bc989d
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-02-04 14:29:32 +08:00 |
|
shahaibo
|
3c89670dae
|
BUGFIX:design重复回退;
|
2025-02-04 14:29:22 +08:00 |
|
|
|
21b73d55f7
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-02-04 14:04:17 +08:00 |
|
|
|
9199cdf7e2
|
支付 to prod
|
2025-02-04 14:04:01 +08:00 |
|
shahaibo
|
8589216a77
|
TASK:绑定邮箱;
|
2025-02-04 13:53:50 +08:00 |
|
shahaibo
|
87768c6b53
|
TASK:绑定邮箱、绑定微信;
|
2025-02-04 11:39:42 +08:00 |
|
shahaibo
|
ca320f4334
|
TASK:测试dev分支;
|
2025-02-04 11:00:31 +08:00 |
|
shahaibo
|
7697ab59fa
|
BUGFIX:重复停止组装;
|
2025-02-04 10:58:35 +08:00 |
|
|
|
e5e6f360dc
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-27 16:39:54 +08:00 |
|
|
|
68a9462714
|
交易记录下载 返回文件流改为返回文件下载地址
|
2025-01-27 16:39:19 +08:00 |
|
|
|
b185a94fcc
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-27 11:00:10 +08:00 |
|
