 yang
|
5b359ed6a3
|
refactor(resource): 调整评论排序逻辑和查询条件
|
2025-02-13 11:21:34 +08:00 |
Diyu0904
|
b4ae47cf28
|
Merge branch 'feature/admin' into preview
|
2025-02-13 10:38:49 +08:00 |
|
yang
|
89ff879055
|
refactor(resource): 调整评论和点赞功能
|
2025-02-13 10:37:15 +08:00 |
|
Diyu0904
|
f8034850cb
|
修改工作流回显
|
2025-02-13 10:36:58 +08:00 |
yang
|
dd16eb0106
|
feat(resource): 添加获取评论数量，增加排序
|
2025-02-12 22:21:05 +08:00 |
|
yang
|
570c7bb656
|
feat(resource): 调整评论和回复
|
2025-02-12 18:15:09 +08:00 |
|
yang
|
e679fd847e
|
feat(resource): 调整评论和回复
|
2025-02-12 16:59:30 +08:00 |
|
Diyu0904
|
7c3621ac2d
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java
# mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java
# mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml
|
2025-02-12 13:20:19 +08:00 |
|
Diyu0904
|
bd23402389
|
联调工作流
修改文件上传
|
2025-02-12 13:16:35 +08:00 |
|
yang
|
1c014c13d1
|
feat(pay): 金币充值
|
2025-02-12 11:19:45 +08:00 |
|
yang
|
c78b731816
|
feat(pay): 金币充值
|
2025-02-12 10:49:37 +08:00 |
|
yang
|
be124c92fa
|
feat(system): 新增用户批量查询
|
2025-02-12 10:18:26 +08:00 |
|
yang
|
103a6e7db7
|
refactor(payment): 调整支付宝支付和订单状态
|
2025-02-11 13:56:17 +08:00 |
|
yang
|
63f14ce3d1
|
refactor(payment): 调整支付宝支付和订单状态
|
2025-02-11 10:42:17 +08:00 |
|
yang
|
00385906c3
|
refactor(pay): 调整支付宝支付流程
|
2025-02-10 22:49:00 +08:00 |
|
yang
|
d2e1697e4e
|
feat(payment): 支付功能调整和订单状态查询
|
2025-02-10 18:59:15 +08:00 |
|
yang
|
da69a15cb9
|
feat(payment): 支付功能调整和订单状态查询
|
2025-02-10 18:44:44 +08:00 |
|
yang
|
13d4e21691
|
refactor: 调整支付宝支付流程和会员相关功能
|
2025-02-10 13:54:14 +08:00 |
|
yang
|
f4e4ef40c1
|
feat(payment): 调整订单信息
|
2025-02-08 18:01:07 +08:00 |
|
yang
|
e97b6492b2
|
refactor(payment): 调整支付宝支付
|
2025-02-08 17:35:16 +08:00 |
|
yang
|
79bf09e235
|
refactor: 调整支付宝支付相关代码并修改会员权益相关功能
|
2025-02-08 09:46:31 +08:00 |
|
Diyu0904
|
74c13643a8
|
Merge branch 'preview' into feature/admin
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ToActivityServiceImpl.java
|
2025-02-07 15:28:16 +08:00 |
|
Diyu0904
|
25efe0d49a
|
修改bug
|
2025-02-07 15:27:29 +08:00 |
|
yang
|
7e0540104f
|
feat(payment): 支付宝余额查询
|
2025-02-07 15:27:03 +08:00 |
|
Diyu0904
|
415e25cdd7
|
Merge branch 'feature/admin' into preview
|
2025-02-07 13:59:02 +08:00 |
|
Diyu0904
|
7b99089c67
|
工作流新增校验
文件加密/解密
文件加密上传oss
|
2025-02-07 13:55:53 +08:00 |
|
yang
|
e44f6b8a0f
|
feat(payment): 支付宝转账集成邮件通知
|
2025-02-07 12:29:45 +08:00 |
|
yang
|
e09584800a
|
refactor(mcwl-pay): 支付宝转账
|
2025-02-06 17:57:37 +08:00 |
|
yang
|
47717bae9c
|
feat: 支付宝提现
|
2025-02-06 17:34:43 +08:00 |
|
yang
|
2672fc9e33
|
feat: 支付宝提现
|
2025-02-06 17:27:00 +08:00 |
|
yang
|
61ac03de38
|
feat(payment): 支付宝账号绑定
|
2025-02-06 16:34:14 +08:00 |
|
yang
|
8d04847cd2
|
refactor: 新增AliPayController,重构AliPayIntegration类，改为实现 AliPayService 接口
|
2025-02-06 11:41:44 +08:00 |
|
yang
|
ee27b542cd
|
feat(resource): 更新 ModelLike
|
2025-02-06 09:47:32 +08:00 |
|
yang
|
e559b6d04d
|
feat(resource): 更新 ModelLike
|
2025-02-05 16:47:14 +08:00 |
|
yang
|
0d9a485c19
|
feat(resource): 增加模型类型字段
|
2025-02-05 15:20:45 +08:00 |
|
yang
|
bb64605dc4
|
refactor(mcwl): 重构删除接口并添加参数校验
|
2025-02-05 13:28:58 +08:00 |
|
yang
|
c7a59a0d99
|
fix(resource): 修复用户信息为空时的异常处理
|
2025-02-05 11:28:33 +08:00 |
|
Diyu0904
|
6dedc5a170
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowLikeServiceImpl.java
|
2025-02-05 11:20:05 +08:00 |
|
Diyu0904
|
32dd0de4cb
|
联调修复bug
编写dockerfile
测试文件加密
|
2025-02-05 11:17:27 +08:00 |
|
yang
|
821d852b5b
|
fix(mcwl-admin): 余额查询功能并优化工作流点赞列表
|
2025-02-05 11:16:53 +08:00 |
|
yang
|
7c527151b0
|
feat: 提问评论多租户
|
2025-01-24 13:37:15 +08:00 |
|
yang
|
200e5c1d32
|
Merge branch 'feature/community-center' into preview
|
2025-01-23 13:37:39 +08:00 |
|
yang
|
999616a0cd
|
feat: 采纳评论修复
|
2025-01-23 13:36:47 +08:00 |
|
Diyu0904
|
dfeabe5897
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-resource/src/main/resources/mapper/resource/ModelLikeMapper.xml
|
2025-01-22 18:40:14 +08:00 |
|
Diyu0904
|
bd4998b73d
|
Merge remote-tracking branch 'origin/feature/admin' into feature/admin
|
2025-01-22 18:37:47 +08:00 |
|
yang
|
789cf9f3d9
|
修复模型点赞bug
|
2025-01-22 18:37:08 +08:00 |
|
yang
|
f5309a6759
|
feat: 修改
|
2025-01-22 18:36:25 +08:00 |
|
yang
|
70aa6a6b27
|
feat: 接受评论
|
2025-01-22 17:34:20 +08:00 |
|
yang
|
09dfd88a12
|
feat: 排序
|
2025-01-22 16:17:46 +08:00 |
|
Diyu0904
|
c6a92b1e62
|
Merge branch 'feature/admin' into preview
# Conflicts:
# mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
|
2025-01-22 16:05:30 +08:00 |