Commit Graph

18 Commits (dc3a45b27405b8490e39991db3b4b1ea017fa73c)

Author SHA1 Message Date
yang dc3a45b274 refactor(payment): 重构支付宝支付流程并更新相关服务
-暂时注释掉了 AliPayIntegration 中的 orderPay 方法
- 更新了 application.yml 中的支付宝通知 URL
- 重构了 OrderTradeServiceImpl 中的订单处理逻辑
- 移除了 mcwl-pay 中的 OrderTypeEnum 枚举
- 更新了 mcwl-resource 中的 OrderTypeEnum 枚举
- 升级了 alipay-sdk-java 版本
- 在 SysUser 模型中添加了邀请人 ID 和免费积分字段
- 更新了 SysUser
2025-01-09 14:44:59 +08:00
Diyu0904 a938a05b72 Merge branch 'feature/admin' into preview
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/comment/CommentController.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/Comment.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/ProductCommentConditionEntity.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/ProductCommentEntity.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/RequestConditionEntity.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/RequestPageEntity.java
#	mcwl-comment/src/main/java/com/mcwl/comment/mapper/CommentMapper.java
#	mcwl-comment/src/main/java/com/mcwl/comment/service/impl/CommentServiceImpl.java
#	mcwl-comment/src/main/resources/mapper/comment/CommentMapper.xml
#	mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java
#	mcwl-system/src/main/java/com/mcwl/system/mapper/SysUserMapper.java
#	mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java
2025-01-09 11:27:44 +08:00
Diyu0904 aae00a4bb9 新增实名认证 2025-01-09 11:14:22 +08:00
ChenYan 72a737eda7 feat: sp模块 2025-01-08 20:08:32 +08:00
ChenYan a045ab58b6 Merge branch 'feature/comment' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-06 16:05:11 +08:00
ChenYan 3de19c962d feat: 评论模块 2025-01-06 16:02:26 +08:00
Diyu0904 734cb109fb 新增查看个人资料
新增修改个人资料
2025-01-04 17:24:34 +08:00
ChenYan 6f45a85b95 feat:商品 订单 支付模块 2025-01-04 17:09:07 +08:00
Diyu0904 37e43baf60 新增阿里云oss文件上传
新增个人发布作品
新增个人喜欢作品
2025-01-03 10:40:40 +08:00
ChenYan 4c4f03583a build:依赖 工具 2025-01-02 17:01:52 +08:00
ChenYan 1a1803b991 build:依赖 工具 2025-01-02 14:52:02 +08:00
ChenYan 76a23fa933 build:依赖 工具 2025-01-02 14:18:31 +08:00
ChenYan 5f5cc9aa7e build:依赖 工具 2025-01-02 11:44:13 +08:00
ChenYan b778e26fbc build:依赖 工具 2024-12-31 19:05:37 +08:00
ChenYan 2b5c7e1f20 build:依赖 工具 2024-12-31 15:59:15 +08:00
ChenYan 8e330577ee build: 2024-12-30 14:51:23 +08:00
ChenYan c1aa8aaeb1 build: 工具 2024-12-30 11:38:22 +08:00
ChenYan db0cee24e1 chore: 工具 2024-12-30 11:28:25 +08:00