|
|
31bb29f2fd
|
Affiliate 允许为不同的用户设置不同的affiliate
Stripe 添加优惠券删除接口；限制优惠券只能在订阅时使用
(cherry picked from commit 200c0adfba)
|
2025-05-20 11:30:42 +08:00 |
|
|
|
1482bb6ab2
|
Stripe推广码 部分功能完善
(cherry picked from commit 218d828e0d)
|
2025-05-19 17:28:52 +08:00 |
|
|
|
eae4087b3e
|
Stripe支付--添加推广码功能及相应佣金计算
(cherry picked from commit 0ba28588da)
|
2025-05-19 17:13:28 +08:00 |
|
|
|
68a9b2281a
|
管理员系统部分优化、stripe异常通知优化
|
2025-02-21 17:16:44 +08:00 |
|
|
|
fbe9dc87e9
|
Stripe 回调添加异常处理和异常情况下邮件通知
|
2025-02-19 14:14:20 +08:00 |
|
shahaibo
|
34ee8fa11d
|
TASK: name信息;
|
2025-02-11 13:08:00 +08:00 |
|
shahaibo
|
297391d57e
|
BUGFIX:试用订单邮件 订单更新时间判断;
|
2025-02-11 11:27:08 +08:00 |
|
shahaibo
|
6f52c956ec
|
TASK:新的试用订单生成;
|
2025-02-05 14:20:22 +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 |
|
|
|
78046e8707
|
支付 测试
|
2025-02-04 15:29:22 +08:00 |
|
shahaibo
|
8589216a77
|
TASK:绑定邮箱;
|
2025-02-04 13:53:50 +08:00 |
|
shahaibo
|
87768c6b53
|
TASK:绑定邮箱、绑定微信;
|
2025-02-04 11:39:42 +08:00 |
|
|
|
68a9462714
|
交易记录下载 返回文件流改为返回文件下载地址
|
2025-01-27 16:39:19 +08:00 |
|
|
|
708280ca14
|
交易记录下载post请求改get请求
|
2025-01-27 10:58:35 +08:00 |
|
|
|
c7b1d46b18
|
maven 依赖冲突解决
|
2025-01-24 15:49:34 +08:00 |
|
|
|
46f37942d2
|
将交易记录导出为excel文件
|
2025-01-24 13:26:53 +08:00 |
|
|
|
b6a66bed41
|
查询交易记录 添加付款人字段
|
2025-01-15 10:45:51 +08:00 |
|
|
|
ac2454fd0e
|
绑定邮箱时添加国家、职业信息
|
2025-01-10 17:16:08 +08:00 |
|
|
|
cb7099264e
|
绑定邮箱时需要填写国家和职业
|
2025-01-10 16:54:44 +08:00 |
|
|
|
ef70598180
|
修改查询交易记录接口
1、添加按id排序
2、添加查询所有国家
3、添加接口，更新用户国家、职业信息
|
2025-01-10 16:13:45 +08:00 |
|
|
|
698fca8787
|
查询各平台交易记录
|
2025-01-10 13:27:27 +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 |
|
|
|
b128b2436d
|
限制人员添加用户
|
2025-01-08 10:24:51 +08:00 |
|
|
|
f6b489d950
|
添加管理员页面访问者
|
2025-01-08 09:50:13 +08:00 |
|
|
|
30312caf82
|
添加管理员访问者
|
2025-01-07 17:27:29 +08:00 |
|
|
|
1d0dd65f5e
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-07 17:21:54 +08:00 |
|
|
|
50d90af3a5
|
添加管理员访问者
|
2025-01-07 17:15:22 +08:00 |
|
|
|
e9a15b950e
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-07 14:37:28 +08:00 |
|
|
|
ee676614f8
|
统一多种支付方式创建订单的入参
|
2025-01-07 14:31:43 +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 |
|
|
|
094718e67f
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-06 14:47:40 +08:00 |
|
|
|
e4a8bf80e9
|
1、用户详细信息添加国家、职业、用户名修改剩余次数
2、积分不够 返回异常提示类型更改
3、添加根据ip解析地理位置测试接口
4、更新积分刷新机制（每月1号0点刷新年费用户积分）
|
2025-01-06 14:42:08 +08:00 |
|
shahaibo
|
5ea8e851d7
|
TASK:AiDA design like sort
|
2025-01-06 10:46:51 +08:00 |
|
|
|
ee1e2f8556
|
获取所有标签
|
2025-01-02 17:32:49 +08:00 |
|
|
|
c997fbf1cb
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-12-23 14:35:29 +08:00 |
|
|
|
7283ace072
|
getAffiliateList 添加返回用户名
|
2024-12-23 14:31:48 +08:00 |
|
shahaibo
|
ec094d7471
|
TASK:AiDA
|
2024-12-19 13:31:01 +08:00 |
|
shahaibo
|
1a19604163
|
TASK:AiDA
|
2024-12-19 10:51:38 +08:00 |
|
|
|
fdebb2b215
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/model/vo/AccountLoginVO.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-12-18 14:02:06 +08:00 |
|
|
|
7d8f047087
|
Affiliate功能-数据库表设计更新
|
2024-12-18 11:53:41 +08:00 |
|
|
|
bf8af41f3f
|
添加Affiliate功能
|
2024-12-16 10:26:02 +08:00 |
|
shahaibo
|
cdf29d2b0d
|
TASK:AiDA
|
2024-12-13 16:07:21 +08:00 |
|
|
|
efe22de0a0
|
Merge branch 'refs/heads/dev/dev' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/common/utils/SendEmailUtil.java
# src/main/java/com/ai/da/mapper/primary/entity/Account.java
|
2024-12-11 16:52:16 +08:00 |
|
shahaibo
|
82f7571612
|
TASK:AiDA
|
2024-12-11 16:21:18 +08:00 |
|
shahaibo
|
2ac54a50ec
|
TASK:AiDA
|
2024-12-11 14:21:29 +08:00 |
|
|
|
47ca7bde41
|
Affiliate-新增、查询、佣金计算等
|
2024-12-09 16:53:29 +08:00 |
|
shahaibo
|
9e28d579d1
|
Merge branch 'dev/dev' into dev/dev_shb
# Conflicts:
# src/main/java/com/ai/da/controller/AccountController.java
# src/main/java/com/ai/da/controller/SavedCollectionController.java
# src/main/java/com/ai/da/service/AccountService.java
# src/main/java/com/ai/da/service/UserLikeGroupService.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
|
2024-12-09 13:44:07 +08:00 |
|
