CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
513 Commits
8 Branches
0 Tags
10 MiB
Commit Graph

354 Commits (1f85f77ca366d9c4bd19aa076121fb6906a41b7f)

Author SHA1 Message Date
yang afc35ca586 feat(resource): 关注消息 2025-02-16 10:53:36 +08:00
yang 5a5ab268dd feat(resource): 点赞消息 2025-02-15 23:21:57 +08:00
yang 7e40833bb7 feat(resource): 评论通知功能 2025-02-15 18:01:24 +08:00
Diyu0904 461b75cce2 Merge branch 'feature/admin' into preview 2025-02-15 14:57:33 +08:00
Diyu0904 05f8858b6c 新增模型广场，工作流，作品灵感 2025-02-15 14:56:34 +08:00
yang da5366bc6f Merge branch 'feature/community-center' into preview 2025-02-15 14:37:10 +08:00
yang c363c0c6d9 feat(payment): 更新支付宝支付功能并添加证书 2025-02-15 14:36:29 +08:00
Diyu0904 2b8c8abd5a 联调工作流+模型 
新增文件查询接口
 2025-02-14 17:27:53 +08:00
Diyu0904 3859feb21d 删除工作流版本审核相关属性 2025-02-14 15:38:09 +08:00
Diyu0904 57bdbdca3b Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java
#	mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java
 2025-02-14 13:41:14 +08:00
Diyu0904 7891130482 联调工作流+模型 2025-02-14 13:36:17 +08:00
ChenYan 27fac6cf9c Merge remote-tracking branch 'origin/preview' into preview 2025-02-14 10:34:24 +08:00
ChenYan 367c359b5e feat：用户协议/隐私政策 2025-02-14 10:33:56 +08:00
yang f9f7361a16 refactor(mcwl): 重构项目中的返回结果封装 2025-02-13 14:48:54 +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 da69a15cb9 feat(payment): 支付功能调整和订单状态查询 2025-02-10 18:44:44 +08:00
yang 13d4e21691 refactor: 调整支付宝支付流程和会员相关功能 2025-02-10 13:54:14 +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 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 bb64605dc4 refactor(mcwl): 重构删除接口并添加参数校验 2025-02-05 13:28:58 +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 999616a0cd feat: 采纳评论修复 2025-01-23 13:36:47 +08:00
yang f5309a6759 feat: 修改 2025-01-22 18:36:25 +08:00
yang bcf7cb7e3d Merge branch 'feature/community-center' into preview 2025-01-22 15:53:11 +08:00
yang 1594bc4a74 feat: 个人中心 2025-01-22 15:52:30 +08:00
ChenYan 019ff6943f Merge remote-tracking branch 'origin/preview' into preview 2025-01-21 19:34:50 +08:00
ChenYan 8316bd1e76 feat 2025-01-21 19:34:12 +08:00
yang 3cd55dbbb9 Merge branch 'feature/community-center' into preview 
# Conflicts:
#	mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
 2025-01-21 17:37:58 +08:00
yang cf6dcdee4c feat: 提问和提问评论 2025-01-21 17:36:44 +08:00
ChenYan 382f32de5f Merge remote-tracking branch 'origin/preview' into preview 
# Conflicts:
#	mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
 2025-01-21 17:27:10 +08:00
ChenYan 02c090a971 feat 是否置顶 2025-01-21 17:25:46 +08:00
Diyu0904 cb5af5202f Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelImage.java
#	mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
 2025-01-21 17:05:14 +08:00
Diyu0904 71f1c01674 修复工作流审核bug 
新增图片审核
 2025-01-21 17:01:59 +08:00
ChenYan 7b0c1f6fbf Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
 2025-01-21 16:55:15 +08:00
ChenYan d8c964f98b feat 是否置顶 2025-01-21 16:45:00 +08:00
yang b2a3596f20 feat: 会员和邀请添加swagger注解 2025-01-21 13:07:58 +08:00
yang f77029ead8 Merge branch 'feature/community-center' into preview 2025-01-20 16:43:29 +08:00
yang e34ce61003 feat: 图片、文件筛选 2025-01-20 16:43:00 +08:00
Diyu0904 b2dd5112c4 Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java
 2025-01-20 15:49:03 +08:00
Diyu0904 4bb2498fc8 新增举报功能 
新增审核举报功能
新增工作流添加审核
新增工作流修改审核
新增模型添加审核
新增模型修改审核
 2025-01-20 15:42:46 +08:00
yang 5f4404ae1d feat: 图片模块调整 2025-01-20 14:30:26 +08:00
yang dc2b5c9daa Merge branch 'feature/community-center' into preview 2025-01-19 20:01:04 +08:00
yang b30dbfbe2e feat: 提问 2025-01-19 20:00:40 +08:00
ChenYan dbc9381724 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-19 18:18:17 +08:00
ChenYan b164460829 feat 2025-01-19 18:12:01 +08:00
yang d5acfb00ae feat: 提问 2025-01-19 17:12:48 +08:00
yang 84f3caf7af feat: 社区、邀请、发布调整 2025-01-19 15:20:52 +08:00
yang 8fda8397f2 feat: 提问 2025-01-18 20:03:04 +08:00
yang d5157ce481 Merge branch 'feature/community-center' into preview 2025-01-18 19:04:15 +08:00
yang c59ab0d20a feat: 社区、社区发布 2025-01-18 19:03:46 +08:00
Diyu0904 f2c3d73071 Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlow.java
#	mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java
 2025-01-18 15:00:05 +08:00
Diyu0904 b5ca5718f6 新增线程池异步审核工作流 
新增工作流的名称审核
新增工作流版本得名称+内容+图片审核
修复工作流修改时间丢失bug
 2025-01-18 14:55:28 +08:00
yang 3fed564e38 feat: 社区调整 2025-01-17 20:07:24 +08:00
yang d97050a4ef feat: 社区 2025-01-17 19:10:20 +08:00
yang 484c99504a Merge branch 'feature/community-center' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java
 2025-01-17 19:09:25 +08:00
yang 5ef3c1bcd3 feat: 社区 2025-01-17 19:07:56 +08:00
ChenYan ab147addea feat 2025-01-17 19:06:10 +08:00
ChenYan 88c9a15fed Merge remote-tracking branch 'origin/preview' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/QuestionController.java
 2025-01-17 19:05:41 +08:00
ChenYan ba0cc48174 feat 2025-01-17 19:04:35 +08:00
yang 2ba9f440d3 Merge branch 'feature/community-center' into preview 2025-01-17 16:31:38 +08:00
yang 7d05307a4c fix: 添加提问 2025-01-17 16:31:12 +08:00
ChenYan b265f24f81 feat(communityCenter): 添加评论区 点赞功能 2025-01-17 15:59:21 +08:00
yang b1b884a82e Merge branch 'feature/community-center' into preview 2025-01-16 19:32:06 +08:00
yang c1b6dac662 Merge remote-tracking branch 'origin/feature/community-center' into feature/community-center 2025-01-16 19:31:35 +08:00
yang 436ff6877c feat:社区邀请 2025-01-16 19:31:24 +08:00
ChenYan d09410bee7 Merge branch 'feature/community-center' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java
 2025-01-16 19:06:04 +08:00
ChenYan e31b12fd39 feat 2025-01-16 19:04:11 +08:00
ChenYan 537997deab Merge remote-tracking branch 'origin/preview' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java
 2025-01-16 19:02:56 +08:00
ChenYan 170ca3da7e feat：feat(resource): 添加模型版本高清修复功能 2025-01-16 19:01:56 +08:00
Diyu0904 6ae9eca9b6 Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java
#	mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java
 2025-01-16 18:58:49 +08:00
Diyu0904 f88c68ac0a 新增文本审核 
新增图片审核
规范配置文件
完善短信验证码发送
 2025-01-16 18:55:49 +08:00
ChenYan aecbdb60e1 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into feature/community-center 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java
 2025-01-16 17:30:37 +08:00
ChenYan 6fee8248de feat：feat(resource): 添加模型版本高清修复功能 2025-01-16 17:27:55 +08:00
yang 9dcf061dcb Merge remote-tracking branch 'origin/feature/community-center' into feature/community-center 2025-01-16 17:26:23 +08:00
yang 02d8dc45dd feat:社区 2025-01-16 17:26:12 +08:00
ChenYan 83b07054a1 feat：feat(resource): 添加模型版本高清修复功能 2025-01-15 19:00:30 +08:00
yang 7efb7973ef feat:多租户 2025-01-15 18:49:40 +08:00
Diyu0904 5f6844dc29 Merge branch 'feature/admin' into preview 2025-01-15 15:23:03 +08:00
Diyu0904 f41ab7b899 新增点赞/取消工作流 
新增发布工作流评论
新增点赞/取消工作流评论
新增删除工作流评论
 2025-01-15 15:21:55 +08:00
yang 3ebcf6e07e Merge branch 'feature/my-invitation' into preview 2025-01-14 18:54:57 +08:00
yang ab5cc03786 refactor(mcwl): 重构获取模型图片详情接口 
- 新增 ModelImageService 接口的 getDetail 方法
- 实现 getDetail 方法，封装模型图片详情信息- 更新 ModelImageController 中的 detail 方法，使用新的 getDetail 接口
- 修改 ModelImageVo 中的 tags 字段类型，从 String 改为 List<String>
 2025-01-14 18:53:46 +08:00
ChenYan 6a5ad7403a Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-14 18:47:09 +08:00
ChenYan d49115ec61 feat(resource): 2025-01-14 18:45:52 +08:00
yang 40d37e42be refactor(resource): 重构图片相关接口 
- 新增 ModelImageCommentController 专门处理图片评论相关功能
- 从 ModelImageController 中移除图片评论相关的代码
- 删除了 ModelImageController 中未使用的上传功能
- 调整了 ModelImageController 的路由前缀
 2025-01-14 18:28:20 +08:00
yang bd42786571 feat(resource): 实现工作流分页查询功能 
- 新增 WorkFlowService 接口的 listByPage 方法
- 实现 WorkFlowServiceImpl 类的 listByPage 方法- 添加 ModelImagePageRes 类用于分页查询参数
- 新增 WorkFlowVo 类用于工作流列表展示
- 优化 ModelProductController 中的分页查询逻辑
 2025-01-14 18:09:36 +08:00
yang 52ca9b3295 Merge branch 'feature/my-invitation' into preview 2025-01-14 16:34:38 +08:00
yang 4c15e5247f feat(resource): 添加我的发布功能并优化图片列表接口 
- 在 MallProductController 中添加了三个新的接口：selectByUserIdModel、selectByUserIdWorkFlow 和 selectByUserIdImage，用于获取用户发布的模型、工作流和图片信息
- 在 ModelCommentController 和 ModelImageController 中添加了 @RepeatSubmit 注解，用于防止重复提交
- 优化了 ModelImageController 中的 list 接口，使用 PageDomain 作为参数，提高了接口的通用性和灵活性
 2025-01-14 16:34:13 +08:00
Diyu0904 3e7a30d786 Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java
 2025-01-14 16:09:33 +08:00
Diyu0904 3645f7894c 新增工作流添加，修改，回显，删除，详情 2025-01-14 16:07:30 +08:00
ChenYan 1cdfb48ae3 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-13 17:18:09 +08:00
ChenYan 2d0a5dcb38 feat: 2025-01-13 17:04:11 +08:00
yang 2385b58bb0 Merge branch 'feature/my-invitation' into preview 2025-01-13 16:19:13 +08:00
yang f445567505 feat(memberCenter): 新增会员支付金额计算功能并优化模型图片上传 
- 在 MemberController 中添加 calculatePayment 方法，用于根据会员等级和活动计算支付金额
- 在 MemberService 接口中新增 calculatePayment 方法
- 实现 MemberServiceImpl 中的 calculatePayment 方法，支持折扣活动的计算
- 在 ModelImage 实体中添加 isTop 字段，用于表示是否置顶
- 优化 ModelImageServiceImpl 中的保存逻辑，设置创建时间
 2025-01-13 16:18:40 +08:00
ChenYan c8bc835644 feat: 2025-01-13 15:12:50 +08:00
ChenYan 9ef5a22665 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-13 11:48:30 +08:00
ChenYan 573ccd5ef8 feat: 2025-01-13 11:47:28 +08:00
Diyu0904 821dce5654 Merge branch 'feature/admin' into preview 2025-01-13 11:46:41 +08:00
Diyu0904 db353dbb83 新增工作流业务 2025-01-13 11:45:47 +08:00
yang 511bd96d84 refactor(mcwl): 重构资源模块并移除支付相关代码- 移除了 AliPayIntegration 和 OrderTradeController 类 
- 更新了 ModelImageController 接口，使用新的 ModelImagePageRes 类作为参数
- 新增了 ModelImagePageRes 类，用于图片分页请求
- 更新了 ModelImageService接口和实现类，支持新的分页查询参数
 2025-01-13 11:03:59 +08:00
ChenYan ca41c38141 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-12 15:59:42 +08:00
ChenYan 81dd9362cd feat: 2025-01-12 15:58:39 +08:00
ChenYan d8d3bd97dd feat: 模型评论模块 2025-01-12 15:28:55 +08:00
yang 7f22f046c8 feat(resource): 添加模特图片列表、详情、删除等功能 
- 新增图片列表、详情、删除、修改等接口
- 实现分页查询功能
- 添加用户信息展示
- 优化图片上传和评论相关功能
 2025-01-12 15:14:31 +08:00
yang 8c844faca5 Merge branch 'feature/my-invitation' into preview 
# Conflicts:
#	mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelImageServiceImpl.java
 2025-01-11 15:34:59 +08:00
yang 120e61102d feat(resource): 添加图片评论功能- 新增 ModelImageCommentVo 类用于评论区评论 
- 在 ModelImageService 接口中添加 getComment 方法获取评论
- 在 ModelImageServiceImpl 中实现 getComment 方法
- 在 ModelImageController 中添加 getComment 接口
- 优化 ModelImageLike 和 ModelImageCommentLike相关逻辑
 2025-01-11 15:33:30 +08:00
ChenYan f41b9a53d2 feat: 模型版本模块 2025-01-11 15:12:26 +08:00
ChenYan 64de27cc8c Merge remote-tracking branch 'origin/preview' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java
 2025-01-11 15:09:21 +08:00
ChenYan 75cdc9ea16 Merge remote-tracking branch 'origin/feature/resource' into preview 2025-01-11 14:53:56 +08:00
ChenYan dccbeac0c2 feat: 模型版本模块 2025-01-11 14:03:52 +08:00
yang bce9420d55 feat(system): 新增消息通知功能 
- 添加消息通知相关枚举、实体类、服务接口和实现类
- 实现用户消息、系统公告等功能接口
- 新增消息通知相关的数据库表和映射文件
- 优化用户信息查询接口，支持批量查询
 2025-01-10 19:04:28 +08:00
yang 1eeec91626 feat(resource): 添加模型图片上传和评论功能 
- 新增 ModelImage、ModelImageComment 和 ModelImageLike 等相关实体类
- 实现图片上传、发布和点赞功能
- 添加评论和评论点赞功能
- 集成支付宝支付相关配置和接口
 2025-01-10 13:58:06 +08:00
ChenYan 9ecc8db800 feat: 模型模块 2025-01-09 18:17:28 +08:00
Diyu0904 9cd8da3803 Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-common/src/main/java/com/mcwl/common/core/domain/entity/SysUser.java
#	mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
 2025-01-09 14:50:53 +08:00
Diyu0904 a3241b83ff 新增工作流业务 2025-01-09 14:46:01 +08:00
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
yang 5c3ea94803 Merge branch 'feature/my-invitation' into preview 
# Conflicts:
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/ProductCommentConditionEntity.java
#	mcwl-comment/src/main/java/com/mcwl/comment/domain/RequestConditionEntity.java
 2025-01-09 14:05:50 +08:00
yang 872cf65750 refactor(memberCenter): 优化会员积分相关功能 
- 修改积分充值逻辑，将金额乘以 100 转换为积分
- 添加会员消费记录保存功能
- 优化订单交易服务，添加充值记录
- 调整支付宝支付类型比较逻辑
- 移除未使用的 RequestConditionEntity 类
 2025-01-09 14:04:48 +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 50c89af2c2 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	mcwl-pay/src/main/java/com/mcwl/pay/service/OrderTradeService.java
#	mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
#	mcwl-system/src/main/resources/mapper/system/SysUserMapper.xml
 2025-01-08 20:15:33 +08:00
ChenYan 72a737eda7 feat: sp模块 2025-01-08 20:08:32 +08:00
yang f75eae71a4 Merge branch 'feature/my-invitation' into preview 2025-01-08 15:58:32 +08:00
yang d23497bdc5 feat(payment): 支持会员和积分充值的支付宝支付功能 
- 新增了 memberPay 和 pointsPay 方法来处理不同类型的支付请求- 实现了订单处理和支付回调逻辑
- 添加了充值记录相关功能和数据库表
- 更新了用户模型，增加了邀请人ID和免费积分字段
 2025-01-08 15:58:02 +08:00
Diyu0904 1941c2617c Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/main/resources/application.yml
 2025-01-06 17:45:30 +08:00
Diyu0904 3b83ab28ed 新增微信支付工具类 2025-01-06 17:44:10 +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
yang 0f12d1727e Merge branch 'feature/my-invitation' into preview 
# Conflicts:
#	mcwl-admin/src/main/java/com/mcwl/web/controller/pay/OrderTradeController.java
 2025-01-06 15:32:03 +08:00
yang a5fa3457d5 feat(pay): 更新支付宝支付配置并添加异步通知处理 
- 更新了支付宝支付的 appID、私钥、公钥和通知 URL
- 在 OrderTradeController 中添加了支付宝异步通知处理方法- 更新了 AliPayIntegration 中的支付逻辑
- 调整了 MemberBillingConsumer 中的消息确认逻辑
- 在 SecurityConfig 中允许匿名访问支付通知接口
 2025-01-06 15:30:36 +08:00
Diyu0904 6cba0a69fe 新增支付宝扫码支付回调接口 
新增根据订单号查询支付订单状态
 2025-01-06 15:27:41 +08:00
Diyu0904 a98d3bea72 Merge remote-tracking branch 'origin/preview' into preview 2025-01-06 10:35:44 +08:00
Diyu0904 5b29d57c11 新增支付宝扫码支付 2025-01-06 10:32:51 +08:00
yang 4fc9909191 feat(memberCenter): 新增会员促销活动功能 
- 新增积分奖励活动类型
- 实现活动期间内订阅或续订会员的积分加成
- 增加活动参与记录和状态管理
- 优化活动列表展示逻辑
- 修复活动开始时间不能大于结束时间的问题
 2025-01-05 18:35:08 +08:00
yang 40bc8128eb feat(memberCenter): 新增促销活动功能并优化会员模块 
- 新增促销活动相关实体、Mapper、Service及Controller
- 优化会员创建和积分充值逻辑
-移除全局跨域配置，改为在具体接口中处理跨域问题
- 重构邀请码获取和收益展示接口，提高代码可读性
 2025-01-05 14:09:46 +08:00
yang 468d14a3e6 Merge branch 'feature/my-invitation' into preview 
# Conflicts:
#	mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberCenterTest.java
 2025-01-04 18:51:07 +08:00
yang 6ea08e3b1c feat: 新增邀请功能和消费记录 
- 新增 Consume 和 Commission 表及相关服务
- 实现消费记录保存和提成计算
- 添加邀请码生成和收益展示功能
-重构 Invitation 相关代码，支持获取邀请列表和收益信息
 2025-01-04 18:50:05 +08:00
Diyu0904 715174403b Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberCenterTest.java
 2025-01-04 17:32:26 +08:00
Diyu0904 734cb109fb 新增查看个人资料 
新增修改个人资料
 2025-01-04 17:24:34 +08:00
ChenYan 3b4ff9f774 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-04 17:12:37 +08:00
ChenYan 11b42f5fe2 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-04 17:11:04 +08:00
ChenYan 6f45a85b95 feat:商品 订单 支付模块 2025-01-04 17:09:07 +08:00
yang 79bfa1a981 feat(memberCenter): 新增会员权益功能并优化会员积分逻辑 
- 新增 MemberBenefit 类用于定义会员权益
- 创建 MemberBenefitMapper、MemberBenefitService 和 MemberBenefitServiceImpl
- 添加 MemberBenefitTypeEnum 枚举定义权益类型
- 新增会员等级和权益列表接口及实现
- 修改 Member 类，将积分类型改为 Double- 优化会员创建和积分充值逻辑
- 更新会员任务处理，重置积分逻辑
 2025-01-03 18:45:45 +08:00
yang 9014190840 Merge branch 'feature/my-invitation' into preview 2025-01-03 12:54:26 +08:00
yang 7ce0a4fbcb modify：类名修改，方便后续扩展 2025-01-03 12:53:44 +08:00
ChenYan dcce7b4b29 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into feature/resource 2025-01-03 11:04:49 +08:00
ChenYan 58a0b376bc Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-03 11:03:46 +08:00
ChenYan 3559242524 build:依赖 工具 2025-01-03 11:02:11 +08:00
Diyu0904 904235425f Merge branch 'feature/admin' into preview 2025-01-03 10:41:55 +08:00
Diyu0904 37e43baf60 新增阿里云oss文件上传 
新增个人发布作品
新增个人喜欢作品
 2025-01-03 10:40:40 +08:00
yang effbb7f046 modify：积分提醒和清除 2025-01-02 17:14:07 +08:00
yang 5a2b6f8a97 Merge branch 'feature/my-invitation' into preview 2025-01-02 16:18:17 +08:00
yang 1e8197f01a build：调整 2025-01-02 16:17:18 +08:00
Diyu0904 42a4d25a8f Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/main/resources/application-druid.yml
 2025-01-02 16:11:44 +08:00
Diyu0904 c77086a562 修改mybatisplus的配置 
新增手机号注册
新增微信扫码注册
 2025-01-02 16:09:28 +08:00
yang 7215fcb48e Merge branch 'refs/heads/feature/my-invitation' into preview 
# Conflicts:
#	mcwl-common/src/main/java/com/mcwl/common/domain/response/ResponseEnum.java
#	mcwl-common/src/main/java/com/mcwl/common/domain/response/ServerResponseEntity.java
#	mcwl-common/src/main/java/com/mcwl/common/exception/YamiBizException.java
#	mcwl-common/src/main/java/com/mcwl/common/exception/YamiShopBindException.java
#	mcwl-common/src/main/java/com/mcwl/common/i18n/I18nMessage.java
#	mcwl-common/src/main/java/com/mcwl/common/utils/ImageUtil.java
 2025-01-02 15:49:11 +08:00
yang 5cc7874b77 refactor：调整 2025-01-02 15:47:03 +08:00
ChenYan 1a1803b991 build:依赖 工具 2025-01-02 14:52:02 +08:00
ChenYan 1f05411e72 Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	mcwl-admin/src/main/resources/application.yml
 2025-01-02 14:21:26 +08:00
ChenYan 76a23fa933 build:依赖 工具 2025-01-02 14:18:31 +08:00
yang 8df1daac3e Merge branch 'refs/heads/feature/my-invitation' into preview 
# Conflicts:
#	mcwl-common/src/main/java/com/mcwl/common/utils/ShareCodeUtils.java
 2025-01-02 14:13:18 +08:00
yang 1fce665900 feat：会员中心 2025-01-02 14:10:59 +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 9d5cf6040d Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 
# Conflicts:
#	mcwl-admin/pom.xml
 2024-12-31 16:09:18 +08:00
ChenYan 2b5c7e1f20 build:依赖 工具 2024-12-31 15:59:15 +08:00
yang 37b0e80892 chore：配置文件调整 2024-12-31 15:12:59 +08:00
yang 10b3a4b0b3 Merge branch 'feature/my-invitation' into preview 2024-12-31 15:06:15 +08:00
yang a18a478b36 style:调整 2024-12-31 15:05:15 +08:00
Diyu0904 fe00aae291 Merge branch 'feature/admin' into preview 
# Conflicts:
#	mcwl-admin/src/main/resources/application-druid.yml
 2024-12-31 14:59:35 +08:00
Diyu0904 4fe40b47fb 新增mybatis-plus 
新增微信扫码登录
优化发送验证码逻辑
 2024-12-31 14:56:32 +08:00
yang 10d944174d style:调整 2024-12-30 17:20:20 +08:00
yang 6ebed7b289 Merge branch 'feature/my-invitation' into preview 2024-12-30 17:09:30 +08:00
yang 13e5bf5bae docs:添加mybatis-plus配置 2024-12-30 17:07:27 +08:00
Diyu0904 a0c6c39c03 Merge branch 'feature/admin' into preview 2024-12-30 16:55:05 +08:00