|
|
269cf7ea03
|
关闭merchant邮箱，test支付环境不通知商家
|
2025-02-19 16:40:12 +08:00 |
|
|
|
fa2fa66d4a
|
打开商家邮箱 用于接收邮件通知
|
2025-02-19 14:54:24 +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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
shahaibo
|
6e53bc3ca5
|
TASK: 定时任务;
|
2025-02-12 09:28:04 +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 |
|
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
|
5f79c3276a
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-10 10:03:28 +08:00 |
|
|
|
aadb717c9f
|
to dev
|
2025-02-07 15:03:24 +08:00 |
|
|
|
4c738cc61d
|
BUGFIX: 返回最新的订阅号
|
2025-02-06 17:35:35 +08:00 |
|
|
|
c325927418
|
to prod
|
2025-02-06 14:46:50 +08:00 |
|
|
|
433d8a460e
|
to dev
|
2025-02-06 14:22:27 +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 |
|
|
|
9199cdf7e2
|
支付 to prod
|
2025-02-04 14:04:01 +08:00 |
|
|
|
7fc495eec9
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-24 13:27:50 +08:00 |
|
|
|
46f37942d2
|
将交易记录导出为excel文件
|
2025-01-24 13:26:53 +08:00 |
|
|
|
e75196c904
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-23 14:15:38 +08:00 |
|
|
|
bdfa249c2e
|
token过期 日志打印优化
|
2025-01-23 14:15:12 +08:00 |
|
|
|
d0e5f7da61
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-23 13:57:26 +08:00 |
|
|
|
d8320ba83d
|
新增自定义异常
|
2025-01-23 13:56:48 +08:00 |
|
|
|
23460800d6
|
优化请求未携带token时的日志打印
|
2025-01-23 13:55:48 +08:00 |
|
|
|
58c8b644bc
|
佣金计算 打印日志
|
2025-01-22 16:41:40 +08:00 |
|
|
|
bb7c98c094
|
affiliate 佣金计算统计
|
2025-01-22 15:32:09 +08:00 |
|
|
|
51e2c9af02
|
只填写国家和职业（不发送验证码）
|
2025-01-13 11:11:01 +08:00 |
|
|
|
cb7099264e
|
绑定邮箱时需要填写国家和职业
|
2025-01-10 16:54:44 +08:00 |
|
|
|
e4936a23bc
|
编辑用户名，改为当前月允许修改5次
|
2025-01-08 14:20:12 +08:00 |
|
|
|
9f37cb3f8d
|
Merge branch 'release/3.0' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/controller/ConvenientInquiryController.java
# src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java
# src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
|
2025-01-08 10:33:49 +08:00 |
|
|
|
710abf2323
|
修改积分价格，for test
|
2025-01-07 11:47:33 +08:00 |
|
|
|
f08e36d100
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-07 11:12:30 +08:00 |
|
|
|
6a861305d6
|
解析所有发起购买的客户端ip地址
|
2025-01-07 11:07:49 +08:00 |
|
|
|
b0fa185d36
|
更改积分刷新task
|
2025-01-06 14:58:46 +08:00 |
|
|
|
e4a8bf80e9
|
1、用户详细信息添加国家、职业、用户名修改剩余次数
2、积分不够 返回异常提示类型更改
3、添加根据ip解析地理位置测试接口
4、更新积分刷新机制（每月1号0点刷新年费用户积分）
|
2025-01-06 14:42:08 +08:00 |
|
shahaibo
|
afeeef4af7
|
TASK:试用订单接收名单添加;
|
2025-01-04 21:35:21 +08:00 |
|
