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

154 Commits (1ef75e6bda2b5d6a5cfce1fc54ccb6f2e372980a)

Author SHA1 Message Date
ChenYan 81dd9362cd feat: 2025-01-12 15:58:39 +08:00
yang 942bcd8315 Merge branch 'preview' into feature/my-invitation 2025-01-12 15:54:20 +08:00
yang f41111fc6d ceshi1 2025-01-12 15:50:54 +08:00
ChenYan 031d115263 feat: 模型评论模块 2025-01-12 15:36:37 +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 4d2b660faa refactor(mcwl-resource): 优化 ModelImageServiceImpl 类的代码结构- 导入 List 接口，为后续功能扩展做准备 2025-01-11 15:36:32 +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