Commit Graph

34 Commits (4fc9909191e67b4a3c1794c7bb505688fbb5399a)

Author SHA1 Message Date
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 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
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 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
Diyu0904 4fe40b47fb 新增mybatis-plus
新增微信扫码登录
优化发送验证码逻辑
2024-12-31 14:56:32 +08:00
Diyu0904 a0c6c39c03 Merge branch 'feature/admin' into preview 2024-12-30 16:55:05 +08:00
Diyu0904 200d7b8106 新增短信工具类
新增自定义异常类
新增手机号登录
2024-12-30 16:52:24 +08:00
yang 8f80a6ea4f Merge branch 'feature/my-invitation' of https://gitea.qinmian.online/CY/mcwl-ai into preview
# Conflicts:
#	pom.xml
2024-12-30 15:03:19 +08:00
yang c846cbcf50 feat:我的邀请 2024-12-30 15:00:42 +08:00
ChenYan dee5eb0518 build: 工具 2024-12-30 14:47:34 +08:00
ChenYan db0cee24e1 chore: 工具 2024-12-30 11:28:25 +08:00
ChenYan a998c414bd build: 依赖 2024-12-28 18:43:30 +08:00
ChenYan cf6a7b2047 feat: 工具类 2024-12-28 16:43:59 +08:00
ChenYan 1c93d5b555 feat:项目1.11 2024-12-28 13:12:46 +08:00
ChenYan 006c7004ba feat:项目 2024-12-27 19:19:47 +08:00