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 |
|
|
|
0877ff8f66
|
支付 测试
|
2025-02-05 10:05:23 +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 |
|
|
|
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 |
|
|
|
708280ca14
|
交易记录下载post请求改get请求
|
2025-01-27 10:58:35 +08:00 |
|
|
|
9357a62f0c
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-24 14:28:54 +08:00 |
|
|
|
c5b25e9a16
|
优化 删除多余代码
|
2025-01-24 14:28:21 +08:00 |
|
|
|
a35d057146
|
优化 导出交易记录文件
|
2025-01-24 14:25:32 +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 |
|
|
|
58c8b644bc
|
佣金计算 打印日志
|
2025-01-22 16:41:40 +08:00 |
|
|
|
c4c04aecb6
|
affiliateIncome 添加字段paymentInfoId
|
2025-01-22 16:37:40 +08:00 |
|
|
|
dcdb0d06c4
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-15 10:49:08 +08:00 |
|
|
|
b6a66bed41
|
查询交易记录 添加付款人字段
|
2025-01-15 10:45:51 +08:00 |
|
shahaibo
|
5f277ed815
|
BUGFIX:toproductimage 打光积分不足提示修改;
|
2025-01-13 15:12:54 +08:00 |
|
shahaibo
|
845a553097
|
BUGFIX:微信名解析、toproductimage 打光积分不足code码修改;
|
2025-01-13 14:11:03 +08:00 |
|
|
|
cff8227228
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-13 11:13:31 +08:00 |
|
|
|
51e2c9af02
|
只填写国家和职业（不发送验证码）
|
2025-01-13 11:11:01 +08:00 |
|
|
|
cd89a77189
|
漏传
|
2025-01-13 10:56:06 +08:00 |
|
|
|
ab303cfeef
|
绑定邮箱时添加国家、职业信息
|
2025-01-13 10:55:08 +08:00 |
|
shahaibo
|
07004a7415
|
TASK:去日志;
|
2025-01-13 10:20:14 +08:00 |
|
shahaibo
|
d2069a3e7f
|
TASK:去日志;
|
2025-01-13 10:12:04 +08:00 |
|
shahaibo
|
501cee0057
|
TASK:去日志;
|
2025-01-13 10:05:38 +08:00 |
|
|
|
ac2454fd0e
|
绑定邮箱时添加国家、职业信息
|
2025-01-10 17:16:08 +08:00 |
|
|
|
931a4cf807
|
to dev
|
2025-01-10 17:01:59 +08:00 |
|
|
|
cb7099264e
|
绑定邮箱时需要填写国家和职业
|
2025-01-10 16:54:44 +08:00 |
|
|
|
e7aa951e89
|
漏传
|
2025-01-10 16:19:53 +08:00 |
|
|
|
ef70598180
|
修改查询交易记录接口
1、添加按id排序
2、添加查询所有国家
3、添加接口，更新用户国家、职业信息
|
2025-01-10 16:13:45 +08:00 |
|
|
|
698fca8787
|
查询各平台交易记录
|
2025-01-10 13:27:27 +08:00 |
|
|
|
2f86090f21
|
Merge branch 'dev/dev' into dev/dev_xp
|
2025-01-10 13:05:26 +08:00 |
|
shahaibo
|
4fe5f65867
|
TASK:AiDA design like sort
|
2025-01-08 16:56:02 +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 |
|
|
|
66158e94dd
|
限制人员添加用户
|
2025-01-08 10:12:43 +08:00 |
|
shahaibo
|
0b245f62af
|
TASK:AiDA design like sort、moodboardPosition
|
2025-01-07 17:16:45 +08:00 |
|
shahaibo
|
49b8585522
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-01-07 15:30:33 +08:00 |
|
shahaibo
|
b49f098a5e
|
TASK:AiDA design like sort、moodboardPosition
|
2025-01-07 15:29:46 +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 |
|
|
|
1a9f06d259
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-01-07 11:26:16 +08:00 |
|
shahaibo
|
eaaa99a946
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2025-01-07 11:16:14 +08:00 |
|
shahaibo
|
c8e4d624b7
|
TASK:AiDA design like sort
|
2025-01-07 11:15:25 +08:00 |
|
|
|
f08e36d100
|
Merge branch 'dev/dev_xp' into dev/dev
|
2025-01-07 11:12:30 +08:00 |
|
