Commit Graph

56 Commits (8753c08c4a756d00b23421af7a194b5644f41be9)

Author SHA1 Message Date
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
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 d23497bdc5 feat(payment): 支持会员和积分充值的支付宝支付功能
- 新增了 memberPay 和 pointsPay 方法来处理不同类型的支付请求- 实现了订单处理和支付回调逻辑
- 添加了充值记录相关功能和数据库表
- 更新了用户模型,增加了邀请人ID和免费积分字段
2025-01-08 15:58:02 +08:00
ChenYan 6f45a85b95 feat:商品 订单 支付模块 2025-01-04 17:09:07 +08:00