Commit Graph

307 Commits

Author SHA1 Message Date
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
165f0301f0 删除callbackService 2024-03-28 15:07:33 +08:00
7d967ed41e 1、完善积分充值
2、升级积分扣除机制
3、优化部分代码
2024-03-28 14:43:36 +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
54df4a0ae2 paypal 环境转换sandbox->live 2024-03-26 15:31:57 +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
ee96759832 1、接入paypal
2、修改支付宝支付
2024-03-01 17:31:26 +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
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
87580cfece 接入支付宝 联调修改 2024-02-15 14:03:44 +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
8f832ec441 机器人试用到期提示 2024-01-31 14:59:19 +08:00
shahaibo
5e1573ae09 TASK:试用用户机器人余额; 2024-01-30 15:07:34 +08:00
shahaibo
878b5a129c TASK:试用用户机器人余额; 2024-01-30 14:20:01 +08:00
9e653595a9 generate 添加试用用户判断 2024-01-30 11:48:26 +08:00
shahaibo
0afcf92582 BUGFIX:试用用户; 2024-01-29 10:35:19 +08:00
shahaibo
4380f0bc5b BUGFIX:异常级别设置 2024-01-28 10:40:29 +08:00
shahaibo
18d0d55d4f BUGFIX:设置上传文件大小,正式用户转试用用户 2024-01-27 16:32:18 +08:00
shahaibo
d4a7fa441c Merge remote-tracking branch 'origin/develop' into develop 2024-01-26 13:18:37 +08:00
shahaibo
5af86c28f1 TASK:数据迁移; 2024-01-26 13:18:16 +08:00
shahaibo
62e6f8b77d TASK:数据迁移; 2024-01-26 13:17:59 +08:00
4c0dd27332 generate 记录取消操作 2024-01-26 13:12:04 +08:00
aa270b5f7d 修改排队位置 2024-01-25 14:11:12 +08:00
c35a188abb TASK:generate 修复逻辑Bug 2024-01-25 13:37:17 +08:00
1d2cb17d54 TASK:generate 添加队列消费者,增加并发量 2024-01-24 14:44:31 +08:00
96858c2cc3 TASK:异步调用generate及取消generate 2024-01-24 11:43:56 +08:00
164454b5b2 BUGFIX:数据传输过程中long精度发生丢失 2024-01-22 16:21:32 +08:00
577dc94850 1、generate 异步生成及获取排队情况
2、generate 取消生成
2024-01-21 14:14:55 +08:00
shahaibo
471426e931 TASK:多数据源; 2024-01-19 16:36:34 +08:00
shahaibo
449c568907 TASK:免登录; 2024-01-18 12:05:06 +08:00
shahaibo
b828c8fcde TASK:免登录; 2024-01-18 11:58:37 +08:00
shahaibo
557041335a TASK:免登录; 2024-01-18 11:23:25 +08:00
shahaibo
90634f73c7 TASK:免密登录; 2024-01-17 17:49:40 +08:00
shahaibo
1c3692d034 TASK:免登录; 2024-01-15 17:45:11 +08:00