|
|
ee676614f8
|
统一多种支付方式创建订单的入参
|
2025-01-07 14:31:43 +08:00 |
|
|
|
de73536d1c
|
解析所有发起购买的客户端ip地址
|
2025-01-07 11:09:22 +08:00 |
|
|
|
6a861305d6
|
解析所有发起购买的客户端ip地址
|
2025-01-07 11:07:49 +08:00 |
|
|
|
e4a8bf80e9
|
1、用户详细信息添加国家、职业、用户名修改剩余次数
2、积分不够 返回异常提示类型更改
3、添加根据ip解析地理位置测试接口
4、更新积分刷新机制（每月1号0点刷新年费用户积分）
|
2025-01-06 14:42:08 +08:00 |
|
|
|
ee1e2f8556
|
获取所有标签
|
2025-01-02 17:32:49 +08:00 |
|
|
|
1157b41730
|
积分购买 添加邮件通知
|
2024-12-31 11:38:12 +08:00 |
|
|
|
ca4d75c63f
|
BUGFIX:用户订阅后更新用户身份和积分
|
2024-12-27 14:29:07 +08:00 |
|
shahaibo
|
214c93923c
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-12-24 14:01:34 +08:00 |
|
shahaibo
|
bfa1d67b5c
|
BUGFIX:Collection not found
|
2024-12-24 14:00:44 +08:00 |
|
|
|
a0a1a1a06a
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-12-23 17:31:53 +08:00 |
|
|
|
468ad385d7
|
用户登录时，不校验游客账号有效期
|
2024-12-23 17:29:48 +08:00 |
|
|
|
fa94667c0f
|
游客到期时间不置空
|
2024-12-23 16:07:05 +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
|
69743d4ef0
|
BUGFIX:谷歌快捷登录
|
2024-12-23 10:27:01 +08:00 |
|
shahaibo
|
e033671ffb
|
TASK:AiDA
|
2024-12-20 16:11:52 +08:00 |
|
shahaibo
|
15cde37af7
|
TASK:AiDA
|
2024-12-20 11:44:21 +08:00 |
|
shahaibo
|
7fb74bc7d8
|
TASK:AiDA
|
2024-12-19 17:52:14 +08:00 |
|
|
|
0574180e4b
|
generate去除额外prompt
|
2024-12-19 17:26:16 +08:00 |
|
|
|
5b653272ee
|
覆盖代码恢复-获取个人信息
|
2024-12-19 17:15:55 +08:00 |
|
|
|
d28a6051f1
|
Merge branch 'release/3.0' into dev/dev
|
2024-12-19 16:02:59 +08:00 |
|
|
|
f9063ad26e
|
generate print翻译输入修改
|
2024-12-19 16:01:35 +08:00 |
|
|
|
2f4d060ca3
|
generate print翻译输入修改
|
2024-12-19 15:59:18 +08:00 |
|
|
|
fcd0cf4836
|
Merge branch 'release/3.0' into dev/dev
|
2024-12-19 15:32:10 +08:00 |
|
|
|
26f50c2acb
|
generate print翻译输入修改
|
2024-12-19 15:26:27 +08:00 |
|
|
|
c3eb1fc78c
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-12-19 14:04:28 +08:00 |
|
|
|
b15cc542e1
|
按id查询订单
|
2024-12-19 13:56:17 +08:00 |
|
shahaibo
|
ec094d7471
|
TASK:AiDA
|
2024-12-19 13:31:01 +08:00 |
|
shahaibo
|
3dc432131c
|
TASK:AiDA
|
2024-12-19 11:13:30 +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 |
|
shahaibo
|
7194049127
|
TASK:prompt修改;
|
2024-12-13 11:32:42 +08:00 |
|
shahaibo
|
e34cec812f
|
Merge remote-tracking branch 'origin/release/3.0' into release/3.0
|
2024-12-13 10:35:17 +08:00 |
|
shahaibo
|
11a5b53d2a
|
BUGFIX:prompt重复拼接;
|
2024-12-13 10:34:14 +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 |
|
|
|
5dd1e10b61
|
to dev
|
2024-12-10 10:09:21 +08:00 |
|
|
|
e9e8e87719
|
Merge branch 'release/3.0' into dev/dev
|
2024-12-10 10:04:27 +08:00 |
|
|
|
3c0fa205d1
|
BUGFIX:code-create注册的新用户自动添加为aida的游客,去重bug修改
|
2024-12-09 18:17:09 +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 |
|
shahaibo
|
1c96522447
|
TASK:AiDA
|
2024-12-09 13:31:30 +08:00 |
|
shahaibo
|
1a568621ca
|
BUGFIX:重复申请试用;
|
2024-12-03 11:51:01 +08:00 |
|
|
|
eecefee674
|
Merge branch 'dev/dev' into release/3.0
|
2024-12-02 14:54:00 +08:00 |
|
|
|
ea0332851d
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-12-02 14:35:20 +08:00 |
|
|
|
a25a7dc023
|
high || fast 生成次数修改
|
2024-12-02 14:34:10 +08:00 |
|
