|
|
050b93d47a
|
积分充值与扣除数量变更
|
2024-04-11 11:51:52 +08:00 |
|
|
|
75a63c7a6f
|
Merge branch 'dev/dev_xp' into dev/dev
# Conflicts:
# src/main/resources/paypal-sandbox.properties
|
2024-04-11 11:45:03 +08:00 |
|
|
|
1d443b140b
|
为PayPal添加定时任务
|
2024-04-10 16:07:52 +08:00 |
|
|
|
754de78b57
|
single design添加渐变颜色
|
2024-04-10 11:21:48 +08:00 |
|
shahaibo
|
109176b8bd
|
BUGFIX:排序;
|
2024-04-09 14:09:19 +08:00 |
|
shahaibo
|
66047c541d
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-04-09 13:58:37 +08:00 |
|
shahaibo
|
160c403005
|
BUGFIX:排序;
|
2024-04-09 13:58:27 +08:00 |
|
shahaibo
|
95aee1daae
|
BUGFIX:试用订单;
|
2024-04-09 11:55:15 +08:00 |
|
|
|
e7fbaf8924
|
generate 允许用户从library中选择图片
|
2024-04-02 12:11:04 +08:00 |
|
shahaibo
|
a744a3cb3d
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-04-02 10:15:49 +08:00 |
|
shahaibo
|
782a4f9976
|
BUGFIX;
|
2024-04-02 10:15:35 +08:00 |
|
|
|
5cd3121546
|
local -> dev 队列名修改
|
2024-03-28 16:49:33 +08:00 |
|
|
|
165f0301f0
|
删除callbackService
|
2024-03-28 15:07:33 +08:00 |
|
|
|
7d967ed41e
|
1、完善积分充值
2、升级积分扣除机制
3、优化部分代码
|
2024-03-28 14:43:36 +08:00 |
|
shahaibo
|
737ec594fd
|
BUGFIX;
|
2024-03-28 11:55:52 +08:00 |
|
shahaibo
|
b2d615f31a
|
BUGFIX;
|
2024-03-28 10:33:13 +08:00 |
|
shahaibo
|
bdbf5b4648
|
BUGFIX;
|
2024-03-27 13:51:33 +08:00 |
|
shahaibo
|
1d71d276bb
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev_shb
|
2024-03-27 13:31:08 +08:00 |
|
shahaibo
|
54fe254ab0
|
BUGFIX;
|
2024-03-27 13:28:48 +08:00 |
|
|
|
d79fe65bf1
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-03-26 17:24:36 +08:00 |
|
|
|
4bf4dc2588
|
向TaskList插入数据时开启事务
|
2024-03-26 17:23:40 +08:00 |
|
|
|
edaa4344be
|
删除SR mapper
|
2024-03-26 15:35:49 +08:00 |
|
|
|
54df4a0ae2
|
paypal 环境转换sandbox->live
|
2024-03-26 15:31:57 +08:00 |
|
|
|
3662ed3f96
|
Merge branch 'dev/dev_xp' into dev/dev
|
2024-03-26 15:02:12 +08:00 |
|
|
|
d411b428f8
|
1、完善超分功能
2、完善积分系统
3、新增任务列表
|
2024-03-26 14:58:43 +08:00 |
|
|
|
305324fe1a
|
1、接入超分功能
2、添加积分系统
3、新增订单查询，积分详细查询
|
2024-03-15 15:38:56 +08:00 |
|
|
|
bf05f88c00
|
Merge branch 'release/3.0' into dev/dev_xp
# Conflicts:
# src/main/java/com/ai/da/mapper/primary/DesignMapper.java
# src/main/resources/mapper/primary/DesignMapper.xml
|
2024-03-06 21:00:07 +08:00 |
|
|
|
e84d800ba0
|
加入积分系统，将充值与积分关联
|
2024-03-06 20:56:22 +08:00 |
|
|
|
a016f16052
|
便利查询--指定用户有权限直接获取当前数据库部分数据
|
2024-03-04 16:33:23 +08:00 |
|
|
|
ee96759832
|
1、接入paypal
2、修改支付宝支付
|
2024-03-01 17:31:26 +08:00 |
|
shahaibo
|
87d8a92cdd
|
BUGFIX:design new male_outwear;
|
2024-02-23 11:38:09 +08:00 |
|
shahaibo
|
471cdd866b
|
BUGFIX:design new single;
|
2024-02-23 11:09:25 +08:00 |
|
|
|
e28502a00c
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
|
2024-02-22 10:25:25 +08:00 |
|
|
|
7f8c84bd35
|
支付宝 回调地址免验证
|
2024-02-22 10:25:07 +08:00 |
|
shahaibo
|
22330b674a
|
BUGFIX:代码优化;
|
2024-02-21 15:16:51 +08:00 |
|
shahaibo
|
43ec55dfb6
|
BUGFIX:Single design;
|
2024-02-21 13:53:46 +08:00 |
|
shahaibo
|
8fe468fda2
|
BUGFIX:Single design;
|
2024-02-20 11:20:30 +08:00 |
|
shahaibo
|
66e10a5a80
|
TASK:代码合并;
|
2024-02-20 10:40:36 +08:00 |
|
shahaibo
|
f8d468d55b
|
TASK:代码合并;
|
2024-02-20 10:35:50 +08:00 |
|
shahaibo
|
ca70371585
|
Merge remote-tracking branch 'origin/dev/dev' into dev/dev
# Conflicts:
# src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java
# src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java
# src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java
# src/main/java/com/ai/da/mapper/primary/entity/Product.java
# src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java
# src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
|
2024-02-20 10:26:13 +08:00 |
|
shahaibo
|
68f6ae2a8d
|
TASK:design new;
|
2024-02-20 10:12:44 +08:00 |
|
shahaibo
|
7803decb29
|
TASK:增加邮件通知人;
|
2024-02-20 09:31:31 +08:00 |
|
shahaibo
|
4e2e1affa8
|
Merge branch 'dev/dev' into dev/dev_shb
# Conflicts:
# src/main/java/com/ai/da/controller/AccountController.java
# src/main/java/com/ai/da/mapper/primary/entity/GenerateCancel.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryCopy.java
# src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPointCopy.java
# src/main/java/com/ai/da/service/AccountService.java
# src/main/java/com/ai/da/service/LibraryService.java
# src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
# src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
# src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
# src/main/resources/application-prod.properties
# src/main/resources/application-test.properties
|
2024-02-19 13:02:58 +08:00 |
|
shahaibo
|
a4f36a2fd5
|
TASK:试用时间增加;
|
2024-02-15 15:23:32 +08:00 |
|
shahaibo
|
fda2a3120b
|
TASK:试用时间增加;
|
2024-02-15 15:19:09 +08:00 |
|
|
|
87580cfece
|
接入支付宝 联调修改
|
2024-02-15 14:03:44 +08:00 |
|
|
|
318d0a1441
|
充值功能--接入支付宝
|
2024-02-14 12:37:57 +08:00 |
|
|
|
874a59ea04
|
Merge remote-tracking branch 'origin/dev/dev_xp' into dev/dev
|
2024-02-14 12:22:16 +08:00 |
|
|
|
7f33597c02
|
充值功能--接入支付宝
|
2024-02-14 12:10:15 +08:00 |
|
|
|
92dafd74c9
|
在过滤器中添加未携带token的请求ip日志打印
|
2024-02-01 13:28:48 +08:00 |
|
