Commit Graph

338 Commits

Author SHA1 Message Date
3790b8ee72 Alipay-HK 创建订单和异步回调 2024-05-15 15:38:11 +08:00
d1fab003d2 designSingle 加入渐变色 2024-05-13 16:23:37 +08:00
718198bcfe Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
#	src/main/java/com/ai/da/python/vo/DesignPythonItem.java
2024-05-13 14:30:15 +08:00
shahaibo
7b83f42ed8 TASK:design 渐变色; 2024-05-13 14:23:08 +08:00
f23f4133d0 Merge branch 'dev/dev' into dev/dev_xp
# Conflicts:
#	src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java
#	src/main/java/com/ai/da/python/vo/DesignPythonItem.java
2024-05-10 17:25:06 +08:00
shahaibo
b86f168fe8 TASK:design 渐变色; 2024-05-10 17:17:28 +08:00
6fa0ab30db Merge branch 'dev/dev' into dev/dev_xp 2024-05-10 17:12:52 +08:00
d41bc284d4 Alipay-HK 接入 暂存 2024-05-10 17:11:49 +08:00
e2697aa407 Merge branch 'dev/dev_xp' into dev/dev 2024-05-08 09:46:15 +08:00
ae937dbf65 将generate输入的文本进行翻译或微处理 2024-05-07 18:27:32 +08:00
shahaibo
8da24f4933 BUGFIX:aida; 2024-05-06 16:02:02 +08:00
ffeaac8c46 generate 代码优化 2024-05-02 10:33:11 +08:00
988fe89576 generate 将还未处理的请求置为Waiting状态 2024-04-30 11:39:04 +08:00
5f0546c6cf design single 在用户submit时将上传的图片保存到library 2024-04-30 10:59:41 +08:00
856c6e1be9 generate--sketch 修改提示词 2024-04-25 17:20:56 +08:00
9627239f9a generate--print 增加风格提示词 2024-04-25 14:23:37 +08:00
6d9efc1509 generate 接口参数变更 2024-04-25 12:41:07 +08:00
c44fc14796 BUGFIX: generate 获取结果加判空 2024-04-23 18:32:29 +08:00
ff628dc680 BUGFIX: generate 获取结果加判空 2024-04-23 17:22:40 +08:00
2882b06128 sr MQ异常捕捉 手动ack
generate 全部失败 抛异常
2024-04-23 16:44:55 +08:00
c31a4bcd8f generate mode修改 2024-04-23 14:21:18 +08:00
d000eaa6b8 BUGFIX:generate prompt modify 2024-04-23 11:40:02 +08:00
19d170c1bf 输入prompt修饰 2024-04-22 15:32:59 +08:00
shahaibo
e62f54a975 BUGFIX:create_date插入; 2024-04-19 15:39:50 +08:00
540d2a4e28 generate bug修复 2024-04-18 18:34:44 +08:00
d2076a81d5 generate 联调修改 2024-04-18 16:48:19 +08:00
896120fea4 generate模型更换后的接口更改及异步获取结果 2024-04-18 14:07:20 +08:00
c73414a1f4 Merge branch 'test/stable' into dev/dev_xp 2024-04-11 13:30:44 +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
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