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

525 Commits (43b79969ee96a0a9944f1cd499b9068f07a257ad)

Author SHA1 Message Date
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 efa88e9d7a Merge branch 'feature/my-invitation' into preview 2025-01-02 17:16:16 +08:00
yang effbb7f046 modify：积分提醒和清除 2025-01-02 17:14:07 +08:00
ChenYan 2ccd2c658a Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview 2025-01-02 17:03:22 +08:00
ChenYan 4c4f03583a build:依赖 工具 2025-01-02 17:01:52 +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 1b32f289cb 21191 进行的更改 2025-01-02 15:52:13 +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 51055443c5 build:依赖 工具 2025-01-02 14:56:54 +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 49e8e7f231 Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai into feature/resource 
# Conflicts:
#	mcwl-admin/pom.xml
 2024-12-31 19:07:26 +08:00
ChenYan b778e26fbc build:依赖 工具 2024-12-31 19:05:37 +08:00
ChenYan e35045b1c8 Merge branch 'master' of https://gitea.qinmian.online/CY/mcwl-ai into feature/resource 
# Conflicts:
#	mcwl-admin/pom.xml
 2024-12-31 16:15:51 +08:00
ChenYan 12b00c70ed Merge branch 'preview' of https://gitea.qinmian.online/CY/mcwl-ai 2024-12-31 16:12:50 +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