Compare commits
38 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 时舟年
|
af2422c114 | ||
 liwentao
|
7a94145819 | ||
|
liwentao
|
7e4035e0ae | ||
|
liwentao
|
e19324d0ef | ||
 future
|
e0e707edcb | ||
|
liwentao
|
8ab528a74b | ||
|
liwentao
|
de7a359ead | ||
|
future
|
fbb41911a2 | ||
|
future
|
223a427614 | ||
|
future
|
78c80c4b1d | ||
|
liwentao
|
8af444b7ee | ||
|
liwentao
|
bdcd3b2bf0 | ||
|
liwentao
|
544ddeec5a | ||
|
liwentao
|
2f070e6b44 | ||
|
liwentao
|
de01a39848 | ||
|
liwentao
|
03991319fd | ||
|
liwentao
|
a8c7a4061e | ||
|
liwentao
|
0d2ed2aba5 | ||
|
liwentao
|
906512f294 | ||
|
liwentao
|
a7f699a8b4 | ||
|
liwentao
|
2df598c0d8 | ||
|
future
|
174e33053e | ||
|
future
|
29b73c1f67 | ||
|
时舟年
|
7c08c685d0 | ||
|
时舟年
|
53624fc259 | ||
|
future
|
574021d47c | ||
|
future
|
8dbd507dd2 | ||
|
future
|
ddb77db605 | ||
|
future
|
e673d96f6f | ||
|
future
|
85ed6f9196 | ||
|
时舟年
|
cd44caee57 | ||
|
时舟年
|
2325c66c37 | ||
|
时舟年
|
0afd1cc865 | ||
|
时舟年
|
8b8920a53d | ||
|
liwentao
|
3d284c8d3a | ||
|
future
|
538c1e0ad5 | ||
|
future
|
923d147574 | ||
|
future
|
6ea23b5a01 |
@@ -0,0 +1,272 @@
|
||||
# V10 团课预约业务场景测试数据
|
||||
|
||||
## 概述
|
||||
|
||||
本文档描述了 V10 版本新增的团课预约功能测试数据，覆盖了7种典型的预约业务场景，用于验证系统在不同会员卡状态下的正确处理逻辑。
|
||||
|
||||
**当前日期**: 2026-06-02
|
||||
|
||||
---
|
||||
|
||||
## 一、测试场景总览
|
||||
|
||||
| 场景 | 会员 | 会员卡状态 | 预约课程 | 预期结果 |
|
||||
|-----|------|----------|---------|---------|
|
||||
| 1 | 用户A | 无会员卡 | 次数卡团课 | 提示无可用会员卡 |
|
||||
| 2 | 用户B | 时长卡已过期 | 次数卡团课 | 提示会员卡已过期 |
|
||||
| 3 | 会员C | 时长卡有效 | 次数卡团课 | 预约成功 |
|
||||
| 4 | 会员D | 次数卡次数=0 | 次数卡团课 | 提示剩余次数不足 |
|
||||
| 5 | 会员E | 次数卡次数=5 | 次数卡团课 | 预约成功 |
|
||||
| 6 | 会员F | 储值卡余额=30元 | 储值卡团课(需50元) | 提示余额不足 |
|
||||
| 7 | 会员G | 储值卡余额=200元 | 储值卡团课(需50元) | 预约成功 |
|
||||
|
||||
---
|
||||
|
||||
## 二、测试会员数据
|
||||
|
||||
### 2.1 会员列表
|
||||
|
||||
| 会员编号 | 昵称 | 手机号 | 性别 | 创建时间 |
|
||||
|---------|------|--------|------|---------|
|
||||
| MEM_TEST_A | 用户A_无卡新用户 | 13800001001 | 男 | 2026-06-02 10:00:00 |
|
||||
| MEM_TEST_B | 用户B_过期时长卡 | 13800001002 | 男 | 2026-05-01 10:00:00 |
|
||||
| MEM_TEST_C | 会员C_有效时长卡 | 13800001003 | 女 | 2026-05-01 10:00:00 |
|
||||
| MEM_TEST_D | 会员D_次数用尽 | 13800001004 | 男 | 2026-05-01 10:00:00 |
|
||||
| MEM_TEST_E | 会员E_次数充足 | 13800001005 | 女 | 2026-05-01 10:00:00 |
|
||||
| MEM_TEST_F | 会员F_储值卡余额不足 | 13800001006 | 男 | 2026-05-01 10:00:00 |
|
||||
| MEM_TEST_G | 会员G_储值卡余额充足 | 13800001007 | 女 | 2026-05-01 10:00:00 |
|
||||
|
||||
### 2.2 会员场景说明
|
||||
|
||||
#### 场景1: 用户A - 无会员卡新用户
|
||||
- **会员编号**: MEM_TEST_A
|
||||
- **状态**: 2026-06-02 刚注册，尚未购买任何会员卡
|
||||
- **测试目标**: 验证无会员卡用户申请团课预约时的错误提示
|
||||
|
||||
#### 场景2: 用户B - 时长卡已过期
|
||||
- **会员编号**: MEM_TEST_B
|
||||
- **状态**: 持有30天时长卡，于 2026-05-31 23:59:59 到期
|
||||
- **测试目标**: 验证会员卡过期后的预约行为
|
||||
|
||||
#### 场景3: 会员C - 时长卡有效
|
||||
- **会员编号**: MEM_TEST_C
|
||||
- **状态**: 持有30天时长卡，到期时间 2026-07-02
|
||||
- **测试目标**: 验证有效期内的时长卡可以正常预约次数卡团课
|
||||
|
||||
#### 场景4: 会员D - 次数卡耗尽
|
||||
- **会员编号**: MEM_TEST_D
|
||||
- **状态**: 持有10次卡，剩余次数 = 0
|
||||
- **测试目标**: 验证次数耗尽后无法预约团课
|
||||
|
||||
#### 场景5: 会员E - 次数卡充足
|
||||
- **会员编号**: MEM_TEST_E
|
||||
- **状态**: 持有10次卡，剩余次数 = 5
|
||||
- **测试目标**: 验证次数充足时正常预约
|
||||
|
||||
#### 场景6: 会员F - 储值卡余额不足
|
||||
- **会员编号**: MEM_TEST_F
|
||||
- **状态**: 持有储值卡，余额 = 30.00 元
|
||||
- **测试目标**: 验证预约储值卡团课（需50元）时提示余额不足
|
||||
|
||||
#### 场景7: 会员G - 储值卡余额充足
|
||||
- **会员编号**: MEM_TEST_G
|
||||
- **状态**: 持有储值卡，余额 = 200.00 元
|
||||
- **测试目标**: 验证余额充足时正常预约储值卡团课
|
||||
|
||||
---
|
||||
|
||||
## 三、团课课程数据
|
||||
|
||||
### 3.1 团课列表
|
||||
|
||||
| 课程名称 | 教练ID | 课程类型 | 开始时间 | 结束时间 | 最大人数 | 当前人数 | 状态 | 点卡额度 | 储值额度 |
|
||||
|---------|-------|---------|---------|---------|---------|---------|------|---------|---------|
|
||||
| 燃脂搏击_次数卡课程 | 102 | 2 | 2026-06-10 19:30:00 | 2026-06-10 20:30:00 | 20 | 0 | 正常 | 1 | 0.00 |
|
||||
| 高端普拉提_储值卡课程 | 103 | 1 | 2026-06-11 19:00:00 | 2026-06-11 20:00:00 | 15 | 0 | 正常 | 0 | 50.00 |
|
||||
|
||||
### 3.2 课程说明
|
||||
|
||||
**燃脂搏击_次数卡课程**
|
||||
- **收费类型**: 次数卡
|
||||
- **消耗点数**: 1次
|
||||
- **适用会员**: 时长卡、次数卡用户
|
||||
- **课程描述**: 高强度间歇训练，配合音乐快速燃脂
|
||||
|
||||
**高端普拉提_储值卡课程**
|
||||
- **收费类型**: 储值卡
|
||||
- **消耗金额**: 50.00 元
|
||||
- **适用会员**: 储值卡用户
|
||||
- **课程描述**: 精准训练核心肌群
|
||||
|
||||
---
|
||||
|
||||
## 四、会员卡类型数据
|
||||
|
||||
| 卡名称 | 卡类型 | 价格 | 有效天数 | 总次数 | 面额 | 状态 |
|
||||
|-------|-------|------|---------|-------|------|------|
|
||||
| 30天时长卡 | TIME_CARD | 299.00 | 30 | - | - | 上架 |
|
||||
| 10次卡 | COUNT_CARD | 499.00 | - | 10 | - | 上架 |
|
||||
| 储值卡500 | STORED_VALUE_CARD | 500.00 | - | - | 500.00 | 上架 |
|
||||
|
||||
---
|
||||
|
||||
## 五、会员卡记录数据
|
||||
|
||||
### 5.1 记录列表
|
||||
|
||||
| 会员编号 | 卡名称 | 状态 | 剩余次数 | 剩余金额 | 过期时间 | 购买时间 |
|
||||
|---------|-------|------|---------|---------|---------|---------|
|
||||
| MEM_TEST_B | 30天时长卡 | EXPIRED | 0 | 0.00 | 2026-05-31 | 2026-05-01 |
|
||||
| MEM_TEST_C | 30天时长卡 | ACTIVE | 0 | 0.00 | 2026-07-02 | 2026-06-02 |
|
||||
| MEM_TEST_D | 10次卡 | ACTIVE | 0 | 0.00 | 2026-12-31 | 2026-05-01 |
|
||||
| MEM_TEST_E | 10次卡 | ACTIVE | 5 | 0.00 | 2026-12-31 | 2026-05-01 |
|
||||
| MEM_TEST_F | 储值卡500 | ACTIVE | 0 | 30.00 | 2027-06-02 | 2026-05-01 |
|
||||
| MEM_TEST_G | 储值卡500 | ACTIVE | 0 | 200.00 | 2027-06-02 | 2026-05-01 |
|
||||
|
||||
### 5.2 详细说明
|
||||
|
||||
**用户B - 时长卡已过期**
|
||||
```
|
||||
会员ID: MEM_TEST_B
|
||||
卡名称: 30天时长卡
|
||||
状态: EXPIRED (已过期)
|
||||
有效期: 2026-05-01 至 2026-05-31
|
||||
剩余次数: 0
|
||||
剩余金额: 0.00
|
||||
```
|
||||
|
||||
**会员C - 时长卡有效**
|
||||
```
|
||||
会员ID: MEM_TEST_C
|
||||
卡名称: 30天时长卡
|
||||
状态: ACTIVE (有效)
|
||||
有效期: 2026-06-02 至 2026-07-02
|
||||
剩余次数: 0
|
||||
剩余金额: 0.00
|
||||
```
|
||||
|
||||
**会员D - 次数卡耗尽**
|
||||
```
|
||||
会员ID: MEM_TEST_D
|
||||
卡名称: 10次卡
|
||||
状态: ACTIVE (有效)
|
||||
有效期: 2026-05-01 至 2026-12-31
|
||||
剩余次数: 0 (已用尽)
|
||||
剩余金额: 0.00
|
||||
```
|
||||
|
||||
**会员E - 次数卡充足**
|
||||
```
|
||||
会员ID: MEM_TEST_E
|
||||
卡名称: 10次卡
|
||||
状态: ACTIVE (有效)
|
||||
有效期: 2026-05-01 至 2026-12-31
|
||||
剩余次数: 5
|
||||
剩余金额: 0.00
|
||||
```
|
||||
|
||||
**会员F - 储值卡余额不足**
|
||||
```
|
||||
会员ID: MEM_TEST_F
|
||||
卡名称: 储值卡500
|
||||
状态: ACTIVE (有效)
|
||||
有效期: 2026-05-01 至 2027-06-02
|
||||
剩余次数: 0
|
||||
剩余金额: 30.00 (不足50.00)
|
||||
```
|
||||
|
||||
**会员G - 储值卡余额充足**
|
||||
```
|
||||
会员ID: MEM_TEST_G
|
||||
卡名称: 储值卡500
|
||||
状态: ACTIVE (有效)
|
||||
有效期: 2026-05-01 至 2027-06-02
|
||||
剩余次数: 0
|
||||
剩余金额: 200.00 (充足)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 六、SQL数据插入顺序
|
||||
|
||||
```sql
|
||||
-- 1. 先插入会员用户 (A-G)
|
||||
INSERT INTO member_user (member_no, nickname, phone, gender, is_deleted, created_at, updated_at) VALUES
|
||||
('MEM_TEST_A', '用户A_无卡新用户', '13800001001', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'),
|
||||
('MEM_TEST_B', '用户B_过期时长卡', '13800001002', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
|
||||
('MEM_TEST_C', '会员C_有效时长卡', '13800001003', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
|
||||
('MEM_TEST_D', '会员D_次数用尽', '13800001004', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
|
||||
('MEM_TEST_E', '会员E_次数充足', '13800001005', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
|
||||
('MEM_TEST_F', '会员F_储值卡余额不足', '13800001006', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'),
|
||||
('MEM_TEST_G', '会员G_储值卡余额充足', '13800001007', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00');
|
||||
|
||||
-- 2. 插入团课课程
|
||||
INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
|
||||
('燃脂搏击_次数卡课程', 102, 2, '2026-06-10 19:30:00', '2026-06-10 20:30:00', 20, 0, '0', '综合训练区', '高强度间歇训练，配合音乐快速燃脂，消耗1次', 1, 0.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00');
|
||||
|
||||
INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES
|
||||
('高端普拉提_储值卡课程', 103, 1, '2026-06-11 19:00:00', '2026-06-11 20:00:00', 15, 0, '0', '普拉提教室', '精准训练核心肌群，消耗储值50元', 0, 50.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00');
|
||||
|
||||
-- 3. 插入会员卡类型
|
||||
INSERT INTO member_card (member_card_name, member_card_type, member_card_price, member_card_validity_days, member_card_total_times, member_card_amount, member_card_status, extra_config, created_at, updated_at) VALUES
|
||||
('30天时长卡', 'TIME_CARD', 299.00, 30, NULL, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'),
|
||||
('10次卡', 'COUNT_CARD', 499.00, NULL, 10, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'),
|
||||
('储值卡500', 'STORED_VALUE_CARD', 500.00, NULL, NULL, 500.00, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00');
|
||||
|
||||
-- 4. 插入会员卡记录
|
||||
INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
|
||||
((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_B'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'EXPIRED', 0, 0.00, '2026-05-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
|
||||
|
||||
INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
|
||||
((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_C'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'ACTIVE', 0, 0.00, '2026-07-02 23:59:59', '2026-06-02 10:00:00', 0, '{}', '2026-06-02 10:00:00', '2026-06-02 10:00:00');
|
||||
|
||||
INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
|
||||
((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_D'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 0, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
|
||||
|
||||
INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
|
||||
((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_E'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 5, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
|
||||
|
||||
INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
|
||||
((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_F'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 30.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
|
||||
|
||||
INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES
|
||||
((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_G'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 200.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00');
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 七、预期测试结果
|
||||
|
||||
### 7.1 成功场景
|
||||
|
||||
| 场景 | 会员 | 操作 | 预期结果 |
|
||||
|-----|------|-----|---------|
|
||||
| 3 | 会员C | 预约次数卡团课 | 预约成功，消耗时长卡1次 |
|
||||
| 5 | 会员E | 预约次数卡团课 | 预约成功，次数减1 (5→4) |
|
||||
| 7 | 会员G | 预约储值卡团课 | 预约成功，余额减50 (200→150) |
|
||||
|
||||
### 7.2 失败场景
|
||||
|
||||
| 场景 | 会员 | 操作 | 预期错误码 | 预期提示信息 |
|
||||
|-----|------|-----|----------|------------|
|
||||
| 1 | 用户A | 预约次数卡团课 | NO_CARD | 无可用会员卡 |
|
||||
| 2 | 用户B | 预约次数卡团课 | CARD_EXPIRED | 会员卡已过期 |
|
||||
| 4 | 会员D | 预约次数卡团课 | INSUFFICIENT_TIMES | 剩余次数不足 |
|
||||
| 6 | 会员F | 预约储值卡团课 | INSUFFICIENT_BALANCE | 余额不足，当前余额30.00元，需50.00元 |
|
||||
|
||||
---
|
||||
|
||||
## 八、数据清理
|
||||
|
||||
测试完成后，可通过以下 SQL 清理测试数据：
|
||||
|
||||
```sql
|
||||
-- 删除测试会员（会级联删除相关会员卡记录）
|
||||
DELETE FROM member_user WHERE member_no LIKE 'MEM_TEST_%';
|
||||
|
||||
-- 删除测试团课
|
||||
DELETE FROM group_course WHERE course_name LIKE '%_次数卡课程' OR course_name LIKE '%_储值卡课程';
|
||||
|
||||
-- 删除测试会员卡类型
|
||||
DELETE FROM member_card WHERE member_card_name IN ('30天时长卡', '10次卡', '储值卡500');
|
||||
```
|
||||
@@ -0,0 +1,204 @@
|
||||
# V11 团课预约取消测试数据文档
|
||||
|
||||
## 文档说明
|
||||
|
||||
本文档描述了用于测试团课预约取消功能的测试数据，包含三种会员卡类型的取消预约场景。
|
||||
|
||||
## 测试场景概览
|
||||
|
||||
| 序号 | 场景描述 | 用户 | 会员卡类型 |
|
||||
| :--- | :--- | :--- | :--- |
|
||||
| 1 | 使用时长卡预约后取消 | 张三 | 时长卡（30天） |
|
||||
| 2 | 使用次数卡预约后取消 | 李四 | 次数卡（10次） |
|
||||
| 3 | 使用储值卡预约后取消 | 王五 | 储值卡（500元） |
|
||||
|
||||
## 测试用户数据
|
||||
|
||||
### 1. 张三（时长卡用户）
|
||||
|
||||
| 字段 | 值 |
|
||||
| :--- | :--- |
|
||||
| 会员编号 | `MEM_TEST_ZHANG` |
|
||||
| 昵称 | 张三_时长卡用户 |
|
||||
| 手机号 | 13800002001 |
|
||||
| 性别 | 男（1） |
|
||||
|
||||
#### 会员卡信息
|
||||
|
||||
| 字段 | 值 |
|
||||
| :--- | :--- |
|
||||
| 卡类型 | 时长卡（TIME_CARD） |
|
||||
| 卡名称 | 30天时长卡 |
|
||||
| 状态 | ACTIVE（有效） |
|
||||
| 到期时间 | 2026-07-02 23:59:59 |
|
||||
| 购买时间 | 2026-06-02 10:00:00 |
|
||||
|
||||
---
|
||||
|
||||
### 2. 李四（次数卡用户）
|
||||
|
||||
| 字段 | 值 |
|
||||
| :--- | :--- |
|
||||
| 会员编号 | `MEM_TEST_LI` |
|
||||
| 昵称 | 李四_次数卡用户 |
|
||||
| 手机号 | 13800002002 |
|
||||
| 性别 | 男（1） |
|
||||
|
||||
#### 会员卡信息
|
||||
|
||||
| 字段 | 值 |
|
||||
| :--- | :--- |
|
||||
| 卡类型 | 次数卡（COUNT_CARD） |
|
||||
| 卡名称 | 10次卡 |
|
||||
| 状态 | ACTIVE（有效） |
|
||||
| 剩余次数 | 5次 |
|
||||
| 到期时间 | 2026-12-31 23:59:59 |
|
||||
|
||||
---
|
||||
|
||||
### 3. 王五（储值卡用户）
|
||||
|
||||
| 字段 | 值 |
|
||||
| :--- | :--- |
|
||||
| 会员编号 | `MEM_TEST_WANG` |
|
||||
| 昵称 | 王五_储值卡用户 |
|
||||
| 手机号 | 13800002003 |
|
||||
| 性别 | 女（2） |
|
||||
|
||||
#### 会员卡信息
|
||||
|
||||
| 字段 | 值 |
|
||||
| :--- | :--- |
|
||||
| 卡类型 | 储值卡（STORED_VALUE_CARD） |
|
||||
| 卡名称 | 储值卡500 |
|
||||
| 状态 | ACTIVE（有效） |
|
||||
| 剩余金额 | 200.00元 |
|
||||
| 到期时间 | 2027-06-02 23:59:59 |
|
||||
|
||||
---
|
||||
|
||||
## 测试课程数据
|
||||
|
||||
### 晚间瑜伽_取消测试
|
||||
|
||||
| 字段 | 值 |
|
||||
| :--- | :--- |
|
||||
| 课程名称 | 晚间瑜伽_取消测试 |
|
||||
| 教练ID | 101 |
|
||||
| 课程类型 | 1 |
|
||||
| 开始时间 | 2026-06-15 19:00:00 |
|
||||
| 结束时间 | 2026-06-15 20:00:00 |
|
||||
| 上课地点 | 瑜伽教室 |
|
||||
| 最大人数 | 20人 |
|
||||
| 当前人数 | 3人（三位测试用户） |
|
||||
| 状态 | 0（正常） |
|
||||
| 次数消耗 | 1次 |
|
||||
| 储值消耗 | 30.00元 |
|
||||
|
||||
---
|
||||
|
||||
## 预约记录数据
|
||||
|
||||
### 预约状态说明
|
||||
|
||||
| 状态码 | 含义 |
|
||||
| :--- | :--- |
|
||||
| `0` | 已预约（等待取消） |
|
||||
| `1` | 已取消 |
|
||||
| `2` | 已出席 |
|
||||
| `3` | 缺席 |
|
||||
|
||||
### 预约记录详情
|
||||
|
||||
| 用户 | 预约时间 | 状态 | 课程名称 |
|
||||
| :--- | :--- | :--- | :--- |
|
||||
| 张三 | 2026-06-02 11:00:00 | 0（已预约） | 晚间瑜伽_取消测试 |
|
||||
| 李四 | 2026-06-02 11:30:00 | 0（已预约） | 晚间瑜伽_取消测试 |
|
||||
| 王五 | 2026-06-02 12:00:00 | 0（已预约） | 晚间瑜伽_取消测试 |
|
||||
|
||||
---
|
||||
|
||||
## 测试用例设计
|
||||
|
||||
### 场景1：时长卡用户取消预约
|
||||
|
||||
**前置条件：**
|
||||
- 张三持有有效时长卡
|
||||
- 张三已成功预约课程
|
||||
- 当前时间 < 课程开始时间
|
||||
|
||||
**测试步骤：**
|
||||
1. 调用取消预约接口，传入张三的预约记录ID
|
||||
2. 验证预约状态变为 `1`（已取消）
|
||||
3. 验证课程当前人数减1
|
||||
4. 验证时长卡状态保持不变（时长卡取消预约不影响卡状态）
|
||||
|
||||
**预期结果：**
|
||||
- 预约记录状态更新为已取消
|
||||
- 课程剩余名额增加1
|
||||
- 时长卡有效期不受影响
|
||||
|
||||
---
|
||||
|
||||
### 场景2：次数卡用户取消预约
|
||||
|
||||
**前置条件：**
|
||||
- 李四持有次数卡，剩余5次
|
||||
- 李四已成功预约课程（已扣除1次）
|
||||
- 当前时间 < 课程开始时间
|
||||
|
||||
**测试步骤：**
|
||||
1. 调用取消预约接口，传入李四的预约记录ID
|
||||
2. 验证预约状态变为 `1`（已取消）
|
||||
3. 验证课程当前人数减1
|
||||
4. 验证次数卡剩余次数恢复为5次（返还1次）
|
||||
|
||||
**预期结果：**
|
||||
- 预约记录状态更新为已取消
|
||||
- 课程剩余名额增加1
|
||||
- 次数卡返还1次，剩余次数恢复为5次
|
||||
|
||||
---
|
||||
|
||||
### 场景3：储值卡用户取消预约
|
||||
|
||||
**前置条件：**
|
||||
- 王五持有储值卡，余额200元
|
||||
- 王五已成功预约课程（已扣除30元）
|
||||
- 当前时间 < 课程开始时间
|
||||
|
||||
**测试步骤：**
|
||||
1. 调用取消预约接口，传入王五的预约记录ID
|
||||
2. 验证预约状态变为 `1`（已取消）
|
||||
3. 验证课程当前人数减1
|
||||
4. 验证储值卡余额恢复为200元（返还30元）
|
||||
|
||||
**预期结果：**
|
||||
- 预约记录状态更新为已取消
|
||||
- 课程剩余名额增加1
|
||||
- 储值卡返还30元，余额恢复为200元
|
||||
|
||||
---
|
||||
|
||||
## 数据文件位置
|
||||
|
||||
```
|
||||
manage-db/src/main/resources/db/migration/V11__Insert_Cancel_Booking_Test_Data.sql
|
||||
```
|
||||
|
||||
## 数据依赖
|
||||
|
||||
| 依赖文件 | 说明 |
|
||||
| :--- | :--- |
|
||||
| `V6__Create_GroupCourse_table.sql` | 团课相关表结构 |
|
||||
| `V8__Create_Member_And_MemberCard.sql` | 会员和会员卡表结构 |
|
||||
| `V9__Add_GroupCourse_Booking_Snapshot_Fields.sql` | 预约快照字段 |
|
||||
|
||||
---
|
||||
|
||||
## 注意事项
|
||||
|
||||
1. 测试数据中使用的日期均为未来日期，确保测试时课程尚未开始
|
||||
2. 会员卡状态均为 ACTIVE，确保可以正常预约
|
||||
3. 取消预约功能应在课程开始前24小时内允许操作（具体时间限制由业务逻辑决定）
|
||||
4. 取消预约后应记录操作日志和交易流水
|
||||
@@ -0,0 +1,400 @@
|
||||
# 团课预约场景测试数据文档
|
||||
|
||||
## 概述
|
||||
|
||||
本文档描述了团课预约功能的测试数据，覆盖了各种预约场景，用于验证系统在不同业务条件下的正确性和健壮性。
|
||||
|
||||
---
|
||||
|
||||
## 一、测试数据概览
|
||||
|
||||
| 数据类别 | 数量 | 说明 |
|
||||
|---------|------|------|
|
||||
| 测试会员 | 5个 | 覆盖不同会员卡状态 |
|
||||
| 会员卡类型 | 8种 | 次卡/时长卡/储值卡 |
|
||||
| 会员卡记录 | 5条 | 会员持有的实际卡 |
|
||||
| 团课预约记录 | 4条 | 不同状态的预约 |
|
||||
| 交易流水 | 27条 | 完整的消费记录 |
|
||||
|
||||
---
|
||||
|
||||
## 二、会员测试数据
|
||||
|
||||
### 2.1 会员列表
|
||||
|
||||
| 会员ID | 会员编号 | 昵称 | 手机号 | 性别 | 会员卡状态 |
|
||||
|--------|---------|------|--------|------|-----------|
|
||||
| 1001 | MEM202606001 | 新用户小张 | 13800138001 | 男 | 无会员卡 |
|
||||
| 1002 | MEM202606002 | 额度耗尽用户 | 13800138002 | 女 | 次卡已用完 |
|
||||
| 1003 | MEM202606003 | 额度充足用户 | 13800138003 | 男 | 次卡剩余8次 |
|
||||
| 1004 | MEM202606004 | 过期卡用户 | 13800138004 | 女 | 月卡已过期 |
|
||||
| 1005 | MEM202606005 | 多卡用户小李 | 13800138005 | 男 | 次卡+储值卡 |
|
||||
|
||||
### 2.2 会员详情
|
||||
|
||||
**会员1001 - 新用户小张**
|
||||
- 状态：新注册用户，尚未购买任何会员卡
|
||||
- 用途：测试无会员卡情况下的预约行为
|
||||
|
||||
**会员1002 - 额度耗尽用户**
|
||||
- 状态：持有10次团课卡，已全部用完
|
||||
- 用途：测试会员卡额度耗尽时的预约行为
|
||||
|
||||
**会员1003 - 额度充足用户**
|
||||
- 状态：持有20次团课卡，剩余8次
|
||||
- 用途：测试正常预约流程
|
||||
|
||||
**会员1004 - 过期卡用户**
|
||||
- 状态：持有月卡，已于2026-05-31过期
|
||||
- 用途：测试过期会员卡的预约行为
|
||||
|
||||
**会员1005 - 多卡用户小李**
|
||||
- 状态：持有50次团课卡(剩余45次) + 500元储值卡(剩余350元)
|
||||
- 用途：测试多会员卡用户选择支付方式的场景
|
||||
|
||||
---
|
||||
|
||||
## 三、会员卡类型数据
|
||||
|
||||
### 3.1 次卡类型
|
||||
|
||||
| 卡类型ID | 卡名称 | 类型 | 价格 | 有效天数 | 总次数 | 状态 |
|
||||
|---------|-------|------|------|---------|-------|------|
|
||||
| 101 | 10次团课卡 | COUNT_CARD | 299.00 | 90 | 10 | 上架 |
|
||||
| 102 | 20次团课卡 | COUNT_CARD | 499.00 | 180 | 20 | 上架 |
|
||||
| 103 | 50次团课卡 | COUNT_CARD | 999.00 | 365 | 50 | 上架 |
|
||||
|
||||
### 3.2 时长卡类型
|
||||
|
||||
| 卡类型ID | 卡名称 | 类型 | 价格 | 有效天数 | 状态 |
|
||||
|---------|-------|------|------|---------|------|
|
||||
| 201 | 月卡 | TIME_CARD | 399.00 | 30 | 上架 |
|
||||
| 202 | 季卡 | TIME_CARD | 899.00 | 90 | 上架 |
|
||||
| 203 | 年卡 | TIME_CARD | 2999.00 | 365 | 上架 |
|
||||
|
||||
### 3.3 储值卡类型
|
||||
|
||||
| 卡类型ID | 卡名称 | 类型 | 价格 | 面额 | 有效天数 | 状态 |
|
||||
|---------|-------|------|------|------|---------|------|
|
||||
| 301 | 500元储值卡 | STORED_VALUE_CARD | 500.00 | 500.00 | 365 | 上架 |
|
||||
| 302 | 1000元储值卡 | STORED_VALUE_CARD | 1000.00 | 1000.00 | 365 | 上架 |
|
||||
|
||||
---
|
||||
|
||||
## 四、会员卡记录数据（会员持有的卡）
|
||||
|
||||
| 记录ID | 会员ID | 卡类型ID | 状态 | 剩余次数 | 剩余金额 | 到期时间 | 购买时间 |
|
||||
|-------|--------|---------|------|---------|---------|---------|---------|
|
||||
| 2001 | 1002 | 101 | USED_UP | 0 | 0.00 | 2026-09-01 | 2026-06-01 |
|
||||
| 2002 | 1003 | 102 | ACTIVE | 8 | 0.00 | 2026-12-01 | 2026-06-01 |
|
||||
| 2003 | 1004 | 201 | EXPIRED | 0 | 0.00 | 2026-05-31 | 2026-05-01 |
|
||||
| 2004 | 1005 | 103 | ACTIVE | 45 | 0.00 | 2027-06-01 | 2026-06-01 |
|
||||
| 2005 | 1005 | 301 | ACTIVE | 0 | 350.00 | 2027-06-01 | 2026-05-15 |
|
||||
|
||||
---
|
||||
|
||||
## 五、团课预约记录数据
|
||||
|
||||
| 预约ID | 课程ID | 会员ID | 会员卡记录ID | 预约时间 | 状态 | 课程名称 |
|
||||
|-------|-------|--------|-------------|---------|------|---------|
|
||||
| 3001 | 1 | 1003 | 2002 | 2026-06-01 15:30 | 已预约(0) | 极速燃脂单车 |
|
||||
| 3002 | 2 | 1003 | 2002 | 2026-06-01 10:00 | 已取消(1) | 清晨流瑜伽 |
|
||||
| 3003 | 6 | 1003 | 2002 | 2026-05-28 19:00 | 已出席(2) | 蜜桃臀塑造 |
|
||||
| 3004 | 7 | 1002 | 2001 | 2026-05-30 10:00 | 缺席(3) | 午间冥想放松 |
|
||||
|
||||
### 状态说明
|
||||
|
||||
| 状态码 | 状态名称 | 说明 |
|
||||
|-------|---------|------|
|
||||
| 0 | 已预约 | 用户已成功预约，等待上课 |
|
||||
| 1 | 已取消 | 用户主动取消预约 |
|
||||
| 2 | 已出席 | 用户已按时参加课程 |
|
||||
| 3 | 缺席 | 用户预约后未出席 |
|
||||
|
||||
---
|
||||
|
||||
## 六、测试场景详解
|
||||
|
||||
### 场景1：新注册用户无会员卡预约
|
||||
|
||||
**测试目标**：验证系统对无会员卡用户的预约拦截
|
||||
|
||||
**测试数据**：
|
||||
- 用户ID：1001（新用户小张）
|
||||
- 目标课程：任意课程
|
||||
|
||||
**预期结果**：
|
||||
- 返回错误信息："未绑定会员卡，请先购买会员卡"
|
||||
- HTTP状态码：400 Bad Request
|
||||
|
||||
---
|
||||
|
||||
### 场景2：会员卡额度耗尽预约
|
||||
|
||||
**测试目标**：验证系统对额度耗尽会员卡的预约拦截
|
||||
|
||||
**测试数据**：
|
||||
- 用户ID：1002（额度耗尽用户）
|
||||
- 会员卡记录ID：2001
|
||||
- 剩余次数：0
|
||||
|
||||
**预期结果**：
|
||||
- 返回错误信息："会员卡余额不足"
|
||||
- HTTP状态码：400 Bad Request
|
||||
|
||||
---
|
||||
|
||||
### 场景3：会员卡额度充足预约
|
||||
|
||||
**测试目标**：验证正常预约流程
|
||||
|
||||
**测试数据**：
|
||||
- 用户ID：1003（额度充足用户）
|
||||
- 会员卡记录ID：2002
|
||||
- 剩余次数：8
|
||||
- 目标课程：课程ID=1（极速燃脂单车）
|
||||
|
||||
**预期结果**：
|
||||
- 预约成功
|
||||
- 会员卡剩余次数减1（变为7次）
|
||||
- 生成预约记录
|
||||
- HTTP状态码：200 OK
|
||||
|
||||
---
|
||||
|
||||
### 场景4：会员卡已过期预约
|
||||
|
||||
**测试目标**：验证系统对过期会员卡的预约拦截
|
||||
|
||||
**测试数据**：
|
||||
- 用户ID：1004（过期卡用户）
|
||||
- 会员卡记录ID：2003
|
||||
- 状态：EXPIRED
|
||||
- 到期时间：2026-05-31
|
||||
|
||||
**预期结果**：
|
||||
- 返回错误信息："会员卡已过期"
|
||||
- HTTP状态码：400 Bad Request
|
||||
|
||||
---
|
||||
|
||||
### 场景5：课程已满员预约---------------
|
||||
|
||||
**测试目标**：验证系统对满员课程的预约拦截
|
||||
|
||||
**测试数据**：
|
||||
- 课程ID：3（燃脂搏击）
|
||||
- 当前人数：20/20
|
||||
|
||||
**预期结果**：
|
||||
- 返回错误信息："课程已满员"
|
||||
- HTTP状态码：400 Bad Request
|
||||
|
||||
---
|
||||
|
||||
### 场景6：课程已取消预约
|
||||
|
||||
**测试目标**：验证系统对已取消课程的预约拦截
|
||||
|
||||
**测试数据**：
|
||||
- 课程ID：5（周末冥想修复）
|
||||
- 状态：1（已取消）
|
||||
|
||||
**预期结果**：
|
||||
- 返回错误信息："课程已取消"
|
||||
- HTTP状态码：400 Bad Request
|
||||
|
||||
---
|
||||
|
||||
### 场景7：课程已结束预约
|
||||
|
||||
**测试目标**：验证系统对已结束课程的预约拦截
|
||||
|
||||
**测试数据**：
|
||||
- 课程ID：6（蜜桃臀塑造）或 7（午间冥想放松）
|
||||
- 状态：2（已结束）
|
||||
|
||||
**预期结果**：
|
||||
- 返回错误信息："课程已结束"
|
||||
- HTTP状态码：400 Bad Request
|
||||
|
||||
---
|
||||
|
||||
### 场景8：超出预约时间预约
|
||||
|
||||
**测试目标**：验证系统对预约时间窗口的控制
|
||||
|
||||
**测试数据**：
|
||||
- 课程ID：4（哈他瑜伽）
|
||||
- 开始时间：2026-06-01 15:20:00
|
||||
- 测试时间：课程开始前30分钟内
|
||||
|
||||
**预期结果**：
|
||||
- 返回错误信息："已过预约时间"
|
||||
- HTTP状态码：400 Bad Request
|
||||
|
||||
---
|
||||
|
||||
### 场景9：重复预约同一课程
|
||||
|
||||
**测试目标**：验证系统对重复预约的拦截
|
||||
|
||||
**测试数据**：
|
||||
- 用户ID：1003（额度充足用户）
|
||||
- 课程ID：1（极速燃脂单车）
|
||||
- 已有预约记录：booking_id=3001
|
||||
|
||||
**预期结果**：
|
||||
- 返回错误信息："已预约该课程"
|
||||
- HTTP状态码：400 Bad Request
|
||||
|
||||
---
|
||||
|
||||
### 场景10：多会员卡用户选择支付方式
|
||||
|
||||
**测试目标**：验证多卡用户的支付方式选择功能
|
||||
|
||||
**测试数据**：
|
||||
- 用户ID：1005（多卡用户小李）
|
||||
- 可用卡1：次卡（记录ID=2004，剩余45次）
|
||||
- 可用卡2：储值卡（记录ID=2005，剩余350元）
|
||||
|
||||
**预期结果**：
|
||||
- 系统列出用户所有可用会员卡
|
||||
- 用户可选择使用次卡或储值卡支付
|
||||
- 根据选择的卡类型扣减相应额度
|
||||
|
||||
---
|
||||
|
||||
## 七、交易流水说明
|
||||
|
||||
### 7.1 会员1002（额度耗尽用户）消费记录
|
||||
|
||||
| 操作顺序 | 操作类型 | 变动次数 | 剩余次数 | 备注 |
|
||||
|---------|---------|---------|---------|------|
|
||||
| 1 | PURCHASE | +10 | 10 | 购买10次团课卡 |
|
||||
| 2-11 | DEDUCT | -1×10 | 0 | 10次课程消费 |
|
||||
|
||||
### 7.2 会员1003（额度充足用户）消费记录
|
||||
|
||||
| 操作顺序 | 操作类型 | 变动次数 | 剩余次数 | 备注 |
|
||||
|---------|---------|---------|---------|------|
|
||||
| 1 | PURCHASE | +20 | 20 | 购买20次团课卡 |
|
||||
| 2-12 | DEDUCT | -12 | 8 | 12次课程消费 |
|
||||
|
||||
### 7.3 会员1005（多卡用户）消费记录
|
||||
|
||||
| 会员卡记录ID | 操作类型 | 变动次数 | 变动金额 | 备注 |
|
||||
|-------------|---------|---------|---------|------|
|
||||
| 2004 | PURCHASE | +50 | 0 | 购买50次团课卡 |
|
||||
| 2004 | DEDUCT | -5 | 0 | 预约5节课程 |
|
||||
| 2005 | PURCHASE | 0 | +500 | 购买500元储值卡 |
|
||||
| 2005 | DEDUCT | 0 | -150 | 私教课消费150元 |
|
||||
|
||||
---
|
||||
|
||||
## 八、API测试示例
|
||||
|
||||
### 8.1 预约接口
|
||||
|
||||
```http
|
||||
POST /api/group-course/bookings
|
||||
Content-Type: application/json
|
||||
|
||||
{
|
||||
"courseId": 1,
|
||||
"memberCardRecordId": 2002
|
||||
}
|
||||
```
|
||||
|
||||
### 8.2 取消预约接口
|
||||
|
||||
```http
|
||||
PUT /api/group-course/bookings/{bookingId}/cancel
|
||||
Content-Type: application/json
|
||||
|
||||
{
|
||||
"reason": "临时有事无法参加"
|
||||
}
|
||||
```
|
||||
|
||||
### 8.3 查询用户预约列表
|
||||
|
||||
```http
|
||||
GET /api/group-course/bookings?memberId=1003
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 九、测试数据对应关系图
|
||||
|
||||
```
|
||||
会员表 (member_user)
|
||||
│
|
||||
├── 1001 ──→ (无会员卡)
|
||||
├── 1002 ──→ 会员卡记录 2001 (USED_UP)
|
||||
├── 1003 ──→ 会员卡记录 2002 (ACTIVE, 8次)
|
||||
├── 1004 ──→ 会员卡记录 2003 (EXPIRED)
|
||||
└── 1005 ──→ 会员卡记录 2004 (ACTIVE, 45次)
|
||||
└── 会员卡记录 2005 (ACTIVE, 350元)
|
||||
│
|
||||
↓
|
||||
预约记录表 (group_course_booking)
|
||||
│
|
||||
├── 3001: 已预约
|
||||
├── 3002: 已取消
|
||||
├── 3003: 已出席
|
||||
└── 3004: 缺席
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 十、数据初始化
|
||||
|
||||
测试数据通过 Flyway 迁移脚本 `V10__Insert_Booking_Test_Data.sql` 初始化，需在数据库初始化时执行。
|
||||
|
||||
**执行顺序**：
|
||||
1. V1__Create_all_tables.sql - 创建基础表结构
|
||||
2. V2__Insert_initial_data.sql - 插入初始数据
|
||||
3. V6__Create_GroupCourse_table.sql - 创建团课表
|
||||
4. V7__Insert_GroupCourse_test_data.sql - 插入团课测试数据
|
||||
5. V8__Create_Member_And_MemberCard.sql - 创建会员和会员卡表
|
||||
6. V9__Add_GroupCourse_Booking_Snapshot_Fields.sql - 添加冗余字段
|
||||
7. V10__Insert_Booking_Test_Data.sql - 插入预约测试数据（本文件）
|
||||
|
||||
---
|
||||
|
||||
**文档版本**: v1.1
|
||||
**创建时间**: 2026-06-02
|
||||
**更新时间**: 2026-06-02
|
||||
**适用场景**: 团课预约功能测试
|
||||
|
||||
---
|
||||
|
||||
## 十一、重要说明
|
||||
|
||||
### 11.1 字段说明
|
||||
|
||||
`member_card_record` 表包含两个ID字段：
|
||||
- `id` - 数据库主键（BIGSERIAL PRIMARY KEY）
|
||||
- `member_card_record_id` - 业务ID（BIGSERIAL），代码中使用此字段作为查询和更新条件
|
||||
|
||||
### 11.2 测试数据修复记录
|
||||
|
||||
**v1.1 修复内容**：
|
||||
- 修复了 `member_card_record` 表测试数据缺失 `member_card_record_id` 字段的问题
|
||||
- 原问题：测试数据只插入了 `id` 字段，导致 `member_card_record_id` 为 NULL
|
||||
- 影响：代码使用 `member_card_record_id` 作为WHERE条件时无法匹配到记录，导致扣减权益失败
|
||||
- 解决：在INSERT语句中添加 `member_card_record_id` 字段，值与 `id` 相同
|
||||
|
||||
**修复前**：
|
||||
```sql
|
||||
INSERT INTO member_card_record (id, member_id, member_card_id, ...) VALUES
|
||||
(2001, 1002, 101, ...);
|
||||
```
|
||||
|
||||
**修复后**：
|
||||
```sql
|
||||
INSERT INTO member_card_record (id, member_card_record_id, member_id, member_card_id, ...) VALUES
|
||||
(2001, 2001, 1002, 101, ...);
|
||||
```
|
||||
@@ -0,0 +1,452 @@
|
||||
# 数据统计模块 API 文档
|
||||
|
||||
> **文档版本**: v1.0
|
||||
> **创建日期**: 2026-06-09
|
||||
> **作者**: system
|
||||
> **状态**: 正式发布
|
||||
|
||||
---
|
||||
|
||||
## 📋 目录
|
||||
|
||||
1. [概述](#概述)
|
||||
2. [基础路径](#基础路径)
|
||||
3. [统计数据接口](#统计数据接口)
|
||||
- [获取综合统计数据](#获取综合统计数据)
|
||||
- [获取会员统计数据](#获取会员统计数据)
|
||||
- [获取预约统计数据](#获取预约统计数据)
|
||||
- [获取签到统计数据](#获取签到统计数据)
|
||||
- [查询历史统计数据](#查询历史统计数据)
|
||||
- [导出统计数据](#导出统计数据)
|
||||
4. [数据模型](#数据模型)
|
||||
- [StatisticsQuery（查询条件）](#StatisticsQuery查询条件)
|
||||
- [StatisticsSummary（统计汇总）](#StatisticsSummary统计汇总)
|
||||
- [MemberStatistics（会员统计）](#MemberStatistics会员统计)
|
||||
- [BookingStatistics（预约统计）](#BookingStatistics预约统计)
|
||||
- [SignInStatistics（签到统计）](#SignInStatistics签到统计)
|
||||
5. [状态码说明](#状态码说明)
|
||||
6. [业务规则](#业务规则)
|
||||
|
||||
---
|
||||
|
||||
## 概述
|
||||
|
||||
数据统计模块提供健身房会员、预约、签到数据的统计功能，支持按日、周、月周期统计，并提供Excel导出功能。采用 Spring WebFlux 响应式编程，统计结果通过 Redis 缓存提高查询性能。
|
||||
|
||||
## 基础路径
|
||||
|
||||
所有接口的基础路径为: `http://{host}:{port}/api/datacount`
|
||||
|
||||
---
|
||||
|
||||
## 统计数据接口
|
||||
|
||||
### 获取综合统计数据
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/datacount/summary` |
|
||||
| **所属文件** | `DataStatisticsHandler.java` |
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|--------|------|------|--------|------|
|
||||
| statType | string | 否 | 空 | 统计类型筛选 |
|
||||
| periodType | string | 否 | DAY | 统计周期：DAY/WEEK/MONTH |
|
||||
| startTime | string | 否 | 自动计算 | 开始时间（ISO格式） |
|
||||
| endTime | string | 否 | 自动计算 | 结束时间（ISO格式） |
|
||||
|
||||
**请求示例**:
|
||||
|
||||
```bash
|
||||
# 1. 使用周期类型查询今日统计
|
||||
GET /api/datacount/summary?periodType=DAY
|
||||
|
||||
# 2. 使用周期类型查询本周统计
|
||||
GET /api/datacount/summary?periodType=WEEK
|
||||
|
||||
# 3. 使用周期类型查询本月统计
|
||||
GET /api/datacount/summary?periodType=MONTH
|
||||
|
||||
# 4. 使用自定义时间范围查询
|
||||
GET /api/datacount/summary?startTime=2026-06-01T00:00:00&endTime=2026-06-07T23:59:59
|
||||
|
||||
# 5. 带统计类型筛选
|
||||
GET /api/datacount/summary?statType=member&periodType=WEEK
|
||||
```
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"statDate": "2026-06-09",
|
||||
"generatedAt": "2026-06-09T10:30:00",
|
||||
"memberStatistics": {
|
||||
"statDate": "2026-06-09",
|
||||
"newMembers": 5,
|
||||
"activeMembers": 120,
|
||||
"totalMembers": 500,
|
||||
"signInMembers": 85,
|
||||
"bookingMembers": 45,
|
||||
"cancelMembers": 5
|
||||
},
|
||||
"bookingStatistics": {
|
||||
"statDate": "2026-06-09",
|
||||
"totalBookings": 60,
|
||||
"cancelBookings": 10,
|
||||
"attendBookings": 45,
|
||||
"absentBookings": 5,
|
||||
"attendRate": 75.0,
|
||||
"cancelRate": 16.67
|
||||
},
|
||||
"signInStatistics": {
|
||||
"statDate": "2026-06-09",
|
||||
"totalSignIns": 95,
|
||||
"successSignIns": 92,
|
||||
"failSignIns": 3,
|
||||
"successRate": 96.84,
|
||||
"signInTypeDistribution": {
|
||||
"QR_CODE": 60,
|
||||
"MANUAL": 25,
|
||||
"FACE": 10
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 获取会员统计数据
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/datacount/member` |
|
||||
| **所属文件** | `DataStatisticsHandler.java` |
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|--------|------|------|--------|------|
|
||||
| periodType | string | 否 | DAY | 统计周期：DAY/WEEK/MONTH |
|
||||
| startTime | string | 否 | 自动计算 | 开始时间 |
|
||||
| endTime | string | 否 | 自动计算 | 结束时间 |
|
||||
|
||||
**请求示例**:
|
||||
|
||||
```bash
|
||||
# 1. 查询今日会员统计
|
||||
GET /api/datacount/member
|
||||
|
||||
# 2. 查询本周会员统计
|
||||
GET /api/datacount/member?periodType=WEEK
|
||||
|
||||
# 3. 查询指定时间范围的会员统计
|
||||
GET /api/datacount/member?startTime=2026-06-01T00:00:00&endTime=2026-06-30T23:59:59
|
||||
```
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"statDate": "2026-06-09",
|
||||
"newMembers": 5,
|
||||
"activeMembers": 120,
|
||||
"totalMembers": 500,
|
||||
"signInMembers": 85,
|
||||
"bookingMembers": 45,
|
||||
"cancelMembers": 5
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 获取预约统计数据
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/datacount/booking` |
|
||||
| **所属文件** | `DataStatisticsHandler.java` |
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|--------|------|------|--------|------|
|
||||
| periodType | string | 否 | DAY | 统计周期：DAY/WEEK/MONTH |
|
||||
| startTime | string | 否 | 自动计算 | 开始时间 |
|
||||
| endTime | string | 否 | 自动计算 | 结束时间 |
|
||||
|
||||
**请求示例**:
|
||||
|
||||
```bash
|
||||
# 1. 查询今日预约统计
|
||||
GET /api/datacount/booking
|
||||
|
||||
# 2. 查询本月预约统计
|
||||
GET /api/datacount/booking?periodType=MONTH
|
||||
|
||||
# 3. 查询指定日期范围的预约统计
|
||||
GET /api/datacount/booking?startTime=2026-06-01T00:00:00&endTime=2026-06-15T23:59:59
|
||||
```
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"statDate": "2026-06-09",
|
||||
"totalBookings": 60,
|
||||
"cancelBookings": 10,
|
||||
"attendBookings": 45,
|
||||
"absentBookings": 5,
|
||||
"attendRate": 75.0,
|
||||
"cancelRate": 16.67
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 获取签到统计数据
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/datacount/signin` |
|
||||
| **所属文件** | `DataStatisticsHandler.java` |
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|--------|------|------|--------|------|
|
||||
| periodType | string | 否 | DAY | 统计周期：DAY/WEEK/MONTH |
|
||||
| startTime | string | 否 | 自动计算 | 开始时间 |
|
||||
| endTime | string | 否 | 自动计算 | 结束时间 |
|
||||
|
||||
**请求示例**:
|
||||
|
||||
```bash
|
||||
# 1. 查询今日签到统计
|
||||
GET /api/datacount/signin
|
||||
|
||||
# 2. 查询本周签到统计
|
||||
GET /api/datacount/signin?periodType=WEEK
|
||||
|
||||
# 3. 查询指定日期范围的签到统计
|
||||
GET /api/datacount/signin?startTime=2026-06-01T00:00:00&endTime=2026-06-30T23:59:59
|
||||
```
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
{
|
||||
"statDate": "2026-06-09",
|
||||
"totalSignIns": 95,
|
||||
"successSignIns": 92,
|
||||
"failSignIns": 3,
|
||||
"successRate": 96.84,
|
||||
"signInTypeDistribution": {
|
||||
"QR_CODE": 60,
|
||||
"MANUAL": 25,
|
||||
"FACE": 10
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 查询历史统计数据
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/datacount/history` |
|
||||
| **所属文件** | `DataStatisticsHandler.java` |
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|--------|------|------|--------|------|
|
||||
| statType | string | 否 | 空 | 统计类型：member/booking/signin |
|
||||
| startTime | string | 是 | - | 开始日期（格式：yyyy-MM-dd） |
|
||||
| endTime | string | 是 | - | 结束日期（格式：yyyy-MM-dd） |
|
||||
|
||||
**请求示例**:
|
||||
|
||||
```bash
|
||||
# 1. 查询指定日期范围的签到历史统计
|
||||
GET /api/datacount/history?statType=signin&startTime=2026-06-01&endTime=2026-06-30
|
||||
|
||||
# 2. 查询指定日期范围的会员历史统计
|
||||
GET /api/datacount/history?statType=member&startTime=2026-06-01&endTime=2026-06-15
|
||||
|
||||
# 3. 查询指定日期范围的预约历史统计
|
||||
GET /api/datacount/history?statType=booking&startTime=2026-06-01&endTime=2026-06-30
|
||||
|
||||
# 4. 查询所有类型的历史统计（不指定statType）
|
||||
GET /api/datacount/history?startTime=2026-06-01&endTime=2026-06-07
|
||||
```
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"statDate": "2026-06-07",
|
||||
"totalSignIns": 88,
|
||||
"successSignIns": 86,
|
||||
"failSignIns": 2,
|
||||
"successRate": 97.73,
|
||||
"signInTypeDistribution": {
|
||||
"QR_CODE": 55,
|
||||
"MANUAL": 23,
|
||||
"FACE": 10
|
||||
}
|
||||
},
|
||||
{
|
||||
"statDate": "2026-06-08",
|
||||
"totalSignIns": 92,
|
||||
"successSignIns": 90,
|
||||
"failSignIns": 2,
|
||||
"successRate": 97.83,
|
||||
"signInTypeDistribution": {
|
||||
"QR_CODE": 58,
|
||||
"MANUAL": 24,
|
||||
"FACE": 10
|
||||
}
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 导出统计数据
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| **HTTP方法** | GET |
|
||||
| **接口路径** | `/api/datacount/export` |
|
||||
| **所属文件** | `DataStatisticsHandler.java` |
|
||||
|
||||
**请求参数**:
|
||||
|
||||
| 参数名 | 类型 | 必填 | 默认值 | 说明 |
|
||||
|--------|------|------|--------|------|
|
||||
| periodType | string | 否 | DAY | 统计周期：DAY/WEEK/MONTH |
|
||||
| startTime | string | 否 | 自动计算 | 开始时间 |
|
||||
| endTime | string | 否 | 自动计算 | 结束时间 |
|
||||
|
||||
**请求示例**:
|
||||
|
||||
```bash
|
||||
# 1. 导出今日统计数据
|
||||
GET /api/datacount/export
|
||||
|
||||
# 2. 导出本周统计数据
|
||||
GET /api/datacount/export?periodType=WEEK
|
||||
|
||||
# 3. 导出本月统计数据
|
||||
GET /api/datacount/export?periodType=MONTH
|
||||
|
||||
# 4. 导出指定时间范围的统计数据
|
||||
GET /api/datacount/export?startTime=2026-06-01T00:00:00&endTime=2026-06-30T23:59:59
|
||||
```
|
||||
|
||||
**成功响应** (200 OK):
|
||||
|
||||
返回 Excel 文件（.xlsx），包含以下 Sheet：
|
||||
- **会员统计**: 会员相关统计数据
|
||||
- **预约统计**: 预约相关统计数据
|
||||
- **签到统计**: 签到相关统计数据
|
||||
|
||||
**Content-Type**: `application/vnd.openxmlformats-officedocument.spreadsheetml.sheet`
|
||||
|
||||
---
|
||||
|
||||
## 数据模型
|
||||
|
||||
### StatisticsQuery（查询条件）
|
||||
|
||||
| 字段名 | 类型 | 说明 |
|
||||
|--------|------|------|
|
||||
| statType | String | 统计类型筛选 |
|
||||
| periodType | String | 统计周期：DAY/WEEK/MONTH |
|
||||
| startTime | LocalDateTime | 开始时间 |
|
||||
| endTime | LocalDateTime | 结束时间 |
|
||||
|
||||
### StatisticsSummary（统计汇总）
|
||||
|
||||
| 字段名 | 类型 | 说明 |
|
||||
|--------|------|------|
|
||||
| statDate | String | 统计日期 |
|
||||
| generatedAt | String | 生成时间 |
|
||||
| memberStatistics | MemberStatistics | 会员统计数据 |
|
||||
| bookingStatistics | BookingStatistics | 预约统计数据 |
|
||||
| signInStatistics | SignInStatistics | 签到统计数据 |
|
||||
|
||||
### MemberStatistics（会员统计）
|
||||
|
||||
| 字段名 | 类型 | 说明 |
|
||||
|--------|------|------|
|
||||
| statDate | String | 统计日期 |
|
||||
| newMembers | Long | 新增会员数 |
|
||||
| activeMembers | Long | 活跃会员数 |
|
||||
| totalMembers | Long | 累计会员总数 |
|
||||
| signInMembers | Long | 签到会员数 |
|
||||
| bookingMembers | Long | 预约会员数 |
|
||||
| cancelMembers | Long | 取消预约会员数 |
|
||||
|
||||
### BookingStatistics（预约统计）
|
||||
|
||||
| 字段名 | 类型 | 说明 |
|
||||
|--------|------|------|
|
||||
| statDate | String | 统计日期 |
|
||||
| totalBookings | Long | 预约总数 |
|
||||
| cancelBookings | Long | 取消预约数 |
|
||||
| attendBookings | Long | 出席预约数 |
|
||||
| absentBookings | Long | 缺席预约数 |
|
||||
| attendRate | Double | 出席率（%） |
|
||||
| cancelRate | Double | 取消率（%） |
|
||||
|
||||
### SignInStatistics（签到统计）
|
||||
|
||||
| 字段名 | 类型 | 说明 |
|
||||
|--------|------|------|
|
||||
| statDate | String | 统计日期 |
|
||||
| totalSignIns | Long | 签到总次数 |
|
||||
| successSignIns | Long | 成功签到次数 |
|
||||
| failSignIns | Long | 失败签到次数 |
|
||||
| successRate | Double | 签到成功率（%） |
|
||||
| signInTypeDistribution | Map<String, Long> | 签到类型分布 |
|
||||
|
||||
---
|
||||
|
||||
## 状态码说明
|
||||
|
||||
| 状态码 | 说明 |
|
||||
|--------|------|
|
||||
| 200 | 请求成功 |
|
||||
| 400 | 请求参数错误 |
|
||||
| 500 | 服务器内部错误 |
|
||||
|
||||
---
|
||||
|
||||
## 业务规则
|
||||
|
||||
1. **统计周期**: 支持按日、周、月统计
|
||||
- DAY: 当天 00:00:00 - 当前时间
|
||||
- WEEK: 本周一 00:00:00 - 本周日 23:59:59
|
||||
- MONTH: 本月1日 00:00:00 - 本月最后一天 23:59:59
|
||||
|
||||
2. **数据保留**: 统计数据缓存30天，业务记录永久保存
|
||||
|
||||
3. **缓存策略**: 查询结果缓存1小时，统计数据缓存30天
|
||||
|
||||
4. **定时任务**:
|
||||
- 每日凌晨2点执行前一天的日统计
|
||||
- 每周一凌晨3点执行上周的周统计
|
||||
- 每月1日凌晨3点执行上月的月统计
|
||||
- 每月15日凌晨4点清理30天前的旧数据
|
||||
|
||||
5. **数据导出**: 支持Excel格式导出，包含会员、预约、签到三个Sheet
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,87 @@
|
||||
一、基础有氧与热身（难度 1-3）
|
||||
|
||||
主要是低冲击、低技巧，用于建立运动基础。
|
||||
|
||||
慢走/椭圆机轻松模式：1（几乎无难度，适合所有人）
|
||||
|
||||
固定自行车（低阻力）：2（注意座椅高度调节即可）
|
||||
|
||||
跑步机慢跑：3（需要基本协调性，膝盖有压力）
|
||||
|
||||
跳绳（连续基础跳）：3（需要手脚配合，心肺要求明显）
|
||||
|
||||
二、固定器械训练（难度 2-5）
|
||||
|
||||
轨迹固定，主要考验力量和耐力，技巧要求低。
|
||||
|
||||
坐姿腿屈伸/腿弯举：2（很容易找到发力感）
|
||||
|
||||
坐姿推胸机：3（需注意肩胛后收，避免耸肩）
|
||||
|
||||
高位下拉（坐姿）：3（需控制不要过度后仰）
|
||||
|
||||
史密斯机深蹲：4（轨迹固定，但需保持核心稳定）
|
||||
|
||||
蝴蝶机夹胸：3（易用肘关节代偿，需锁定肩关节）
|
||||
|
||||
三、自重基础动作（难度 3-7）
|
||||
|
||||
需要一定的力量-体重比和身体控制能力。
|
||||
|
||||
平板支撑：3（耐力考验，技巧低）
|
||||
|
||||
跪姿俯卧撑：3（上肢力量较弱者首选）
|
||||
|
||||
标准俯卧撑：5（需核心收紧，身体成直线）
|
||||
|
||||
引体向上（弹力带辅助）：6（背部和手臂力量要求高）
|
||||
|
||||
标准引体向上：8（力量-体重比极高，多数男性无法完成1次）
|
||||
|
||||
徒手深蹲：3（注意膝盖方向与背部直立）
|
||||
|
||||
单腿深蹲（手枪蹲）：8（需要极高下肢力量、柔韧性和平衡）
|
||||
|
||||
四、自由重量杠铃/哑铃（难度 5-9）
|
||||
|
||||
技巧风险最高，需要神经系统协调和长期动作打磨。
|
||||
|
||||
哑铃二头弯举：4（容易晃动借力，但较安全）
|
||||
|
||||
哑铃侧平举：5（极易用斜方肌代偿，真正练到三角肌中束很难）
|
||||
|
||||
杠铃卧推：7（肩关节压力大，起桥、沉肩、稳定手腕均有技巧，有压伤风险）
|
||||
|
||||
杠铃深蹲（颈后）：8（全身协调性、核心抗压、杠位放置、呼吸模式，学习曲线陡峭）
|
||||
|
||||
传统硬拉：9（风险极高，需要精确的脊柱中立、髋铰链、背阔肌收紧，错误时伤腰）
|
||||
|
||||
高翻/抓举（奥运举重）：10（需要爆发力、柔韧、精准衔接，非数月训练不能掌握）
|
||||
|
||||
五、高强度与爆发力（难度 6-10）
|
||||
|
||||
对心肺、神经系统和恢复能力要求极高。
|
||||
|
||||
波比跳（标准版）：6（连续做时心肺压力极大）
|
||||
|
||||
冲刺跑（短跑）：7（对腘绳肌和脚踝爆发力要求高）
|
||||
|
||||
跳箱（合理高度）：6（需要落地缓冲技巧）
|
||||
|
||||
负重雪橇推：6（主要考验腿部耐力和意志力）
|
||||
|
||||
双力臂（引体向上后翻腕上杠）：9（需要爆发引体 + 极高相对力量）
|
||||
|
||||
六、柔韧与平衡类（难度 3-8）
|
||||
|
||||
考验本体感觉和关节活动度。
|
||||
|
||||
静态拉伸（坐姿体前屈）：2（无风险，但需要坚持）
|
||||
|
||||
瑜伽下犬式：3（常见，但需背部与手臂对齐）
|
||||
|
||||
单腿罗马尼亚硬拉（徒手）：6（极考验平衡和髋稳定）
|
||||
|
||||
全深蹲（脚跟贴地，亚洲蹲）：5（踝关节灵活度限制多数人）
|
||||
|
||||
竖叉/横叉：8（需要数月甚至数年拉伸）
|
||||
@@ -0,0 +1,48 @@
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Mobile Tools for Java (J2ME)
|
||||
.mtj.tmp/
|
||||
|
||||
# Package Files
|
||||
*.jar
|
||||
*.war
|
||||
*.nar
|
||||
*.ear
|
||||
*.zip
|
||||
*.tar.gz
|
||||
*.rar
|
||||
|
||||
# Virtual machine crash logs
|
||||
hs_err_pid*
|
||||
replay_pid*
|
||||
|
||||
# Maven
|
||||
target/
|
||||
pom.xml.tag
|
||||
pom.xml.releaseBackup
|
||||
pom.xml.versionsBackup
|
||||
pom.xml.next
|
||||
release.properties
|
||||
dependency-reduced-pom.xml
|
||||
buildNumber.properties
|
||||
.mvn/timing.properties
|
||||
.mvn/wrapper/maven-wrapper.jar
|
||||
|
||||
# IDE
|
||||
.idea/
|
||||
*.iml
|
||||
.vscode/
|
||||
.settings/
|
||||
.classpath
|
||||
.project
|
||||
|
||||
# OS
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
@@ -0,0 +1,252 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-manage-api</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>gym-checkIn</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>Gym CheckIn</name>
|
||||
<description>Check-In Management Module - Member Attendance Services</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-common</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-db</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-member</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-groupCourse</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webflux</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-aop</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-security</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-commons</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor</groupId>
|
||||
<artifactId>reactor-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.github.resilience4j</groupId>
|
||||
<artifactId>resilience4j-spring-boot3</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.github.resilience4j</groupId>
|
||||
<artifactId>resilience4j-reactor</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.testcontainers</groupId>
|
||||
<artifactId>testcontainers</artifactId>
|
||||
<version>1.21.4</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.testcontainers</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<version>1.21.4</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.testcontainers</groupId>
|
||||
<artifactId>junit-jupiter</artifactId>
|
||||
<version>1.21.4</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.h2database</groupId>
|
||||
<artifactId>h2</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.r2dbc</groupId>
|
||||
<artifactId>r2dbc-h2</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>r2dbc-postgresql</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
<version>5.8.25</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.zxing</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>3.5.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 添加 ZXing JavaSE 扩展（用于生成图片） -->
|
||||
<dependency>
|
||||
<groupId>com.google.zxing</groupId>
|
||||
<artifactId>javase</artifactId>
|
||||
<version>3.5.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-websocket</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.4.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-jar</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.11.0</version>
|
||||
<configuration>
|
||||
<source>21</source>
|
||||
<target>21</target>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.mapstruct</groupId>
|
||||
<artifactId>mapstruct-processor</artifactId>
|
||||
<version>1.5.5.Final</version>
|
||||
</path>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>${lombok.version}</version>
|
||||
</path>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok-mapstruct-binding</artifactId>
|
||||
<version>0.2.0</version>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>0.8.12</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>prepare-agent</id>
|
||||
<goals>
|
||||
<goal>prepare-agent</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>report</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>report</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>check</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>check</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<rules>
|
||||
<rule>
|
||||
<element>BUNDLE</element>
|
||||
<limits>
|
||||
<limit>
|
||||
<counter>INSTRUCTION</counter>
|
||||
<value>COVEREDRATIO</value>
|
||||
<minimum>0.60</minimum>
|
||||
</limit>
|
||||
</limits>
|
||||
</rule>
|
||||
</rules>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.github.spotbugs</groupId>
|
||||
<artifactId>spotbugs-maven-plugin</artifactId>
|
||||
<version>4.8.6.0</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.github.spotbugs</groupId>
|
||||
<artifactId>spotbugs</artifactId>
|
||||
<version>4.8.6</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>spotbugs-check</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>check</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<effort>Max</effort>
|
||||
<threshold>High</threshold>
|
||||
<failOnError>true</failOnError>
|
||||
<excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package cn.novalon.gym.manage.checkIn.config;
|
||||
|
||||
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.reactive.HandlerMapping;
|
||||
import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
|
||||
import org.springframework.web.reactive.socket.WebSocketHandler;
|
||||
import org.springframework.web.reactive.socket.server.support.WebSocketHandlerAdapter;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Configuration
|
||||
public class CheckInWebSocketConfig {
|
||||
|
||||
@Autowired
|
||||
private MyWebSocketHandler myWebSocketHandler;
|
||||
|
||||
/**
|
||||
* 注册 WebSocket 路由映射
|
||||
* 路径对应前端连接的 ws://xxx/webSocket/checkIn
|
||||
*/
|
||||
@Bean
|
||||
public HandlerMapping webSocketMapping() {
|
||||
Map<String, WebSocketHandler> map = new HashMap<>();
|
||||
map.put("/webSocket/checkIn", myWebSocketHandler);
|
||||
|
||||
SimpleUrlHandlerMapping mapping = new SimpleUrlHandlerMapping();
|
||||
mapping.setUrlMap(map);
|
||||
mapping.setOrder(10); // 设置优先级
|
||||
return mapping;
|
||||
}
|
||||
|
||||
/**
|
||||
* 注册 WebSocket 处理器适配器（必须）
|
||||
*/
|
||||
@Bean
|
||||
public WebSocketHandlerAdapter handlerAdapter() {
|
||||
return new WebSocketHandlerAdapter();
|
||||
}
|
||||
}
|
||||
+46
@@ -0,0 +1,46 @@
|
||||
package cn.novalon.gym.manage.checkIn.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Data
|
||||
@Configuration
|
||||
@ConfigurationProperties(prefix = "qr.config")
|
||||
public class QRCodeConfig {
|
||||
|
||||
/**
|
||||
* 二维码宽度（像素）
|
||||
*/
|
||||
private Integer width = 300;
|
||||
|
||||
/**
|
||||
* 二维码高度（像素）
|
||||
*/
|
||||
private Integer height = 300;
|
||||
|
||||
/**
|
||||
* 白边宽度
|
||||
*/
|
||||
private Integer margin = 1;
|
||||
|
||||
/**
|
||||
* 容错率：L, M, Q, H
|
||||
*/
|
||||
private String errorCorrection = "M";
|
||||
|
||||
/**
|
||||
* 图片格式：png, jpg
|
||||
*/
|
||||
private String format = "png";
|
||||
|
||||
/**
|
||||
* 是否启用Logo
|
||||
*/
|
||||
private Boolean logoEnabled = false;
|
||||
|
||||
/**
|
||||
* Logo路径
|
||||
*/
|
||||
private String logoPath = "";
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package cn.novalon.gym.manage.checkIn.constant;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* 打卡模块 Redis 键常量
|
||||
*
|
||||
* @author 付嘉
|
||||
* @date 2026-05-30
|
||||
*/
|
||||
public final class QRRedisKey {
|
||||
|
||||
private static final String SEPARATOR = ":";
|
||||
private static final String QRCODE_USER_DAILY = "qrcode:user:daily";
|
||||
private static final String QRCODE_CONTENT = "QR_";
|
||||
private QRRedisKey() {
|
||||
// 私有构造，防止实例化
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户当日二维码
|
||||
* 格式：qrcode:user:daily:{userId}:{date}
|
||||
* 示例：qrcode:user:daily:1001:2026-05-30
|
||||
*/
|
||||
public static String qrcodeUserDaily(Long userId, LocalDate date) {
|
||||
return QRCODE_USER_DAILY + SEPARATOR + userId + SEPARATOR + date;
|
||||
}
|
||||
|
||||
/**
|
||||
* 用户当日二维码（今天）
|
||||
*/
|
||||
public static String qrcodeUserToday(Long userId) {
|
||||
return qrcodeUserDaily(userId, LocalDate.now());
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成二维码内容（每个用户每次调用都不同）
|
||||
*/
|
||||
public static String generateQrcodeContent() {
|
||||
return QRCODE_CONTENT + UUID.randomUUID().toString().replace("-", "");
|
||||
}
|
||||
}
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package cn.novalon.gym.manage.checkIn.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class QRCodeDto {
|
||||
|
||||
private String qrContent;
|
||||
|
||||
private boolean isUsed;
|
||||
}
|
||||
+209
@@ -0,0 +1,209 @@
|
||||
package cn.novalon.gym.manage.checkIn.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.springframework.data.annotation.CreatedDate;
|
||||
import org.springframework.data.annotation.Id;
|
||||
import org.springframework.data.annotation.LastModifiedDate;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 会员到店签到记录实体
|
||||
*
|
||||
* @author 付嘉
|
||||
* @date 2026-06-08
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Table("sign_in_record")
|
||||
public class SignInRecord {
|
||||
|
||||
/**
|
||||
* 自增主键
|
||||
*/
|
||||
@Id
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 会员ID，关联member表
|
||||
*/
|
||||
@Column("member_id")
|
||||
private Long memberId;
|
||||
|
||||
/**
|
||||
* 签到时使用的会员卡ID
|
||||
*/
|
||||
@Column("member_card_id")
|
||||
private Long memberCardId;
|
||||
|
||||
/**
|
||||
* 签到入场时间
|
||||
*/
|
||||
@Column("sign_in_time")
|
||||
private LocalDateTime signInTime;
|
||||
|
||||
/**
|
||||
* 签到方式：QR_CODE-扫码签到，MANUAL-手动签到，FACE-人脸识别
|
||||
*/
|
||||
@Column("sign_in_type")
|
||||
private String signInType;
|
||||
|
||||
/**
|
||||
* 签到状态：SUCCESS-成功，FAILED-失败
|
||||
*/
|
||||
@Column("sign_in_status")
|
||||
private String signInStatus;
|
||||
|
||||
/**
|
||||
* JSONB格式，存储会员卡验证时的快照数据
|
||||
*/
|
||||
@Column("verification_details")
|
||||
private String verificationDetails;
|
||||
|
||||
/**
|
||||
* 失败时的具体原因文案
|
||||
*/
|
||||
@Column("fail_reason")
|
||||
private String failReason;
|
||||
|
||||
/**
|
||||
* 操作人ID（前台人员），自助签到时为NULL
|
||||
*/
|
||||
@Column("operator_id")
|
||||
private Long operatorId;
|
||||
|
||||
/**
|
||||
* 操作人姓名冗余
|
||||
*/
|
||||
@Column("operator_name")
|
||||
private String operatorName;
|
||||
|
||||
/**
|
||||
* 签到设备标识或型号
|
||||
*/
|
||||
@Column("device_info")
|
||||
private String deviceInfo;
|
||||
|
||||
/**
|
||||
* 客户端IP地址
|
||||
*/
|
||||
@Column("ip_address")
|
||||
private String ipAddress;
|
||||
|
||||
/**
|
||||
* 签到来源：MINI_PROGRAM-小程序扫码，PC_BACKEND-后台管理端
|
||||
*/
|
||||
@Column("source")
|
||||
private String source;
|
||||
|
||||
/**
|
||||
* 软删除标识：false-未删除，true-已删除
|
||||
*/
|
||||
@Column("is_delete")
|
||||
private Boolean isDelete;
|
||||
|
||||
/**
|
||||
* 记录创建时间
|
||||
*/
|
||||
@CreatedDate
|
||||
@Column("created_at")
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
/**
|
||||
* 记录更新时间
|
||||
*/
|
||||
@LastModifiedDate
|
||||
@Column("updated_at")
|
||||
private LocalDateTime updatedAt;
|
||||
|
||||
// ========== 常量定义 ==========
|
||||
|
||||
/**
|
||||
* 签到类型常量
|
||||
*/
|
||||
public static final class SignInType {
|
||||
/** 扫码签到 */
|
||||
public static final String QR_CODE = "QR_CODE";
|
||||
/** 手动签到 */
|
||||
public static final String MANUAL = "MANUAL";
|
||||
/** 人脸识别 */
|
||||
public static final String FACE = "FACE";
|
||||
|
||||
private SignInType() {}
|
||||
}
|
||||
|
||||
/**
|
||||
* 签到状态常量
|
||||
*/
|
||||
public static final class SignInStatus {
|
||||
/** 成功 */
|
||||
public static final String SUCCESS = "SUCCESS";
|
||||
/** 失败 */
|
||||
public static final String FAILED = "FAILED";
|
||||
|
||||
private SignInStatus() {}
|
||||
}
|
||||
|
||||
/**
|
||||
* 签到来源常量
|
||||
*/
|
||||
public static final class Source {
|
||||
/** 小程序扫码 */
|
||||
public static final String MINI_PROGRAM = "MINI_PROGRAM";
|
||||
/** 后台管理端手动签到 */
|
||||
public static final String PC_BACKEND = "PC_BACKEND";
|
||||
|
||||
private Source() {}
|
||||
}
|
||||
|
||||
// ========== 辅助方法 ==========
|
||||
|
||||
/**
|
||||
* 判断签到是否成功
|
||||
*/
|
||||
public boolean isSuccess() {
|
||||
return SignInStatus.SUCCESS.equals(this.signInStatus);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断签到是否失败
|
||||
*/
|
||||
public boolean isFailed() {
|
||||
return SignInStatus.FAILED.equals(this.signInStatus);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否为扫码签到
|
||||
*/
|
||||
public boolean isQrCodeSign() {
|
||||
return SignInType.QR_CODE.equals(this.signInType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断是否已删除
|
||||
*/
|
||||
public boolean isDeleted() {
|
||||
return Boolean.TRUE.equals(this.isDelete);
|
||||
}
|
||||
|
||||
/**
|
||||
* 软删除
|
||||
*/
|
||||
public void softDelete() {
|
||||
this.isDelete = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 恢复删除
|
||||
*/
|
||||
public void restore() {
|
||||
this.isDelete = false;
|
||||
}
|
||||
}
|
||||
+193
@@ -0,0 +1,193 @@
|
||||
package cn.novalon.gym.manage.checkIn.handler;
|
||||
|
||||
import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
|
||||
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
|
||||
import cn.novalon.gym.manage.sys.util.AuthUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.function.server.ServerRequest;
|
||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class CheckInHandler {
|
||||
|
||||
private final AuthUtil authUtil;
|
||||
private final CheckServiceImpl checkService;
|
||||
|
||||
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
||||
|
||||
/**
|
||||
* 签到
|
||||
*
|
||||
* POST /api/checkIn
|
||||
*
|
||||
*/
|
||||
public Mono<ServerResponse> checkIn(ServerRequest request) {
|
||||
|
||||
Long memberId = authUtil.getMemberIdOrThrow(request);
|
||||
return request.bodyToMono(Map.class)
|
||||
.flatMap(body -> {
|
||||
String qrContent = (String) body.get("qrContent");
|
||||
log.info("收到签到请求, memberId: {}, qrContent: {}", memberId, qrContent);
|
||||
boolean messageToClient = MyWebSocketHandler.sendMessageToClient(qrContent, "正在进行签到");
|
||||
log.info("WebSocket 推送结果: {}", messageToClient);
|
||||
return checkService.checkIn(memberId, qrContent)
|
||||
.flatMap(result -> ServerResponse.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(result));
|
||||
})
|
||||
.onErrorResume(e -> {
|
||||
log.error("签到失败", e);
|
||||
return ServerResponse.status(HttpStatus.BAD_REQUEST)
|
||||
.bodyValue(Map.of("code", 400, "message", e.getMessage()));
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取二维码
|
||||
*
|
||||
* GET /api/checkin/qrcode
|
||||
*
|
||||
*/
|
||||
public Mono<ServerResponse> getQRCode(ServerRequest request) {
|
||||
|
||||
Long memberId = authUtil.getMemberIdOrThrow(request);
|
||||
|
||||
log.info("收到用户{}获取二维码请求", memberId);
|
||||
|
||||
return checkService.getQRCode(memberId)
|
||||
.flatMap(qrCodeVo -> ServerResponse.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(qrCodeVo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询签到记录列表
|
||||
*
|
||||
* GET /api/checkIn/records
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
public Mono<ServerResponse> getSignInRecords(ServerRequest request) {
|
||||
Long memberId = authUtil.getMemberIdOrThrow(request);
|
||||
|
||||
String startDateStr = request.queryParam("startDate").orElse(null);
|
||||
String endDateStr = request.queryParam("endDate").orElse(null);
|
||||
|
||||
LocalDate startDate = startDateStr != null ? LocalDate.parse(startDateStr, DATE_FORMATTER) : LocalDate.now().minusDays(30);
|
||||
LocalDate endDate = endDateStr != null ? LocalDate.parse(endDateStr, DATE_FORMATTER) : LocalDate.now();
|
||||
|
||||
log.info("查询签到记录, memberId: {}, startDate: {}, endDate: {}", memberId, startDate, endDate);
|
||||
|
||||
return checkService.getSignInRecords(memberId, startDate, endDate)
|
||||
.collectList()
|
||||
.flatMap(records -> ServerResponse.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(Map.of("code", 200, "message", "success", "data", records)));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单条签到记录
|
||||
*
|
||||
* GET /api/checkIn/records/{id}
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
public Mono<ServerResponse> getSignInRecordById(ServerRequest request) {
|
||||
Long id = Long.parseLong(request.pathVariable("id"));
|
||||
|
||||
log.info("查询签到记录详情, id: {}", id);
|
||||
|
||||
return checkService.getSignInRecordById(id)
|
||||
.flatMap(record -> ServerResponse.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(Map.of("code", 200, "message", "success", "data", record)))
|
||||
.switchIfEmpty(ServerResponse.notFound().build());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取签到统计
|
||||
*
|
||||
* GET /api/checkIn/statistics
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
public Mono<ServerResponse> getSignInStatistics(ServerRequest request) {
|
||||
Long memberId = authUtil.getMemberIdOrThrow(request);
|
||||
|
||||
String startDateStr = request.queryParam("startDate").orElse(null);
|
||||
String endDateStr = request.queryParam("endDate").orElse(null);
|
||||
|
||||
LocalDate startDate = startDateStr != null ? LocalDate.parse(startDateStr, DATE_FORMATTER) : LocalDate.now().minusDays(30);
|
||||
LocalDate endDate = endDateStr != null ? LocalDate.parse(endDateStr, DATE_FORMATTER) : LocalDate.now();
|
||||
|
||||
log.info("查询签到统计, memberId: {}, startDate: {}, endDate: {}", memberId, startDate, endDate);
|
||||
|
||||
return checkService.getSignInStats(memberId, startDate, endDate)
|
||||
.flatMap(stats -> ServerResponse.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(Map.of("code", 200, "message", "success", "data", stats)));
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出签到记录
|
||||
*
|
||||
* GET /api/checkIn/records/export
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
public Mono<ServerResponse> exportSignInRecords(ServerRequest request) {
|
||||
Long memberId = authUtil.getMemberIdOrThrow(request);
|
||||
|
||||
String startDateStr = request.queryParam("startDate").orElse(null);
|
||||
String endDateStr = request.queryParam("endDate").orElse(null);
|
||||
|
||||
LocalDate startDate = startDateStr != null ? LocalDate.parse(startDateStr, DATE_FORMATTER) : LocalDate.now().minusDays(30);
|
||||
LocalDate endDate = endDateStr != null ? LocalDate.parse(endDateStr, DATE_FORMATTER) : LocalDate.now();
|
||||
|
||||
log.info("导出签到记录, memberId: {}, startDate: {}, endDate: {}", memberId, startDate, endDate);
|
||||
|
||||
String filename = "签到记录_" + startDateStr + "_" + endDateStr + ".csv";
|
||||
|
||||
return checkService.exportSignInRecords(memberId, startDate, endDate)
|
||||
.flatMap(bytes -> ServerResponse.ok()
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"")
|
||||
.contentType(MediaType.parseMediaType("text/csv; charset=UTF-8"))
|
||||
.bodyValue(bytes));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取每日签到统计
|
||||
*
|
||||
* GET /api/checkIn/daily-stats
|
||||
*
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
public Mono<ServerResponse> getDailySignInStats(ServerRequest request) {
|
||||
String dateStr = request.queryParam("date").orElse(null);
|
||||
LocalDate date = dateStr != null ? LocalDate.parse(dateStr, DATE_FORMATTER) : LocalDate.now();
|
||||
|
||||
log.info("查询每日签到统计, date: {}", date);
|
||||
|
||||
return checkService.getDailySignInStats(date)
|
||||
.flatMap(stats -> ServerResponse.ok()
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.bodyValue(Map.of("code", 200, "message", "success", "data", stats)));
|
||||
}
|
||||
}
|
||||
+101
@@ -0,0 +1,101 @@
|
||||
package cn.novalon.gym.manage.checkIn.repository;
|
||||
|
||||
import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 签到记录 Repository
|
||||
*
|
||||
* @author 付嘉
|
||||
* @date 2026-06-08
|
||||
*/
|
||||
@Repository
|
||||
public interface SignInRecordRepository extends R2dbcRepository<SignInRecord, Long> {
|
||||
|
||||
/**
|
||||
* 查询会员某天的签到记录
|
||||
*/
|
||||
@Query("SELECT * FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false")
|
||||
Mono<SignInRecord> findByMemberIdAndDate(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 查询会员的签到记录列表
|
||||
*/
|
||||
@Query("SELECT * FROM sign_in_record WHERE member_id = :memberId AND is_delete = false ORDER BY sign_in_time DESC")
|
||||
Flux<SignInRecord> findByMemberId(Long memberId);
|
||||
|
||||
/**
|
||||
* 统计会员某天的签到次数
|
||||
*/
|
||||
@Query("SELECT COUNT(*) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time < :endTime AND is_delete = false")
|
||||
Mono<Long> countByMemberIdAndDate(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 插入签到记录
|
||||
*/
|
||||
@Query("INSERT INTO sign_in_record (member_id, member_card_id, sign_in_time, sign_in_type, sign_in_status, verification_details, fail_reason, source, created_at, updated_at, is_delete) " +
|
||||
"VALUES (:memberId, :memberCardId, :signInTime, :signInType, :signInStatus, :verificationDetails, :failReason, :source, NOW(), NOW(), false)")
|
||||
Mono<Void> insertRecord(Long memberId, Long memberCardId, LocalDateTime signInTime,
|
||||
String signInType, String signInStatus, String verificationDetails,
|
||||
String failReason, String source);
|
||||
|
||||
/**
|
||||
* 根据会员ID和时间范围查询签到记录
|
||||
*/
|
||||
@Query("SELECT * FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false ORDER BY sign_in_time DESC")
|
||||
Flux<SignInRecord> findByMemberIdAndTimeRange(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 根据时间范围查询签到记录
|
||||
*/
|
||||
@Query("SELECT * FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false ORDER BY sign_in_time DESC")
|
||||
Flux<SignInRecord> findByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 统计会员在时间范围内的签到次数
|
||||
*/
|
||||
@Query("SELECT COUNT(*) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
|
||||
Mono<Long> countByMemberIdAndTimeRange(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 统计时间范围内的签到次数
|
||||
*/
|
||||
@Query("SELECT COUNT(*) FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
|
||||
Mono<Long> countByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 统计会员在时间范围内的成功签到次数
|
||||
*/
|
||||
@Query("SELECT COUNT(*) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND sign_in_status = 'SUCCESS' AND is_delete = false")
|
||||
Mono<Long> countSuccessByMemberIdAndTimeRange(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 统计时间范围内的成功签到次数
|
||||
*/
|
||||
@Query("SELECT COUNT(*) FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND sign_in_status = 'SUCCESS' AND is_delete = false")
|
||||
Mono<Long> countSuccessByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 统计时间范围内签到的独立会员数
|
||||
*/
|
||||
@Query("SELECT COUNT(DISTINCT member_id) FROM sign_in_record WHERE sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
|
||||
Mono<Long> countDistinctMembersByTimeRange(LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 获取会员在时间范围内的首次签到时间
|
||||
*/
|
||||
@Query("SELECT MIN(sign_in_time) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
|
||||
Mono<LocalDateTime> getFirstSignInTime(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
|
||||
|
||||
/**
|
||||
* 获取会员在时间范围内的最后签到时间
|
||||
*/
|
||||
@Query("SELECT MAX(sign_in_time) FROM sign_in_record WHERE member_id = :memberId AND sign_in_time >= :startTime AND sign_in_time <= :endTime AND is_delete = false")
|
||||
Mono<LocalDateTime> getLastSignInTime(Long memberId, LocalDateTime startTime, LocalDateTime endTime);
|
||||
}
|
||||
+81
@@ -0,0 +1,81 @@
|
||||
package cn.novalon.gym.manage.checkIn.service;
|
||||
|
||||
import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
|
||||
import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
|
||||
import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
* 签到服务接口
|
||||
*
|
||||
* @author 付嘉
|
||||
* @date 2026-06-08
|
||||
*/
|
||||
public interface ICheckInService {
|
||||
|
||||
/**
|
||||
* 获取签到二维码
|
||||
*
|
||||
* @param memberId 会员ID
|
||||
* @return 二维码VO
|
||||
*/
|
||||
Mono<QRCodeVo> getQRCode(Long memberId);
|
||||
|
||||
/**
|
||||
* 扫码签到
|
||||
*
|
||||
* @param memberId 会员ID
|
||||
* @param qrContent 二维码内容
|
||||
* @return 签到结果JSON字符串
|
||||
*/
|
||||
Mono<String> checkIn(Long memberId, String qrContent);
|
||||
|
||||
/**
|
||||
* 查询会员签到记录列表
|
||||
*
|
||||
* @param memberId 会员ID
|
||||
* @param startTime 开始时间
|
||||
* @param endTime 结束时间
|
||||
* @return 签到记录列表
|
||||
*/
|
||||
Flux<SignInRecordVO> getSignInRecords(Long memberId, LocalDate startTime, LocalDate endTime);
|
||||
|
||||
/**
|
||||
* 根据ID查询签到记录
|
||||
*
|
||||
* @param id 签到记录ID
|
||||
* @return 签到记录VO
|
||||
*/
|
||||
Mono<SignInRecordVO> getSignInRecordById(Long id);
|
||||
|
||||
/**
|
||||
* 获取会员签到统计
|
||||
*
|
||||
* @param memberId 会员ID
|
||||
* @param startTime 开始时间
|
||||
* @param endTime 结束时间
|
||||
* @return 签到统计VO
|
||||
*/
|
||||
Mono<SignInStatsVO> getSignInStats(Long memberId, LocalDate startTime, LocalDate endTime);
|
||||
|
||||
/**
|
||||
* 导出会员签到记录
|
||||
*
|
||||
* @param memberId 会员ID
|
||||
* @param startTime 开始时间
|
||||
* @param endTime 结束时间
|
||||
* @return CSV格式的字节数组
|
||||
*/
|
||||
Mono<byte[]> exportSignInRecords(Long memberId, LocalDate startTime, LocalDate endTime);
|
||||
|
||||
/**
|
||||
* 获取每日签到统计
|
||||
*
|
||||
* @param date 日期
|
||||
* @return 签到统计VO
|
||||
*/
|
||||
Mono<SignInStatsVO> getDailySignInStats(LocalDate date);
|
||||
}
|
||||
+439
@@ -0,0 +1,439 @@
|
||||
package cn.novalon.gym.manage.checkIn.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
|
||||
import cn.novalon.gym.manage.checkIn.constant.QRRedisKey;
|
||||
import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
|
||||
import cn.novalon.gym.manage.checkIn.repository.SignInRecordRepository;
|
||||
import cn.novalon.gym.manage.checkIn.service.ICheckInService;
|
||||
import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
|
||||
import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
|
||||
import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
|
||||
import cn.novalon.gym.manage.checkIn.websocket.MyWebSocketHandler;
|
||||
import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
|
||||
import cn.novalon.gym.manage.common.util.RedisUtil;
|
||||
import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
|
||||
import cn.novalon.gym.manage.member.entity.MemberCard;
|
||||
import cn.novalon.gym.manage.member.entity.MemberCardRecord;
|
||||
import cn.novalon.gym.manage.member.enums.MemberCardType;
|
||||
import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
|
||||
import cn.novalon.gym.manage.member.repository.MemberCardRepository;
|
||||
import cn.hutool.extra.qrcode.QrCodeUtil;
|
||||
import cn.hutool.extra.qrcode.QrConfig;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class CheckServiceImpl implements ICheckInService {
|
||||
|
||||
private final QRCodeConfig qrCodeConfig;
|
||||
private final RedisUtil redisUtil;
|
||||
private final MemberCardRecordRepository memberCardRecordRepository;
|
||||
private final MemberCardRepository memberCardRepository;
|
||||
private final SignInRecordRepository signInRecordRepository;
|
||||
private final IGroupCourseBookingService groupCourseBookingService;
|
||||
|
||||
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
@Override
|
||||
public Mono<QRCodeVo> getQRCode(Long memberId) {
|
||||
log.info("开始查询会员信息, memberId: {}", memberId);
|
||||
|
||||
return findValidMemberCard(memberId)
|
||||
.flatMap(cardRecord -> {
|
||||
log.info("会员信息查询完成, memberCardRecordId: {}", cardRecord.getMemberCardRecordId());
|
||||
|
||||
log.info("开始生成二维码");
|
||||
String qrContent = QRRedisKey.generateQrcodeContent();
|
||||
Map<String, Object> redisMap = new HashMap<>();
|
||||
redisMap.put("qrContent", qrContent);
|
||||
redisMap.put("isUsed", false);
|
||||
redisMap.put("memberId", memberId);
|
||||
redisMap.put("memberCardRecordId", cardRecord.getMemberCardRecordId());
|
||||
|
||||
return redisUtil.setWithExpire(
|
||||
RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(),
|
||||
redisMap,
|
||||
getSecondsUntilEndOfDay()
|
||||
)
|
||||
.then(Mono.fromSupplier(() -> {
|
||||
String qrCodeBase64 = QrCodeUtil.generateAsBase64(qrContent,
|
||||
BeanUtil.copyProperties(qrCodeConfig, QrConfig.class), "png");
|
||||
return new QRCodeVo(qrCodeBase64, false, qrContent, qrCodeConfig.getWidth(), qrCodeConfig.getHeight(), LocalDate.now());
|
||||
}));
|
||||
})
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("该会员没有可用的会员卡")));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<String> checkIn(Long memberId, String qrContent) {
|
||||
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
|
||||
|
||||
// 先检查当天是否已经签到（从数据库查询，作为重复签到的额外保障）
|
||||
return checkTodayAlreadySignedIn(memberId)
|
||||
.flatMap(existingRecord -> {
|
||||
String checkInTime = existingRecord.getSignInTime().format(DATE_FORMATTER);
|
||||
log.error("重复签到, memberId: {}", memberId);
|
||||
MyWebSocketHandler.sendFailure(qrContent, "您已经在" + checkInTime + "完成签到，请勿重复签到");
|
||||
return Mono.error(new RuntimeException("您已经在" + checkInTime + "完成签到，请勿重复签到"));
|
||||
})
|
||||
.then(Mono.defer(() -> redisUtil.get(key)))
|
||||
.flatMap(cachedObj -> {
|
||||
if (cachedObj != null) {
|
||||
Map<String, Object> map;
|
||||
if (cachedObj instanceof Map) {
|
||||
map = (Map<String, Object>) cachedObj;
|
||||
} else if (cachedObj instanceof String) {
|
||||
map = JSONUtil.parseObj((String) cachedObj);
|
||||
} else {
|
||||
MyWebSocketHandler.sendFailure(qrContent, "二维码数据格式错误");
|
||||
return Mono.error(new RuntimeException("二维码数据格式错误"));
|
||||
}
|
||||
if (map.get("qrContent").equals(qrContent)) {
|
||||
if ((boolean) map.get("isUsed")) {
|
||||
String checkInTime = String.valueOf(map.get("checkInTime"));
|
||||
log.error("重复签到(缓存), memberId: {}", memberId);
|
||||
MyWebSocketHandler.sendFailure(qrContent, "您已经在" + checkInTime + "完成签到，请勿重复签到");
|
||||
return Mono.error(new RuntimeException("您已经在" + checkInTime + "完成签到，请勿重复签到"));
|
||||
}
|
||||
log.info("二维码匹配成功，memberId: {}", memberId);
|
||||
|
||||
Long memberCardRecordId = ((Number) map.get("memberCardRecordId")).longValue();
|
||||
|
||||
return processCheckIn(memberId, memberCardRecordId, map, qrContent);
|
||||
} else {
|
||||
MyWebSocketHandler.sendFailure(qrContent, "二维码无效");
|
||||
return Mono.error(new RuntimeException("二维码无效"));
|
||||
}
|
||||
}
|
||||
MyWebSocketHandler.sendFailure(qrContent, "二维码已过期或不存在");
|
||||
return Mono.error(new RuntimeException("二维码已过期或不存在"));
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查会员当天是否已经签到
|
||||
* @param memberId 会员ID
|
||||
* @return 如果已签到返回签到记录，否则返回空
|
||||
*/
|
||||
private Mono<SignInRecord> checkTodayAlreadySignedIn(Long memberId) {
|
||||
LocalDateTime startOfDay = LocalDate.now().atStartOfDay();
|
||||
LocalDateTime endOfDay = LocalDate.now().atTime(LocalTime.MAX);
|
||||
|
||||
return signInRecordRepository.findByMemberIdAndDate(memberId, startOfDay, endOfDay);
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理签到逻辑
|
||||
*/
|
||||
private Mono<String> processCheckIn(Long memberId, Long memberCardRecordId, Map<String, Object> redisMap, String qrContent) {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
// 发送实时进度通知
|
||||
MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_CARD", "正在验证会员卡...");
|
||||
|
||||
return memberCardRecordRepository.findById(memberCardRecordId)
|
||||
.switchIfEmpty(Mono.defer(() -> {
|
||||
MyWebSocketHandler.sendFailure(qrContent, "会员卡记录不存在");
|
||||
return Mono.error(new RuntimeException("会员卡记录不存在"));
|
||||
}))
|
||||
.flatMap(cardRecord -> {
|
||||
if (!"ACTIVE".equals(cardRecord.getStatus().name())) {
|
||||
MyWebSocketHandler.sendFailure(qrContent, "会员卡状态不正确");
|
||||
return Mono.error(new RuntimeException("会员卡状态不正确"));
|
||||
}
|
||||
|
||||
if (cardRecord.getExpireTime() != null && cardRecord.getExpireTime().isBefore(now)) {
|
||||
MyWebSocketHandler.sendFailure(qrContent, "会员卡已过期");
|
||||
return Mono.error(new RuntimeException("会员卡已过期"));
|
||||
}
|
||||
|
||||
// 发送实时进度通知
|
||||
MyWebSocketHandler.sendProgress(qrContent, "VALIDATE_BOOKING", "会员卡验证通过，正在检查预约信息...");
|
||||
|
||||
// 检查是否有需要签到的团课预约
|
||||
return validateBooking(memberId, now)
|
||||
.then(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(cardRecord.getMemberCardId())
|
||||
.switchIfEmpty(Mono.defer(() -> {
|
||||
MyWebSocketHandler.sendFailure(qrContent, "会员卡类型不存在");
|
||||
return Mono.error(new RuntimeException("会员卡类型不存在"));
|
||||
}))
|
||||
.flatMap(card -> {
|
||||
// 发送实时进度通知
|
||||
MyWebSocketHandler.sendProgress(qrContent, "DEDUCT_USAGE", "正在扣减会员卡次数...");
|
||||
|
||||
return deductCardUsage(cardRecord, card)
|
||||
.flatMap(updatedRecord -> {
|
||||
redisMap.put("isUsed", true);
|
||||
redisMap.put("checkInTime", now.format(DATE_FORMATTER));
|
||||
|
||||
return saveSignInRecord(memberId, cardRecord.getMemberCardRecordId(), card.getMemberCardId())
|
||||
.then(redisUtil.set(RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now(), redisMap))
|
||||
.then(Mono.defer(() -> {
|
||||
String successMsg = buildSuccessResponse(now);
|
||||
MyWebSocketHandler.sendSuccess(qrContent, memberId, now.format(DATE_FORMATTER));
|
||||
log.info("签到成功, memberId: {}, cardRecordId: {}", memberId, memberCardRecordId);
|
||||
return Mono.just(successMsg);
|
||||
}));
|
||||
});
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证预约信息
|
||||
*/
|
||||
private Mono<Void> validateBooking(Long memberId, LocalDateTime now) {
|
||||
return groupCourseBookingService.getBookingsByMemberId(memberId)
|
||||
.filter(booking -> {
|
||||
String status = booking.getStatus();
|
||||
LocalDateTime startTime = booking.getCourseStartTime();
|
||||
return "0".equals(status) &&
|
||||
startTime != null &&
|
||||
startTime.toLocalDate().equals(now.toLocalDate()) &&
|
||||
!startTime.isBefore(now.minusMinutes(30));
|
||||
})
|
||||
.collectList()
|
||||
.flatMap(bookings -> {
|
||||
if (bookings.isEmpty()) {
|
||||
return Mono.empty();
|
||||
}
|
||||
boolean hasValidBooking = bookings.stream()
|
||||
.anyMatch(b -> {
|
||||
LocalDateTime startTime = b.getCourseStartTime();
|
||||
return startTime != null &&
|
||||
!startTime.isBefore(now.minusMinutes(30)) &&
|
||||
!startTime.isAfter(now.plusMinutes(30));
|
||||
});
|
||||
if (hasValidBooking) {
|
||||
log.info("会员{}有有效的团课预约", memberId);
|
||||
} else {
|
||||
log.warn("会员{}有预约但不在签到时间范围内", memberId);
|
||||
}
|
||||
return Mono.empty();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 扣减会员卡使用次数/金额
|
||||
*/
|
||||
private Mono<MemberCardRecord> deductCardUsage(MemberCardRecord record, MemberCard card) {
|
||||
MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType());
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
|
||||
switch (cardType) {
|
||||
case TIME_CARD:
|
||||
if (record.getExpireTime() != null && record.getExpireTime().isBefore(now)) {
|
||||
return Mono.error(new RuntimeException("时长卡已过期"));
|
||||
}
|
||||
return Mono.just(record);
|
||||
case COUNT_CARD:
|
||||
int currentTimes = record.getRemainingTimes() != null ? record.getRemainingTimes() : 0;
|
||||
if (currentTimes < 1) {
|
||||
return Mono.error(new RuntimeException("次卡剩余次数不足"));
|
||||
}
|
||||
record.setRemainingTimes(currentTimes - 1);
|
||||
if (record.getRemainingTimes() == 0) {
|
||||
record.setStatus(cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.USED_UP);
|
||||
}
|
||||
return memberCardRecordRepository.save(record);
|
||||
case STORED_VALUE_CARD:
|
||||
double currentAmount = record.getRemainingAmount() != null ? record.getRemainingAmount() : 0.0;
|
||||
if (currentAmount < 0.01) {
|
||||
return Mono.error(new RuntimeException("储值卡余额不足"));
|
||||
}
|
||||
record.setRemainingAmount(Math.max(0, currentAmount - 1));
|
||||
if (record.getRemainingAmount() <= 0) {
|
||||
record.setStatus(cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.USED_UP);
|
||||
}
|
||||
return memberCardRecordRepository.save(record);
|
||||
default:
|
||||
return Mono.error(new RuntimeException("不支持的会员卡类型"));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存签到记录
|
||||
*/
|
||||
private Mono<Void> saveSignInRecord(Long memberId, Long memberCardRecordId, Long memberCardId) {
|
||||
SignInRecord record = SignInRecord.builder()
|
||||
.memberId(memberId)
|
||||
.memberCardId(memberCardId)
|
||||
.signInTime(LocalDateTime.now())
|
||||
.signInType(SignInRecord.SignInType.QR_CODE)
|
||||
.signInStatus(SignInRecord.SignInStatus.SUCCESS)
|
||||
.source(SignInRecord.Source.MINI_PROGRAM)
|
||||
.isDelete(false)
|
||||
.build();
|
||||
|
||||
return signInRecordRepository.save(record).then();
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建成功响应
|
||||
*/
|
||||
private String buildSuccessResponse(LocalDateTime dateTime) {
|
||||
Map<String, Object> res = new HashMap<>();
|
||||
res.put("message", "签到成功");
|
||||
res.put("dateTime", dateTime.format(DATE_FORMATTER));
|
||||
return JSONUtil.toJsonStr(res);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查找会员的有效会员卡（优先选择有效期最早到期的）
|
||||
*/
|
||||
private Mono<MemberCardRecord> findValidMemberCard(Long memberId) {
|
||||
return memberCardRecordRepository.findActiveCardsByMemberId(memberId)
|
||||
.filter(record -> {
|
||||
LocalDateTime expireTime = record.getExpireTime();
|
||||
return expireTime == null || expireTime.isAfter(LocalDateTime.now());
|
||||
})
|
||||
.sort((r1, r2) -> {
|
||||
LocalDateTime e1 = r1.getExpireTime();
|
||||
LocalDateTime e2 = r2.getExpireTime();
|
||||
if (e1 == null && e2 == null) return 0;
|
||||
if (e1 == null) return 1;
|
||||
if (e2 == null) return -1;
|
||||
return e1.compareTo(e2);
|
||||
})
|
||||
.next();
|
||||
}
|
||||
|
||||
// ==================== 签到记录管理功能 ====================
|
||||
|
||||
@Override
|
||||
public Flux<SignInRecordVO> getSignInRecords(Long memberId, LocalDate startTime, LocalDate endTime) {
|
||||
LocalDateTime start = startTime.atStartOfDay();
|
||||
LocalDateTime end = endTime.atTime(LocalTime.MAX);
|
||||
|
||||
return signInRecordRepository.findByMemberIdAndTimeRange(memberId, start, end)
|
||||
.map(this::convertToVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<SignInRecordVO> getSignInRecordById(Long id) {
|
||||
return signInRecordRepository.findById(id)
|
||||
.map(this::convertToVO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<SignInStatsVO> getSignInStats(Long memberId, LocalDate startTime, LocalDate endTime) {
|
||||
LocalDateTime start = startTime.atStartOfDay();
|
||||
LocalDateTime end = endTime.atTime(LocalTime.MAX);
|
||||
|
||||
return Mono.zip(
|
||||
(Object[] results) -> {
|
||||
Long total = (Long) results[0];
|
||||
Long success = (Long) results[1];
|
||||
LocalDateTime first = (LocalDateTime) results[2];
|
||||
LocalDateTime last = (LocalDateTime) results[3];
|
||||
SignInStatsVO stats = new SignInStatsVO();
|
||||
stats.setTotalCount(total);
|
||||
stats.setSuccessCount(success);
|
||||
stats.setStartDate(startTime);
|
||||
stats.setEndDate(endTime);
|
||||
stats.setFirstSignInTime(first);
|
||||
stats.setLastSignInTime(last);
|
||||
stats.setSuccessRate(total > 0 ? (double) success / total * 100.0 : 0.0);
|
||||
return stats;
|
||||
},
|
||||
signInRecordRepository.countByMemberIdAndTimeRange(memberId, start, end),
|
||||
signInRecordRepository.countSuccessByMemberIdAndTimeRange(memberId, start, end),
|
||||
signInRecordRepository.getFirstSignInTime(memberId, start, end),
|
||||
signInRecordRepository.getLastSignInTime(memberId, start, end)
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<byte[]> exportSignInRecords(Long memberId, LocalDate startTime, LocalDate endTime) {
|
||||
LocalDateTime start = startTime.atStartOfDay();
|
||||
LocalDateTime end = endTime.atTime(LocalTime.MAX);
|
||||
|
||||
return signInRecordRepository.findByMemberIdAndTimeRange(memberId, start, end)
|
||||
.map(record -> {
|
||||
String status = "SUCCESS".equals(record.getSignInStatus()) ? "成功" : "失败";
|
||||
String type = "QR_CODE".equals(record.getSignInType()) ? "扫码签到" :
|
||||
"MANUAL".equals(record.getSignInType()) ? "手动签到" : "人脸识别";
|
||||
return String.join(",",
|
||||
record.getId().toString(),
|
||||
record.getMemberId().toString(),
|
||||
record.getMemberCardId() != null ? record.getMemberCardId().toString() : "",
|
||||
record.getSignInTime() != null ? record.getSignInTime().format(DATE_FORMATTER) : "",
|
||||
type,
|
||||
status,
|
||||
record.getFailReason() != null ? record.getFailReason() : ""
|
||||
);
|
||||
})
|
||||
.collectList()
|
||||
.map(rows -> {
|
||||
List<String> csvLines = new java.util.ArrayList<>();
|
||||
csvLines.add("签到记录ID,会员ID,会员卡ID,签到时间,签到方式,签到状态,失败原因");
|
||||
csvLines.addAll(rows);
|
||||
return String.join("\n", csvLines).getBytes(java.nio.charset.StandardCharsets.UTF_8);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<SignInStatsVO> getDailySignInStats(LocalDate date) {
|
||||
LocalDateTime start = date.atStartOfDay();
|
||||
LocalDateTime end = date.atTime(LocalTime.MAX);
|
||||
|
||||
return Mono.zip(
|
||||
(Object[] results) -> {
|
||||
Long total = (Long) results[0];
|
||||
Long success = (Long) results[1];
|
||||
Long members = (Long) results[2];
|
||||
SignInStatsVO stats = new SignInStatsVO();
|
||||
stats.setTotalCount(total);
|
||||
stats.setSuccessCount(success);
|
||||
stats.setStartDate(date);
|
||||
stats.setEndDate(date);
|
||||
stats.setUniqueMemberCount(members);
|
||||
stats.setSuccessRate(total > 0 ? (double) success / total * 100.0 : 0.0);
|
||||
return stats;
|
||||
},
|
||||
signInRecordRepository.countByTimeRange(start, end),
|
||||
signInRecordRepository.countSuccessByTimeRange(start, end),
|
||||
signInRecordRepository.countDistinctMembersByTimeRange(start, end)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 转换实体到VO
|
||||
*/
|
||||
private SignInRecordVO convertToVO(SignInRecord record) {
|
||||
SignInRecordVO vo = new SignInRecordVO();
|
||||
vo.setId(record.getId());
|
||||
vo.setMemberId(record.getMemberId());
|
||||
vo.setMemberCardId(record.getMemberCardId());
|
||||
vo.setSignInTime(record.getSignInTime());
|
||||
vo.setSignInType(record.getSignInType());
|
||||
vo.setSignInStatus(record.getSignInStatus());
|
||||
vo.setFailReason(record.getFailReason());
|
||||
vo.setSource(record.getSource());
|
||||
vo.setCreatedAt(record.getCreatedAt());
|
||||
return vo;
|
||||
}
|
||||
|
||||
private long getSecondsUntilEndOfDay() {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
LocalDateTime endOfDay = now.toLocalDate().atTime(23, 59, 59);
|
||||
if (now.isAfter(endOfDay)) return 1;
|
||||
return ChronoUnit.SECONDS.between(now, endOfDay);
|
||||
}
|
||||
}
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package cn.novalon.gym.manage.checkIn.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
public class QRCodeVo {
|
||||
|
||||
private String qrCodeBase64;
|
||||
|
||||
private boolean isUsed;
|
||||
|
||||
private String qrContent;
|
||||
|
||||
private Integer width;
|
||||
|
||||
private Integer height;
|
||||
|
||||
private LocalDate createTime;
|
||||
}
|
||||
+66
@@ -0,0 +1,66 @@
|
||||
package cn.novalon.gym.manage.checkIn.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 签到记录VO
|
||||
*
|
||||
* @author 付嘉
|
||||
* @date 2026-06-08
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class SignInRecordVO {
|
||||
|
||||
/**
|
||||
* 签到记录ID
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 会员ID
|
||||
*/
|
||||
private Long memberId;
|
||||
|
||||
/**
|
||||
* 会员卡ID
|
||||
*/
|
||||
private Long memberCardId;
|
||||
|
||||
/**
|
||||
* 签到时间
|
||||
*/
|
||||
private LocalDateTime signInTime;
|
||||
|
||||
/**
|
||||
* 签到类型：QR_CODE-扫码签到，MANUAL-手动签到，FACE-人脸识别
|
||||
*/
|
||||
private String signInType;
|
||||
|
||||
/**
|
||||
* 签到状态：SUCCESS-成功，FAILED-失败
|
||||
*/
|
||||
private String signInStatus;
|
||||
|
||||
/**
|
||||
* 失败原因
|
||||
*/
|
||||
private String failReason;
|
||||
|
||||
/**
|
||||
* 签到来源：MINI_PROGRAM-小程序扫码，PC_BACKEND-后台管理端
|
||||
*/
|
||||
private String source;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private LocalDateTime createdAt;
|
||||
}
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
package cn.novalon.gym.manage.checkIn.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 签到统计VO
|
||||
*
|
||||
* @author 付嘉
|
||||
* @date 2026-06-08
|
||||
*/
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class SignInStatsVO {
|
||||
|
||||
/**
|
||||
* 统计开始日期
|
||||
*/
|
||||
private LocalDate startDate;
|
||||
|
||||
/**
|
||||
* 统计结束日期
|
||||
*/
|
||||
private LocalDate endDate;
|
||||
|
||||
/**
|
||||
* 总签到次数
|
||||
*/
|
||||
private Long totalCount;
|
||||
|
||||
/**
|
||||
* 成功签到次数
|
||||
*/
|
||||
private Long successCount;
|
||||
|
||||
/**
|
||||
* 成功率（百分比）
|
||||
*/
|
||||
private Double successRate;
|
||||
|
||||
/**
|
||||
* 独立会员数
|
||||
*/
|
||||
private Long uniqueMemberCount;
|
||||
|
||||
/**
|
||||
* 首次签到时间
|
||||
*/
|
||||
private LocalDateTime firstSignInTime;
|
||||
|
||||
/**
|
||||
* 最后签到时间
|
||||
*/
|
||||
private LocalDateTime lastSignInTime;
|
||||
}
|
||||
+202
@@ -0,0 +1,202 @@
|
||||
package cn.novalon.gym.manage.checkIn.websocket;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import cn.novalon.gym.manage.checkIn.dto.QRCodeDto;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.socket.WebSocketHandler;
|
||||
import org.springframework.web.reactive.socket.WebSocketSession;
|
||||
import reactor.core.publisher.Mono;
|
||||
import reactor.core.publisher.Sinks;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
* WebSocket 处理类，用于实时签到反馈
|
||||
*
|
||||
* 技术要点：
|
||||
* - 使用 Sinks 实现响应式消息推送
|
||||
* - 使用 ConcurrentHashMap 管理 qrContent 与 sink 的映射
|
||||
* - 支持实时推送签到进度和结果
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
public class MyWebSocketHandler implements WebSocketHandler {
|
||||
|
||||
/**
|
||||
* qrContent -> Sink 映射，用于根据二维码内容找到对应的客户端连接
|
||||
*/
|
||||
private static final Map<String, Sinks.Many<String>> qrContentToSink = new ConcurrentHashMap<>();
|
||||
|
||||
/**
|
||||
* 连接创建时间映射，用于超时清理
|
||||
*/
|
||||
private static final Map<String, LocalDateTime> qrContentToCreateTime = new ConcurrentHashMap<>();
|
||||
|
||||
/**
|
||||
* 超时时间（秒），超过此时间未使用的连接将被清理
|
||||
*/
|
||||
private static final long TIMEOUT_SECONDS = 300;
|
||||
|
||||
@Override
|
||||
public Mono<Void> handle(WebSocketSession session) {
|
||||
String sessionId = session.getId();
|
||||
log.info("WebSocket 连接建立，sessionId: {}", sessionId);
|
||||
|
||||
// 创建 sink，用于向客户端发送消息
|
||||
Sinks.Many<String> sink = Sinks.many().unicast().onBackpressureBuffer();
|
||||
|
||||
// 订阅接收客户端消息（异步处理）
|
||||
session.receive()
|
||||
.doOnNext(message -> {
|
||||
String payload = message.getPayloadAsText();
|
||||
log.debug("收到消息：sessionId={}, payload={}", sessionId, payload);
|
||||
|
||||
try {
|
||||
QRCodeDto qrCodeDto = JSONUtil.toBean(payload, QRCodeDto.class);
|
||||
String qrContent = qrCodeDto.getQrContent();
|
||||
|
||||
if (qrContent != null && !qrContent.isEmpty()) {
|
||||
// 绑定 qrContent 和 sink
|
||||
qrContentToSink.put(qrContent, sink);
|
||||
qrContentToCreateTime.put(qrContent, LocalDateTime.now());
|
||||
log.info("绑定成功: qrContent={}, sessionId={}", qrContent, sessionId);
|
||||
|
||||
// 发送连接成功消息
|
||||
sink.tryEmitNext(buildMessage("CONNECTED", "签到监听已建立，请扫描二维码"));
|
||||
} else {
|
||||
sink.tryEmitNext(buildMessage("ERROR", "二维码内容为空"));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("解析消息失败，sessionId={}", sessionId, e);
|
||||
sink.tryEmitNext(buildMessage("ERROR", "消息格式错误: " + e.getMessage()));
|
||||
}
|
||||
})
|
||||
.doOnError(e -> {
|
||||
log.error("接收消息出错，sessionId={}", sessionId, e);
|
||||
})
|
||||
.subscribe(); // 必须订阅，否则不会执行
|
||||
|
||||
// 发送流给客户端
|
||||
return session.send(sink.asFlux().map(session::textMessage))
|
||||
.doFinally(signal -> {
|
||||
// 连接关闭时清理映射
|
||||
qrContentToSink.entrySet().removeIf(entry -> entry.getValue() == sink);
|
||||
qrContentToCreateTime.entrySet().removeIf(entry -> {
|
||||
Sinks.Many<String> s = qrContentToSink.get(entry.getKey());
|
||||
return s == null || s == sink;
|
||||
});
|
||||
log.info("WebSocket 连接关闭，sessionId={}", sessionId);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 向客户端发送消息
|
||||
*
|
||||
* @param qrContent 二维码内容
|
||||
* @param message 消息内容
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public static boolean sendMessageToClient(String qrContent, String message) {
|
||||
// 先清理超时连接
|
||||
cleanupTimeoutConnections();
|
||||
|
||||
Sinks.Many<String> sink = qrContentToSink.get(qrContent);
|
||||
if (sink == null) {
|
||||
log.warn("未找到绑定的连接，qrContent: {}", qrContent);
|
||||
return false;
|
||||
}
|
||||
|
||||
Sinks.EmitResult result = sink.tryEmitNext(message);
|
||||
if (result.isSuccess()) {
|
||||
log.info("主动推送成功，qrContent: {}, message: {}", qrContent, message);
|
||||
return true;
|
||||
} else {
|
||||
log.warn("推送失败，qrContent: {}, result: {}", qrContent, result);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送签到进度消息
|
||||
*
|
||||
* @param qrContent 二维码内容
|
||||
* @param step 进度步骤
|
||||
* @param message 进度消息
|
||||
*/
|
||||
public static void sendProgress(String qrContent, String step, String message) {
|
||||
String progressMessage = buildMessage("PROGRESS", message);
|
||||
sendMessageToClient(qrContent, progressMessage);
|
||||
log.debug("发送进度消息: qrContent={}, step={}, message={}", qrContent, step, message);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送签到成功消息
|
||||
*
|
||||
* @param qrContent 二维码内容
|
||||
* @param memberId 会员ID
|
||||
* @param signInTime 签到时间
|
||||
*/
|
||||
public static void sendSuccess(String qrContent, Long memberId, String signInTime) {
|
||||
String successMessage = buildMessage("SUCCESS", "签到成功！欢迎光临\n会员ID: " + memberId + "\n签到时间: " + signInTime);
|
||||
sendMessageToClient(qrContent, successMessage);
|
||||
log.info("发送成功消息: qrContent={}, memberId={}", qrContent, memberId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送签到失败消息
|
||||
*
|
||||
* @param qrContent 二维码内容
|
||||
* @param reason 失败原因
|
||||
*/
|
||||
public static void sendFailure(String qrContent, String reason) {
|
||||
String failureMessage = buildMessage("FAILURE", "签到失败：" + reason);
|
||||
sendMessageToClient(qrContent, failureMessage);
|
||||
log.warn("发送失败消息: qrContent={}, reason={}", qrContent, reason);
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建标准消息格式
|
||||
*
|
||||
* @param type 消息类型
|
||||
* @param content 消息内容
|
||||
* @return 格式化后的消息字符串
|
||||
*/
|
||||
private static String buildMessage(String type, String content) {
|
||||
return JSONUtil.toJsonStr(Map.of(
|
||||
"type", type,
|
||||
"content", content,
|
||||
"timestamp", System.currentTimeMillis()
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理超时连接
|
||||
*/
|
||||
private static void cleanupTimeoutConnections() {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
qrContentToCreateTime.entrySet().removeIf(entry -> {
|
||||
LocalDateTime createTime = entry.getValue();
|
||||
long secondsDiff = java.time.Duration.between(createTime, now).getSeconds();
|
||||
if (secondsDiff > TIMEOUT_SECONDS) {
|
||||
String qrContent = entry.getKey();
|
||||
qrContentToSink.remove(qrContent);
|
||||
log.debug("清理超时连接: qrContent={}, 超时时间={}秒", qrContent, secondsDiff);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前连接数
|
||||
*
|
||||
* @return 连接数
|
||||
*/
|
||||
public static int getConnectionCount() {
|
||||
cleanupTimeoutConnections();
|
||||
return qrContentToSink.size();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
# 二维码配置
|
||||
qr:
|
||||
config:
|
||||
width: 300 # 二维码宽度（像素）
|
||||
height: 300 # 二维码高度（像素）
|
||||
margin: 1 # 白边宽度（像素）
|
||||
format: png # 图片格式：png / jpg
|
||||
error-correction: L #容错率：L, M, Q, H，如果启用Logo（logo-enabled: true），必须设置为 H
|
||||
logo-enabled: false # 是否启用Logo（启用时error-correction必须为H）
|
||||
# logo-path: static/logo.png # Logo图片路径（支持相对路径或绝对路径）
|
||||
+281
@@ -0,0 +1,281 @@
|
||||
package cn.novalon.gym.manage.checkin;
|
||||
|
||||
import cn.novalon.gym.manage.checkIn.config.QRCodeConfig;
|
||||
import cn.novalon.gym.manage.checkIn.entity.SignInRecord;
|
||||
import cn.novalon.gym.manage.checkIn.repository.SignInRecordRepository;
|
||||
import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService;
|
||||
import cn.novalon.gym.manage.checkIn.service.impl.CheckServiceImpl;
|
||||
import cn.novalon.gym.manage.checkIn.vo.QRCodeVo;
|
||||
import cn.novalon.gym.manage.checkIn.vo.SignInRecordVO;
|
||||
import cn.novalon.gym.manage.checkIn.vo.SignInStatsVO;
|
||||
import cn.novalon.gym.manage.common.constant.RedisKeyConstants;
|
||||
import cn.novalon.gym.manage.common.util.RedisUtil;
|
||||
import cn.novalon.gym.manage.member.entity.MemberCard;
|
||||
import cn.novalon.gym.manage.member.entity.MemberCardRecord;
|
||||
import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository;
|
||||
import cn.novalon.gym.manage.member.repository.MemberCardRepository;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
import reactor.test.StepVerifier;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.LocalTime;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 签到模块接口测试类
|
||||
* 测试模块三（gym-checkIn）的所有接口
|
||||
*/
|
||||
class CheckInModuleTest {
|
||||
|
||||
@Mock
|
||||
private QRCodeConfig qrCodeConfig;
|
||||
|
||||
@Mock
|
||||
private RedisUtil redisUtil;
|
||||
|
||||
@Mock
|
||||
private MemberCardRecordRepository memberCardRecordRepository;
|
||||
|
||||
@Mock
|
||||
private MemberCardRepository memberCardRepository;
|
||||
|
||||
@Mock
|
||||
private SignInRecordRepository signInRecordRepository;
|
||||
|
||||
@Mock
|
||||
private IGroupCourseBookingService groupCourseBookingService;
|
||||
|
||||
@Mock
|
||||
private MemberCard mockMemberCard;
|
||||
|
||||
@Mock
|
||||
private SignInRecord mockSignInRecord;
|
||||
|
||||
@Mock
|
||||
private MemberCardRecord mockMemberCardRecord;
|
||||
|
||||
private CheckServiceImpl checkService;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
MockitoAnnotations.openMocks(this);
|
||||
checkService = new CheckServiceImpl(qrCodeConfig, redisUtil, memberCardRecordRepository,
|
||||
memberCardRepository, signInRecordRepository, groupCourseBookingService);
|
||||
|
||||
when(mockMemberCard.getId()).thenReturn(1L);
|
||||
when(mockMemberCard.getMemberCardType()).thenReturn("TIME_CARD");
|
||||
|
||||
when(mockSignInRecord.getId()).thenReturn(1L);
|
||||
when(mockSignInRecord.getMemberId()).thenReturn(1L);
|
||||
when(mockSignInRecord.getMemberCardId()).thenReturn(1L);
|
||||
when(mockSignInRecord.getSignInTime()).thenReturn(LocalDateTime.now());
|
||||
when(mockSignInRecord.getSignInType()).thenReturn("QR_CODE");
|
||||
when(mockSignInRecord.getSignInStatus()).thenReturn("SUCCESS");
|
||||
when(mockSignInRecord.getSource()).thenReturn("MINI_PROGRAM");
|
||||
|
||||
when(mockMemberCardRecord.getMemberCardRecordId()).thenReturn(1L);
|
||||
when(mockMemberCardRecord.getMemberCardId()).thenReturn(1L);
|
||||
when(mockMemberCardRecord.getRemainingTimes()).thenReturn(10);
|
||||
when(mockMemberCardRecord.getRemainingAmount()).thenReturn(100.0);
|
||||
when(mockMemberCardRecord.getExpireTime()).thenReturn(LocalDateTime.now().plusDays(30));
|
||||
when(mockMemberCardRecord.getStatus()).thenReturn(cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.ACTIVE);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试1: 获取二维码 - getQRCode")
|
||||
void testGetQRCode() {
|
||||
when(memberCardRecordRepository.findActiveCardsByMemberId(1L))
|
||||
.thenReturn(Flux.just(mockMemberCardRecord));
|
||||
when(redisUtil.setWithExpire(any(String.class), any(Map.class), any(Long.class)))
|
||||
.thenReturn(Mono.just(true));
|
||||
|
||||
Mono<QRCodeVo> result = checkService.getQRCode(1L);
|
||||
|
||||
StepVerifier.create(result)
|
||||
.expectNextMatches(qrCodeVo -> {
|
||||
org.junit.jupiter.api.Assertions.assertNotNull(qrCodeVo);
|
||||
org.junit.jupiter.api.Assertions.assertNotNull(qrCodeVo.getQrContent());
|
||||
return true;
|
||||
})
|
||||
.verifyComplete();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试2: 签到 - checkIn")
|
||||
void testCheckIn() {
|
||||
Long memberId = 1L;
|
||||
Map<String, Object> qrData = new HashMap<>();
|
||||
qrData.put("qrContent", "test-qr-content");
|
||||
qrData.put("memberId", memberId);
|
||||
qrData.put("memberCardRecordId", 1L);
|
||||
qrData.put("isUsed", false);
|
||||
qrData.put("expireTime", System.currentTimeMillis() + 3600000);
|
||||
|
||||
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
|
||||
|
||||
when(redisUtil.get(eq(key))).thenReturn(Mono.just(qrData));
|
||||
when(memberCardRecordRepository.findById(1L)).thenReturn(Mono.just(mockMemberCardRecord));
|
||||
when(memberCardRepository.findByMemberCardIdAndDeletedAtIsNull(1L)).thenReturn(Mono.just(mockMemberCard));
|
||||
when(signInRecordRepository.save(any(SignInRecord.class))).thenReturn(Mono.just(mockSignInRecord));
|
||||
when(redisUtil.set(any(String.class), any(Map.class))).thenReturn(Mono.just(true));
|
||||
when(groupCourseBookingService.getBookingsByMemberId(memberId)).thenReturn(Flux.empty());
|
||||
when(signInRecordRepository.findByMemberIdAndDate(eq(memberId), any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.empty());
|
||||
|
||||
Mono<String> result = checkService.checkIn(memberId, "test-qr-content");
|
||||
|
||||
StepVerifier.create(result)
|
||||
.expectNextMatches(response -> response.contains("签到成功"))
|
||||
.verifyComplete();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试3: 查询签到记录列表 - getSignInRecords")
|
||||
void testGetSignInRecords() {
|
||||
when(signInRecordRepository.findByMemberIdAndTimeRange(
|
||||
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Flux.just(mockSignInRecord));
|
||||
|
||||
Flux<SignInRecordVO> result = checkService.getSignInRecords(1L,
|
||||
LocalDate.now().minusDays(30), LocalDate.now());
|
||||
|
||||
StepVerifier.create(result)
|
||||
.expectNextCount(1)
|
||||
.verifyComplete();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试4: 查询单条签到记录 - getSignInRecordById")
|
||||
void testGetSignInRecordById() {
|
||||
when(signInRecordRepository.findById(1L))
|
||||
.thenReturn(Mono.just(mockSignInRecord));
|
||||
|
||||
Mono<SignInRecordVO> result = checkService.getSignInRecordById(1L);
|
||||
|
||||
StepVerifier.create(result)
|
||||
.expectNextMatches(vo -> vo.getId() == 1L)
|
||||
.verifyComplete();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试5: 查询签到记录 - 记录不存在")
|
||||
void testGetSignInRecordById_NotFound() {
|
||||
when(signInRecordRepository.findById(999L))
|
||||
.thenReturn(Mono.empty());
|
||||
|
||||
Mono<SignInRecordVO> result = checkService.getSignInRecordById(999L);
|
||||
|
||||
StepVerifier.create(result)
|
||||
.verifyComplete();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试6: 获取签到统计 - getSignInStats")
|
||||
void testGetSignInStats() {
|
||||
when(signInRecordRepository.countByMemberIdAndTimeRange(
|
||||
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.just(10L));
|
||||
when(signInRecordRepository.countSuccessByMemberIdAndTimeRange(
|
||||
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.just(8L));
|
||||
when(signInRecordRepository.getFirstSignInTime(
|
||||
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.just(LocalDateTime.now().minusDays(29)));
|
||||
when(signInRecordRepository.getLastSignInTime(
|
||||
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.just(LocalDateTime.now()));
|
||||
|
||||
Mono<SignInStatsVO> result = checkService.getSignInStats(1L,
|
||||
LocalDate.now().minusDays(30), LocalDate.now());
|
||||
|
||||
StepVerifier.create(result)
|
||||
.expectNextMatches(stats -> {
|
||||
org.junit.jupiter.api.Assertions.assertEquals(10L, stats.getTotalCount());
|
||||
org.junit.jupiter.api.Assertions.assertEquals(8L, stats.getSuccessCount());
|
||||
return true;
|
||||
})
|
||||
.verifyComplete();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试7: 获取每日签到统计 - getDailySignInStats")
|
||||
void testGetDailySignInStats() {
|
||||
when(signInRecordRepository.countByTimeRange(any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.just(50L));
|
||||
when(signInRecordRepository.countSuccessByTimeRange(
|
||||
any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.just(45L));
|
||||
when(signInRecordRepository.countDistinctMembersByTimeRange(
|
||||
any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.just(30L));
|
||||
|
||||
Mono<SignInStatsVO> result = checkService.getDailySignInStats(LocalDate.now());
|
||||
|
||||
StepVerifier.create(result)
|
||||
.expectNextMatches(stats -> {
|
||||
org.junit.jupiter.api.Assertions.assertEquals(50L, stats.getTotalCount());
|
||||
org.junit.jupiter.api.Assertions.assertEquals(45L, stats.getSuccessCount());
|
||||
org.junit.jupiter.api.Assertions.assertEquals(30L, stats.getUniqueMemberCount());
|
||||
return true;
|
||||
})
|
||||
.verifyComplete();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试8: 导出签到记录 - exportSignInRecords")
|
||||
void testExportSignInRecords() {
|
||||
when(signInRecordRepository.findByMemberIdAndTimeRange(
|
||||
eq(1L), any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Flux.just(mockSignInRecord));
|
||||
|
||||
Mono<byte[]> result = checkService.exportSignInRecords(1L,
|
||||
LocalDate.now().minusDays(7), LocalDate.now());
|
||||
|
||||
StepVerifier.create(result)
|
||||
.expectNextMatches(bytes -> bytes.length > 0)
|
||||
.verifyComplete();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试9: 签到失败 - 二维码无效")
|
||||
void testCheckIn_QRCodeInvalid() {
|
||||
Long memberId = 1L;
|
||||
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
|
||||
when(redisUtil.get(eq(key))).thenReturn(Mono.just(new HashMap<>()));
|
||||
when(signInRecordRepository.findByMemberIdAndDate(eq(memberId), any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.empty());
|
||||
|
||||
Mono<String> result = checkService.checkIn(memberId, "invalid-qr");
|
||||
|
||||
StepVerifier.create(result)
|
||||
.expectError(RuntimeException.class)
|
||||
.verify();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("测试10: 签到失败 - 二维码不存在")
|
||||
void testCheckIn_QRCodeNotFound() {
|
||||
Long memberId = 1L;
|
||||
String key = RedisKeyConstants.QRCODE_USER_DAILY + memberId + LocalDate.now();
|
||||
when(redisUtil.get(eq(key))).thenReturn(Mono.empty());
|
||||
when(signInRecordRepository.findByMemberIdAndDate(eq(memberId), any(LocalDateTime.class), any(LocalDateTime.class)))
|
||||
.thenReturn(Mono.empty());
|
||||
|
||||
Mono<String> result = checkService.checkIn(memberId, "not-exist");
|
||||
|
||||
StepVerifier.create(result)
|
||||
.verifyComplete();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
# Test Configuration
|
||||
@@ -0,0 +1,90 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-manage-api</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-coupon</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<name>gym-coupon</name>
|
||||
<description>Coupon Management Module</description>
|
||||
<url/>
|
||||
<licenses>
|
||||
<license/>
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer/>
|
||||
</developers>
|
||||
<scm>
|
||||
<connection/>
|
||||
<developerConnection/>
|
||||
<tag/>
|
||||
<url/>
|
||||
</scm>
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-common</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-sys</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>manage-db</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-webflux</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-r2dbc</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springdoc</groupId>
|
||||
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.swagger.core.v3</groupId>
|
||||
<artifactId>swagger-annotations-jakarta</artifactId>
|
||||
<version>2.2.43</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.novalon.gym.manage</groupId>
|
||||
<artifactId>gym-member</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
+75
@@ -0,0 +1,75 @@
|
||||
package cn.novalon.gym.manage.coupon.converter;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.novalon.gym.manage.coupon.domain.CouponTemplate;
|
||||
import cn.novalon.gym.manage.coupon.domain.MemberCoupon;
|
||||
import cn.novalon.gym.manage.coupon.entity.CouponTemplateEntity;
|
||||
import cn.novalon.gym.manage.coupon.entity.MemberCouponEntity;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 优惠券相关转换器
|
||||
*/
|
||||
@Component
|
||||
@Slf4j
|
||||
public class CouponConverter {
|
||||
|
||||
/**
|
||||
* 将优惠券模板实体转换为领域模型
|
||||
*/
|
||||
public CouponTemplate toCouponTemplate(CouponTemplateEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
CouponTemplate couponTemplate = new CouponTemplate();
|
||||
BeanUtil.copyProperties(entity, couponTemplate);
|
||||
log.debug("转换优惠券模板实体到领域模型：couponId={}", entity.getId());
|
||||
return couponTemplate;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将优惠券模板领域模型转换为实体
|
||||
*/
|
||||
public CouponTemplateEntity toCouponTemplateEntity(CouponTemplate domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
CouponTemplateEntity entity = new CouponTemplateEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
log.debug("转换优惠券模板领域模型到实体：couponId={}", domain.getId());
|
||||
return entity;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将会员优惠券实体转换为领域模型
|
||||
*/
|
||||
public MemberCoupon toMemberCoupon(MemberCouponEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
MemberCoupon memberCoupon = new MemberCoupon();
|
||||
BeanUtil.copyProperties(entity, memberCoupon);
|
||||
log.debug("转换会员优惠券实体到领域模型：memberCouponId={}", entity.getId());
|
||||
return memberCoupon;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将会员优惠券领域模型转换为实体
|
||||
*/
|
||||
public MemberCouponEntity toMemberCouponEntity(MemberCoupon domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
MemberCouponEntity entity = new MemberCouponEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
log.debug("转换会员优惠券领域模型到实体：memberCouponId={}", domain.getId());
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package cn.novalon.gym.manage.coupon.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.entity.CouponTemplateEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface CouponTemplateDao extends R2dbcRepository<CouponTemplateEntity, Long> {
|
||||
|
||||
Mono<CouponTemplateEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<CouponTemplateEntity> findAllByDeletedAtIsNull();
|
||||
|
||||
Flux<CouponTemplateEntity> findByNameContainingAndDeletedAtIsNull(String name);
|
||||
|
||||
Flux<CouponTemplateEntity> findByCouponTypeAndDeletedAtIsNull(String couponType);
|
||||
|
||||
Flux<CouponTemplateEntity> findByStatusAndDeletedAtIsNull(String status);
|
||||
|
||||
Mono<CouponTemplateEntity> findByClaimCodeAndDeletedAtIsNull(String claimCode);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE coupon_template SET deleted_at = :deletedAt WHERE id = :id")
|
||||
Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE coupon_template SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE coupon_template SET issued_count = issued_count + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementIssuedCount(Long id, int count, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE coupon_template SET used_count = used_count + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementUsedCount(Long id, int count, LocalDateTime updatedAt);
|
||||
}
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
package cn.novalon.gym.manage.coupon.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.entity.MemberCouponEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
@Repository
|
||||
public interface MemberCouponDao extends R2dbcRepository<MemberCouponEntity, Long> {
|
||||
|
||||
Flux<MemberCouponEntity> findByTemplateIdAndDeletedAtIsNull(Long templateId);
|
||||
|
||||
Flux<MemberCouponEntity> findByMemberIdAndDeletedAtIsNull(Long memberId);
|
||||
|
||||
Mono<Long> countByTemplateIdAndMemberIdAndDeletedAtIsNull(Long templateId, Long memberId);
|
||||
|
||||
@Query("SELECT COUNT(*) FROM member_coupon WHERE template_id = :templateId AND status = :status AND deleted_at IS NULL")
|
||||
Mono<Long> countByTemplateIdAndStatus(Long templateId, String status);
|
||||
|
||||
Mono<MemberCouponEntity> findByCouponCodeAndDeletedAtIsNull(String couponCode);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE member_coupon SET status = 'EXPIRED', updated_at = :now WHERE status = 'AVAILABLE' AND expire_at < :now AND deleted_at IS NULL")
|
||||
Mono<Integer> expireAvailableCoupons(java.time.LocalDateTime now);
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "领取码兑换优惠券请求")
|
||||
public class ClaimCouponRequest {
|
||||
|
||||
@Schema(description = "会员ID", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private Long memberId;
|
||||
|
||||
@Schema(description = "领取码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String claimCode;
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public String getClaimCode() {
|
||||
return claimCode;
|
||||
}
|
||||
|
||||
public void setClaimCode(String claimCode) {
|
||||
this.claimCode = claimCode;
|
||||
}
|
||||
}
|
||||
+86
@@ -0,0 +1,86 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Schema(description = "优惠券统计数据")
|
||||
public class CouponStatistics {
|
||||
|
||||
@Schema(description = "优惠券模板ID")
|
||||
private Long templateId;
|
||||
|
||||
@Schema(description = "已发放数量")
|
||||
private long issuedCount;
|
||||
|
||||
@Schema(description = "已使用数量")
|
||||
private long usedCount;
|
||||
|
||||
@Schema(description = "可用数量")
|
||||
private long availableCount;
|
||||
|
||||
@Schema(description = "已过期数量")
|
||||
private long expiredCount;
|
||||
|
||||
@Schema(description = "核销率（百分比）")
|
||||
private BigDecimal redemptionRate;
|
||||
|
||||
@Schema(description = "累计优惠金额")
|
||||
private BigDecimal totalDiscountAmount;
|
||||
|
||||
public Long getTemplateId() {
|
||||
return templateId;
|
||||
}
|
||||
|
||||
public void setTemplateId(Long templateId) {
|
||||
this.templateId = templateId;
|
||||
}
|
||||
|
||||
public long getIssuedCount() {
|
||||
return issuedCount;
|
||||
}
|
||||
|
||||
public void setIssuedCount(long issuedCount) {
|
||||
this.issuedCount = issuedCount;
|
||||
}
|
||||
|
||||
public long getUsedCount() {
|
||||
return usedCount;
|
||||
}
|
||||
|
||||
public void setUsedCount(long usedCount) {
|
||||
this.usedCount = usedCount;
|
||||
}
|
||||
|
||||
public long getAvailableCount() {
|
||||
return availableCount;
|
||||
}
|
||||
|
||||
public void setAvailableCount(long availableCount) {
|
||||
this.availableCount = availableCount;
|
||||
}
|
||||
|
||||
public long getExpiredCount() {
|
||||
return expiredCount;
|
||||
}
|
||||
|
||||
public void setExpiredCount(long expiredCount) {
|
||||
this.expiredCount = expiredCount;
|
||||
}
|
||||
|
||||
public BigDecimal getRedemptionRate() {
|
||||
return redemptionRate;
|
||||
}
|
||||
|
||||
public void setRedemptionRate(BigDecimal redemptionRate) {
|
||||
this.redemptionRate = redemptionRate;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalDiscountAmount() {
|
||||
return totalDiscountAmount;
|
||||
}
|
||||
|
||||
public void setTotalDiscountAmount(BigDecimal totalDiscountAmount) {
|
||||
this.totalDiscountAmount = totalDiscountAmount;
|
||||
}
|
||||
}
|
||||
+209
@@ -0,0 +1,209 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "优惠券模板")
|
||||
public class CouponTemplate extends BaseDomain {
|
||||
|
||||
//优惠券名称
|
||||
private String name;
|
||||
|
||||
@Schema(description = "优惠券描述")
|
||||
private String description;
|
||||
|
||||
@Schema(description = "优惠券类型：CASH/DISCOUNT/COURSE/EXPERIENCE", example = "CASH")
|
||||
private String couponType;
|
||||
|
||||
@Schema(description = "优惠值：满减/课程/体验为金额，折扣券为比例(0.9=9折)", example = "20.00")
|
||||
private BigDecimal discountValue;
|
||||
|
||||
@Schema(description = "使用门槛金额", example = "100.00")
|
||||
private BigDecimal thresholdAmount;
|
||||
|
||||
@Schema(description = "有效期类型：FIXED_DATE/DAYS_AFTER_CLAIM", example = "FIXED_DATE")
|
||||
private String validityType;
|
||||
|
||||
@Schema(description = "固定有效期开始时间")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Schema(description = "固定有效期结束时间")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Schema(description = "领取后有效天数")
|
||||
private Integer validDays;
|
||||
|
||||
@Schema(description = "适用商品范围：ALL/SPECIFIC", example = "ALL")
|
||||
private String applyScope;
|
||||
|
||||
@Schema(description = "指定商品ID列表（JSON数组字符串）")
|
||||
private String applyProductIds;
|
||||
|
||||
@Schema(description = "发放总量，-1表示不限量", example = "1000")
|
||||
private Integer totalQuantity;
|
||||
|
||||
@Schema(description = "每人限领数量", example = "1")
|
||||
private Integer perUserLimit;
|
||||
|
||||
@Schema(description = "是否可叠加使用", example = "false")
|
||||
private Boolean stackable;
|
||||
|
||||
@Schema(description = "领取码")
|
||||
private String claimCode;
|
||||
|
||||
@Schema(description = "状态：DRAFT/ACTIVE/TERMINATED/EXPIRED", example = "DRAFT")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "已发放数量")
|
||||
private Integer issuedCount;
|
||||
|
||||
@Schema(description = "已使用数量")
|
||||
private Integer usedCount;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getCouponType() {
|
||||
return couponType;
|
||||
}
|
||||
|
||||
public void setCouponType(String couponType) {
|
||||
this.couponType = couponType;
|
||||
}
|
||||
|
||||
public BigDecimal getDiscountValue() {
|
||||
return discountValue;
|
||||
}
|
||||
|
||||
public void setDiscountValue(BigDecimal discountValue) {
|
||||
this.discountValue = discountValue;
|
||||
}
|
||||
|
||||
public BigDecimal getThresholdAmount() {
|
||||
return thresholdAmount;
|
||||
}
|
||||
|
||||
public void setThresholdAmount(BigDecimal thresholdAmount) {
|
||||
this.thresholdAmount = thresholdAmount;
|
||||
}
|
||||
|
||||
public String getValidityType() {
|
||||
return validityType;
|
||||
}
|
||||
|
||||
public void setValidityType(String validityType) {
|
||||
this.validityType = validityType;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getValidDays() {
|
||||
return validDays;
|
||||
}
|
||||
|
||||
public void setValidDays(Integer validDays) {
|
||||
this.validDays = validDays;
|
||||
}
|
||||
|
||||
public String getApplyScope() {
|
||||
return applyScope;
|
||||
}
|
||||
|
||||
public void setApplyScope(String applyScope) {
|
||||
this.applyScope = applyScope;
|
||||
}
|
||||
|
||||
public String getApplyProductIds() {
|
||||
return applyProductIds;
|
||||
}
|
||||
|
||||
public void setApplyProductIds(String applyProductIds) {
|
||||
this.applyProductIds = applyProductIds;
|
||||
}
|
||||
|
||||
public Integer getTotalQuantity() {
|
||||
return totalQuantity;
|
||||
}
|
||||
|
||||
public void setTotalQuantity(Integer totalQuantity) {
|
||||
this.totalQuantity = totalQuantity;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
|
||||
public Boolean getStackable() {
|
||||
return stackable;
|
||||
}
|
||||
|
||||
public void setStackable(Boolean stackable) {
|
||||
this.stackable = stackable;
|
||||
}
|
||||
|
||||
public String getClaimCode() {
|
||||
return claimCode;
|
||||
}
|
||||
|
||||
public void setClaimCode(String claimCode) {
|
||||
this.claimCode = claimCode;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Integer getIssuedCount() {
|
||||
return issuedCount;
|
||||
}
|
||||
|
||||
public void setIssuedCount(Integer issuedCount) {
|
||||
this.issuedCount = issuedCount;
|
||||
}
|
||||
|
||||
public Integer getUsedCount() {
|
||||
return usedCount;
|
||||
}
|
||||
|
||||
public void setUsedCount(Integer usedCount) {
|
||||
this.usedCount = usedCount;
|
||||
}
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
|
||||
@Schema(description = "优惠券发放请求")
|
||||
public class DistributeCouponRequest {
|
||||
|
||||
@Schema(description = "目标会员ID列表", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private List<Long> memberIds;
|
||||
|
||||
@Schema(description = "发放方式：MANUAL/BATCH，默认MANUAL", example = "MANUAL")
|
||||
private String distributeType;
|
||||
|
||||
public List<Long> getMemberIds() {
|
||||
return memberIds;
|
||||
}
|
||||
|
||||
public void setMemberIds(List<Long> memberIds) {
|
||||
this.memberIds = memberIds;
|
||||
}
|
||||
|
||||
public String getDistributeType() {
|
||||
return distributeType;
|
||||
}
|
||||
|
||||
public void setDistributeType(String distributeType) {
|
||||
this.distributeType = distributeType;
|
||||
}
|
||||
}
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "优惠券发放结果")
|
||||
public class DistributeCouponResult {
|
||||
|
||||
@Schema(description = "成功发放数量")
|
||||
private int successCount;
|
||||
|
||||
@Schema(description = "失败数量")
|
||||
private int failCount;
|
||||
|
||||
@Schema(description = "提示信息")
|
||||
private String message;
|
||||
|
||||
public DistributeCouponResult() {
|
||||
}
|
||||
|
||||
public DistributeCouponResult(int successCount, int failCount, String message) {
|
||||
this.successCount = successCount;
|
||||
this.failCount = failCount;
|
||||
this.message = message;
|
||||
}
|
||||
|
||||
public int getSuccessCount() {
|
||||
return successCount;
|
||||
}
|
||||
|
||||
public void setSuccessCount(int successCount) {
|
||||
this.successCount = successCount;
|
||||
}
|
||||
|
||||
public int getFailCount() {
|
||||
return failCount;
|
||||
}
|
||||
|
||||
public void setFailCount(int failCount) {
|
||||
this.failCount = failCount;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
public void setMessage(String message) {
|
||||
this.message = message;
|
||||
}
|
||||
}
|
||||
+109
@@ -0,0 +1,109 @@
|
||||
package cn.novalon.gym.manage.coupon.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "会员优惠券")
|
||||
public class MemberCoupon extends BaseDomain {
|
||||
|
||||
@Schema(description = "优惠券模板ID")
|
||||
private Long templateId;
|
||||
|
||||
@Schema(description = "会员ID")
|
||||
private Long memberId;
|
||||
|
||||
@Schema(description = "优惠券码")
|
||||
private String couponCode;
|
||||
|
||||
@Schema(description = "状态：AVAILABLE/USED/EXPIRED/INVALID")
|
||||
private String status;
|
||||
|
||||
@Schema(description = "发放方式：MANUAL/BATCH/AUTO/CLAIM")
|
||||
private String distributeType;
|
||||
|
||||
@Schema(description = "领取时间")
|
||||
private LocalDateTime receivedAt;
|
||||
|
||||
@Schema(description = "过期时间")
|
||||
private LocalDateTime expireAt;
|
||||
|
||||
@Schema(description = "使用时间")
|
||||
private LocalDateTime usedAt;
|
||||
|
||||
@Schema(description = "关联订单ID")
|
||||
private Long orderId;
|
||||
|
||||
public Long getTemplateId() {
|
||||
return templateId;
|
||||
}
|
||||
|
||||
public void setTemplateId(Long templateId) {
|
||||
this.templateId = templateId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public String getCouponCode() {
|
||||
return couponCode;
|
||||
}
|
||||
|
||||
public void setCouponCode(String couponCode) {
|
||||
this.couponCode = couponCode;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getDistributeType() {
|
||||
return distributeType;
|
||||
}
|
||||
|
||||
public void setDistributeType(String distributeType) {
|
||||
this.distributeType = distributeType;
|
||||
}
|
||||
|
||||
public LocalDateTime getReceivedAt() {
|
||||
return receivedAt;
|
||||
}
|
||||
|
||||
public void setReceivedAt(LocalDateTime receivedAt) {
|
||||
this.receivedAt = receivedAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getUsedAt() {
|
||||
return usedAt;
|
||||
}
|
||||
|
||||
public void setUsedAt(LocalDateTime usedAt) {
|
||||
this.usedAt = usedAt;
|
||||
}
|
||||
|
||||
public Long getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setOrderId(Long orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
}
|
||||
+210
@@ -0,0 +1,210 @@
|
||||
package cn.novalon.gym.manage.coupon.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("coupon_template")
|
||||
public class CouponTemplateEntity extends BaseEntity {
|
||||
|
||||
@Column("name")
|
||||
private String name;
|
||||
|
||||
@Column("description")
|
||||
private String description;
|
||||
|
||||
@Column("coupon_type")
|
||||
private String couponType;
|
||||
|
||||
@Column("discount_value")
|
||||
private BigDecimal discountValue;
|
||||
|
||||
@Column("threshold_amount")
|
||||
private BigDecimal thresholdAmount;
|
||||
|
||||
@Column("validity_type")
|
||||
private String validityType;
|
||||
|
||||
@Column("start_time")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Column("end_time")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Column("valid_days")
|
||||
private Integer validDays;
|
||||
|
||||
@Column("apply_scope")
|
||||
private String applyScope;
|
||||
|
||||
@Column("apply_product_ids")
|
||||
private String applyProductIds;
|
||||
|
||||
@Column("total_quantity")
|
||||
private Integer totalQuantity;
|
||||
|
||||
@Column("per_user_limit")
|
||||
private Integer perUserLimit;
|
||||
|
||||
@Column("stackable")
|
||||
private Boolean stackable;
|
||||
|
||||
@Column("claim_code")
|
||||
private String claimCode;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("issued_count")
|
||||
private Integer issuedCount;
|
||||
|
||||
@Column("used_count")
|
||||
private Integer usedCount;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getCouponType() {
|
||||
return couponType;
|
||||
}
|
||||
|
||||
public void setCouponType(String couponType) {
|
||||
this.couponType = couponType;
|
||||
}
|
||||
|
||||
public BigDecimal getDiscountValue() {
|
||||
return discountValue;
|
||||
}
|
||||
|
||||
public void setDiscountValue(BigDecimal discountValue) {
|
||||
this.discountValue = discountValue;
|
||||
}
|
||||
|
||||
public BigDecimal getThresholdAmount() {
|
||||
return thresholdAmount;
|
||||
}
|
||||
|
||||
public void setThresholdAmount(BigDecimal thresholdAmount) {
|
||||
this.thresholdAmount = thresholdAmount;
|
||||
}
|
||||
|
||||
public String getValidityType() {
|
||||
return validityType;
|
||||
}
|
||||
|
||||
public void setValidityType(String validityType) {
|
||||
this.validityType = validityType;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getValidDays() {
|
||||
return validDays;
|
||||
}
|
||||
|
||||
public void setValidDays(Integer validDays) {
|
||||
this.validDays = validDays;
|
||||
}
|
||||
|
||||
public String getApplyScope() {
|
||||
return applyScope;
|
||||
}
|
||||
|
||||
public void setApplyScope(String applyScope) {
|
||||
this.applyScope = applyScope;
|
||||
}
|
||||
|
||||
public String getApplyProductIds() {
|
||||
return applyProductIds;
|
||||
}
|
||||
|
||||
public void setApplyProductIds(String applyProductIds) {
|
||||
this.applyProductIds = applyProductIds;
|
||||
}
|
||||
|
||||
public Integer getTotalQuantity() {
|
||||
return totalQuantity;
|
||||
}
|
||||
|
||||
public void setTotalQuantity(Integer totalQuantity) {
|
||||
this.totalQuantity = totalQuantity;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
|
||||
public Boolean getStackable() {
|
||||
return stackable;
|
||||
}
|
||||
|
||||
public void setStackable(Boolean stackable) {
|
||||
this.stackable = stackable;
|
||||
}
|
||||
|
||||
public String getClaimCode() {
|
||||
return claimCode;
|
||||
}
|
||||
|
||||
public void setClaimCode(String claimCode) {
|
||||
this.claimCode = claimCode;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public Integer getIssuedCount() {
|
||||
return issuedCount;
|
||||
}
|
||||
|
||||
public void setIssuedCount(Integer issuedCount) {
|
||||
this.issuedCount = issuedCount;
|
||||
}
|
||||
|
||||
public Integer getUsedCount() {
|
||||
return usedCount;
|
||||
}
|
||||
|
||||
public void setUsedCount(Integer usedCount) {
|
||||
this.usedCount = usedCount;
|
||||
}
|
||||
}
|
||||
+110
@@ -0,0 +1,110 @@
|
||||
package cn.novalon.gym.manage.coupon.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("member_coupon")
|
||||
public class MemberCouponEntity extends BaseEntity {
|
||||
|
||||
@Column("template_id")
|
||||
private Long templateId;
|
||||
|
||||
@Column("member_id")
|
||||
private Long memberId;
|
||||
|
||||
@Column("coupon_code")
|
||||
private String couponCode;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("distribute_type")
|
||||
private String distributeType;
|
||||
|
||||
@Column("received_at")
|
||||
private LocalDateTime receivedAt;
|
||||
|
||||
@Column("expire_at")
|
||||
private LocalDateTime expireAt;
|
||||
|
||||
@Column("used_at")
|
||||
private LocalDateTime usedAt;
|
||||
|
||||
@Column("order_id")
|
||||
private Long orderId;
|
||||
|
||||
public Long getTemplateId() {
|
||||
return templateId;
|
||||
}
|
||||
|
||||
public void setTemplateId(Long templateId) {
|
||||
this.templateId = templateId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public String getCouponCode() {
|
||||
return couponCode;
|
||||
}
|
||||
|
||||
public void setCouponCode(String couponCode) {
|
||||
this.couponCode = couponCode;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getDistributeType() {
|
||||
return distributeType;
|
||||
}
|
||||
|
||||
public void setDistributeType(String distributeType) {
|
||||
this.distributeType = distributeType;
|
||||
}
|
||||
|
||||
public LocalDateTime getReceivedAt() {
|
||||
return receivedAt;
|
||||
}
|
||||
|
||||
public void setReceivedAt(LocalDateTime receivedAt) {
|
||||
this.receivedAt = receivedAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getUsedAt() {
|
||||
return usedAt;
|
||||
}
|
||||
|
||||
public void setUsedAt(LocalDateTime usedAt) {
|
||||
this.usedAt = usedAt;
|
||||
}
|
||||
|
||||
public Long getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setOrderId(Long orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券适用商品范围
|
||||
*/
|
||||
public enum ApplyScope {
|
||||
/** 全场通用 */
|
||||
ALL,
|
||||
/** 指定商品 */
|
||||
SPECIFIC
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券模板状态
|
||||
*/
|
||||
public enum CouponTemplateStatus {
|
||||
/** 草稿 */
|
||||
DRAFT,
|
||||
/** 进行中 */
|
||||
ACTIVE,
|
||||
/** 已终止 */
|
||||
TERMINATED,
|
||||
/** 已过期 */
|
||||
EXPIRED
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券类型
|
||||
*/
|
||||
public enum CouponType {
|
||||
/** 满减券 */
|
||||
CASH,
|
||||
/** 折扣券 */
|
||||
DISCOUNT,
|
||||
/** 课程券 */
|
||||
COURSE,
|
||||
/** 体验券（会员体验专用） */
|
||||
EXPERIENCE
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券发放方式
|
||||
*/
|
||||
public enum DistributeType {
|
||||
/** 手动发放（指定会员） */
|
||||
MANUAL,
|
||||
/** 批量发放（按会员分组） */
|
||||
BATCH,
|
||||
/** 自动发放（触发规则） */
|
||||
AUTO,
|
||||
/** 领取码/二维码领取 */
|
||||
CLAIM
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 会员优惠券状态
|
||||
*/
|
||||
public enum MemberCouponStatus {
|
||||
/** 可用 */
|
||||
AVAILABLE,
|
||||
/** 已使用 */
|
||||
USED,
|
||||
/** 已过期 */
|
||||
EXPIRED,
|
||||
/** 已作废 */
|
||||
INVALID
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.enums;
|
||||
|
||||
/**
|
||||
* 优惠券有效期类型
|
||||
*/
|
||||
public enum ValidityType {
|
||||
/** 固定日期 */
|
||||
FIXED_DATE,
|
||||
/** 领取后X天 */
|
||||
DAYS_AFTER_CLAIM
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.converter;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleActivityEntity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleItemEntity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleOrderEntity;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class FlashSaleConverter {
|
||||
|
||||
public FlashSaleActivity toActivity(FlashSaleActivityEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleActivity domain = new FlashSaleActivity();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public FlashSaleActivityEntity toActivityEntity(FlashSaleActivity domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleActivityEntity entity = new FlashSaleActivityEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public FlashSaleItem toItem(FlashSaleItemEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleItem domain = new FlashSaleItem();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public FlashSaleItemEntity toItemEntity(FlashSaleItem domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleItemEntity entity = new FlashSaleItemEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public FlashSaleOrder toOrder(FlashSaleOrderEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleOrder domain = new FlashSaleOrder();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public FlashSaleOrderEntity toOrderEntity(FlashSaleOrder domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
FlashSaleOrderEntity entity = new FlashSaleOrderEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleActivityEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface FlashSaleActivityDao extends R2dbcRepository<FlashSaleActivityEntity, Long> {
|
||||
|
||||
Mono<FlashSaleActivityEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<FlashSaleActivityEntity> findAllByDeletedAtIsNull();
|
||||
|
||||
Flux<FlashSaleActivityEntity> findByNameContainingAndDeletedAtIsNull(String name);
|
||||
|
||||
Flux<FlashSaleActivityEntity> findByStatusAndDeletedAtIsNull(String status);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_activity SET deleted_at = :deletedAt WHERE id = :id")
|
||||
Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_activity SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleItemEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface FlashSaleItemDao extends R2dbcRepository<FlashSaleItemEntity, Long> {
|
||||
|
||||
Mono<FlashSaleItemEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<FlashSaleItemEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_item SET stock = stock - :quantity, updated_at = :updatedAt WHERE id = :id AND stock >= :quantity")
|
||||
Mono<Integer> deductStock(Long id, int quantity, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_item SET stock = stock + :quantity, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> restoreStock(Long id, int quantity, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_item SET sold_count = sold_count + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementSoldCount(Long id, int count, LocalDateTime updatedAt);
|
||||
}
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleOrderEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface FlashSaleOrderDao extends R2dbcRepository<FlashSaleOrderEntity, Long> {
|
||||
|
||||
Mono<FlashSaleOrderEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<FlashSaleOrderEntity> findByMemberIdAndDeletedAtIsNull(Long memberId);
|
||||
|
||||
Flux<FlashSaleOrderEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
Mono<Long> countByActivityIdAndMemberIdAndStatusAndDeletedAtIsNull(
|
||||
Long activityId, Long memberId, String status);
|
||||
|
||||
Mono<Long> countByItemIdAndMemberIdAndStatusInAndDeletedAtIsNull(
|
||||
Long itemId, Long memberId, java.util.Collection<String> statuses);
|
||||
|
||||
@Query("SELECT * FROM flash_sale_order WHERE status = :status AND expire_at < :now AND deleted_at IS NULL")
|
||||
Flux<FlashSaleOrderEntity> findExpiredPendingOrders(String status, LocalDateTime now);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_order SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE flash_sale_order SET status = :status, pay_at = :payAt, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> markPaid(Long id, String status, LocalDateTime payAt, LocalDateTime updatedAt);
|
||||
}
|
||||
+74
@@ -0,0 +1,74 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "秒杀活动")
|
||||
public class FlashSaleActivity extends BaseDomain {
|
||||
|
||||
private String name;
|
||||
private String description;
|
||||
private LocalDateTime startTime;
|
||||
private LocalDateTime endTime;
|
||||
private Integer payTimeoutMinutes;
|
||||
private Integer perUserLimit;
|
||||
private String status;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getPayTimeoutMinutes() {
|
||||
return payTimeoutMinutes;
|
||||
}
|
||||
|
||||
public void setPayTimeoutMinutes(Integer payTimeoutMinutes) {
|
||||
this.payTimeoutMinutes = payTimeoutMinutes;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
+92
@@ -0,0 +1,92 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Schema(description = "秒杀商品")
|
||||
public class FlashSaleItem extends BaseDomain {
|
||||
|
||||
private Long activityId;
|
||||
private String productType;
|
||||
private Long productId;
|
||||
private String productName;
|
||||
private BigDecimal originalPrice;
|
||||
private BigDecimal seckillPrice;
|
||||
private Integer stock;
|
||||
private Integer soldCount;
|
||||
private Integer perUserLimit;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public String getProductType() {
|
||||
return productType;
|
||||
}
|
||||
|
||||
public void setProductType(String productType) {
|
||||
this.productType = productType;
|
||||
}
|
||||
|
||||
public Long getProductId() {
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductId(Long productId) {
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public BigDecimal getOriginalPrice() {
|
||||
return originalPrice;
|
||||
}
|
||||
|
||||
public void setOriginalPrice(BigDecimal originalPrice) {
|
||||
this.originalPrice = originalPrice;
|
||||
}
|
||||
|
||||
public BigDecimal getSeckillPrice() {
|
||||
return seckillPrice;
|
||||
}
|
||||
|
||||
public void setSeckillPrice(BigDecimal seckillPrice) {
|
||||
this.seckillPrice = seckillPrice;
|
||||
}
|
||||
|
||||
public Integer getStock() {
|
||||
return stock;
|
||||
}
|
||||
|
||||
public void setStock(Integer stock) {
|
||||
this.stock = stock;
|
||||
}
|
||||
|
||||
public Integer getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(Integer soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
}
|
||||
+84
@@ -0,0 +1,84 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "秒杀订单")
|
||||
public class FlashSaleOrder extends BaseDomain {
|
||||
|
||||
private Long activityId;
|
||||
private Long itemId;
|
||||
private Long memberId;
|
||||
private Integer quantity;
|
||||
private BigDecimal payAmount;
|
||||
private String status;
|
||||
private LocalDateTime expireAt;
|
||||
private LocalDateTime payAt;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
public void setItemId(Long itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public BigDecimal getPayAmount() {
|
||||
return payAmount;
|
||||
}
|
||||
|
||||
public void setPayAmount(BigDecimal payAmount) {
|
||||
this.payAmount = payAmount;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getPayAt() {
|
||||
return payAt;
|
||||
}
|
||||
|
||||
public void setPayAt(LocalDateTime payAt) {
|
||||
this.payAt = payAt;
|
||||
}
|
||||
}
|
||||
+82
@@ -0,0 +1,82 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Schema(description = "秒杀统计数据")
|
||||
public class FlashSaleStatistics {
|
||||
|
||||
private Long activityId;
|
||||
private long totalOrders;
|
||||
private long pendingOrders;
|
||||
private long paidOrders;
|
||||
private long cancelledOrders;
|
||||
private long expiredOrders;
|
||||
private long totalSoldQuantity;
|
||||
private BigDecimal totalRevenue;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public long getTotalOrders() {
|
||||
return totalOrders;
|
||||
}
|
||||
|
||||
public void setTotalOrders(long totalOrders) {
|
||||
this.totalOrders = totalOrders;
|
||||
}
|
||||
|
||||
public long getPendingOrders() {
|
||||
return pendingOrders;
|
||||
}
|
||||
|
||||
public void setPendingOrders(long pendingOrders) {
|
||||
this.pendingOrders = pendingOrders;
|
||||
}
|
||||
|
||||
public long getPaidOrders() {
|
||||
return paidOrders;
|
||||
}
|
||||
|
||||
public void setPaidOrders(long paidOrders) {
|
||||
this.paidOrders = paidOrders;
|
||||
}
|
||||
|
||||
public long getCancelledOrders() {
|
||||
return cancelledOrders;
|
||||
}
|
||||
|
||||
public void setCancelledOrders(long cancelledOrders) {
|
||||
this.cancelledOrders = cancelledOrders;
|
||||
}
|
||||
|
||||
public long getExpiredOrders() {
|
||||
return expiredOrders;
|
||||
}
|
||||
|
||||
public void setExpiredOrders(long expiredOrders) {
|
||||
this.expiredOrders = expiredOrders;
|
||||
}
|
||||
|
||||
public long getTotalSoldQuantity() {
|
||||
return totalSoldQuantity;
|
||||
}
|
||||
|
||||
public void setTotalSoldQuantity(long totalSoldQuantity) {
|
||||
this.totalSoldQuantity = totalSoldQuantity;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalRevenue() {
|
||||
return totalRevenue;
|
||||
}
|
||||
|
||||
public void setTotalRevenue(BigDecimal totalRevenue) {
|
||||
this.totalRevenue = totalRevenue;
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "秒杀抢购请求")
|
||||
public class GrabRequest {
|
||||
|
||||
private Long itemId;
|
||||
private Long memberId;
|
||||
private Integer quantity;
|
||||
|
||||
public Long getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
public void setItemId(Long itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
}
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("flash_sale_activity")
|
||||
public class FlashSaleActivityEntity extends BaseEntity {
|
||||
|
||||
@Column("name")
|
||||
private String name;
|
||||
|
||||
@Column("description")
|
||||
private String description;
|
||||
|
||||
@Column("start_time")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Column("end_time")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Column("pay_timeout_minutes")
|
||||
private Integer payTimeoutMinutes;
|
||||
|
||||
@Column("per_user_limit")
|
||||
private Integer perUserLimit;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getPayTimeoutMinutes() {
|
||||
return payTimeoutMinutes;
|
||||
}
|
||||
|
||||
public void setPayTimeoutMinutes(Integer payTimeoutMinutes) {
|
||||
this.payTimeoutMinutes = payTimeoutMinutes;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
+110
@@ -0,0 +1,110 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Table("flash_sale_item")
|
||||
public class FlashSaleItemEntity extends BaseEntity {
|
||||
|
||||
@Column("activity_id")
|
||||
private Long activityId;
|
||||
|
||||
@Column("product_type")
|
||||
private String productType;
|
||||
|
||||
@Column("product_id")
|
||||
private Long productId;
|
||||
|
||||
@Column("product_name")
|
||||
private String productName;
|
||||
|
||||
@Column("original_price")
|
||||
private BigDecimal originalPrice;
|
||||
|
||||
@Column("seckill_price")
|
||||
private BigDecimal seckillPrice;
|
||||
|
||||
@Column("stock")
|
||||
private Integer stock;
|
||||
|
||||
@Column("sold_count")
|
||||
private Integer soldCount;
|
||||
|
||||
@Column("per_user_limit")
|
||||
private Integer perUserLimit;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public String getProductType() {
|
||||
return productType;
|
||||
}
|
||||
|
||||
public void setProductType(String productType) {
|
||||
this.productType = productType;
|
||||
}
|
||||
|
||||
public Long getProductId() {
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductId(Long productId) {
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public BigDecimal getOriginalPrice() {
|
||||
return originalPrice;
|
||||
}
|
||||
|
||||
public void setOriginalPrice(BigDecimal originalPrice) {
|
||||
this.originalPrice = originalPrice;
|
||||
}
|
||||
|
||||
public BigDecimal getSeckillPrice() {
|
||||
return seckillPrice;
|
||||
}
|
||||
|
||||
public void setSeckillPrice(BigDecimal seckillPrice) {
|
||||
this.seckillPrice = seckillPrice;
|
||||
}
|
||||
|
||||
public Integer getStock() {
|
||||
return stock;
|
||||
}
|
||||
|
||||
public void setStock(Integer stock) {
|
||||
this.stock = stock;
|
||||
}
|
||||
|
||||
public Integer getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(Integer soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public Integer getPerUserLimit() {
|
||||
return perUserLimit;
|
||||
}
|
||||
|
||||
public void setPerUserLimit(Integer perUserLimit) {
|
||||
this.perUserLimit = perUserLimit;
|
||||
}
|
||||
}
|
||||
+100
@@ -0,0 +1,100 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("flash_sale_order")
|
||||
public class FlashSaleOrderEntity extends BaseEntity {
|
||||
|
||||
@Column("activity_id")
|
||||
private Long activityId;
|
||||
|
||||
@Column("item_id")
|
||||
private Long itemId;
|
||||
|
||||
@Column("member_id")
|
||||
private Long memberId;
|
||||
|
||||
@Column("quantity")
|
||||
private Integer quantity;
|
||||
|
||||
@Column("pay_amount")
|
||||
private BigDecimal payAmount;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("expire_at")
|
||||
private LocalDateTime expireAt;
|
||||
|
||||
@Column("pay_at")
|
||||
private LocalDateTime payAt;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
public void setItemId(Long itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Integer getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(Integer quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public BigDecimal getPayAmount() {
|
||||
return payAmount;
|
||||
}
|
||||
|
||||
public void setPayAmount(BigDecimal payAmount) {
|
||||
this.payAmount = payAmount;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getPayAt() {
|
||||
return payAt;
|
||||
}
|
||||
|
||||
public void setPayAt(LocalDateTime payAt) {
|
||||
this.payAt = payAt;
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.enums;
|
||||
|
||||
/**
|
||||
* 秒杀活动状态
|
||||
*/
|
||||
public enum FlashSaleActivityStatus {
|
||||
DRAFT,
|
||||
ACTIVE,
|
||||
TERMINATED,
|
||||
EXPIRED
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.enums;
|
||||
|
||||
/**
|
||||
* 秒杀订单状态
|
||||
*/
|
||||
public enum FlashSaleOrderStatus {
|
||||
PENDING,
|
||||
PAID,
|
||||
CANCELLED,
|
||||
EXPIRED
|
||||
}
|
||||
+219
@@ -0,0 +1,219 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.handler;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.GrabRequest;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.service.IFlashSaleActivityService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.function.server.ServerRequest;
|
||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
@Tag(name = "秒杀管理", description = "秒杀相关操作")
|
||||
public class FlashSaleHandler {
|
||||
|
||||
private final IFlashSaleActivityService flashSaleService;
|
||||
|
||||
public FlashSaleHandler(IFlashSaleActivityService flashSaleService) {
|
||||
this.flashSaleService = flashSaleService;
|
||||
}
|
||||
|
||||
@Operation(summary = "获取所有秒杀活动")
|
||||
public Mono<ServerResponse> getAllActivities(ServerRequest request) {
|
||||
boolean includeDeleted = Boolean.parseBoolean(request.queryParam("includeDeleted").orElse("false"));
|
||||
return ServerResponse.ok()
|
||||
.body(flashSaleService.findAll(includeDeleted), FlashSaleActivity.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "分页获取秒杀活动")
|
||||
public Mono<ServerResponse> getActivitiesByPage(ServerRequest request) {
|
||||
return request.bodyToMono(PageRequest.class)
|
||||
.flatMap(pageRequest -> {
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
normalizePageRequest(pageRequest);
|
||||
return flashSaleService.findByPage(pageRequest, status)
|
||||
.flatMap(response -> ServerResponse.ok().bodyValue(response));
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "搜索秒杀活动")
|
||||
public Mono<ServerResponse> searchActivities(ServerRequest request) {
|
||||
String keyword = request.queryParam("keyword").orElse("");
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
return ServerResponse.ok()
|
||||
.body(flashSaleService.findByKeywordAndStatus(keyword, status), FlashSaleActivity.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "根据ID获取秒杀活动")
|
||||
public Mono<ServerResponse> getActivityById(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.findById(id)
|
||||
.flatMap(activity -> ServerResponse.ok().bodyValue(activity))
|
||||
.switchIfEmpty(ServerResponse.notFound().build());
|
||||
}
|
||||
|
||||
@Operation(summary = "创建秒杀活动")
|
||||
public Mono<ServerResponse> createActivity(ServerRequest request) {
|
||||
return request.bodyToMono(FlashSaleActivity.class)
|
||||
.flatMap(activity -> {
|
||||
if (activity.getName() == null || activity.getName().isEmpty()) {
|
||||
return badRequest("活动名称不能为空");
|
||||
}
|
||||
return flashSaleService.create(activity)
|
||||
.flatMap(created -> successResponse("秒杀活动创建成功", created))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "更新秒杀活动")
|
||||
public Mono<ServerResponse> updateActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return request.bodyToMono(FlashSaleActivity.class)
|
||||
.flatMap(activity -> flashSaleService.update(id, activity)
|
||||
.flatMap(updated -> successResponse("秒杀活动更新成功", updated))
|
||||
.onErrorResume(this::errorResponse));
|
||||
}
|
||||
|
||||
@Operation(summary = "删除秒杀活动")
|
||||
public Mono<ServerResponse> deleteActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.delete(id)
|
||||
.then(Mono.defer(() -> successResponse("秒杀活动删除成功", null)))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "发布秒杀活动")
|
||||
public Mono<ServerResponse> publishActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.publish(id)
|
||||
.flatMap(activity -> successResponse("秒杀活动发布成功", activity))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "终止秒杀活动")
|
||||
public Mono<ServerResponse> terminateActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.terminate(id)
|
||||
.flatMap(activity -> successResponse("秒杀活动已终止", activity))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取秒杀统计")
|
||||
public Mono<ServerResponse> getStatistics(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return flashSaleService.getStatistics(id)
|
||||
.flatMap(stats -> ServerResponse.ok().bodyValue(stats))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取秒杀商品列表")
|
||||
public Mono<ServerResponse> getItems(ServerRequest request) {
|
||||
String activityIdStr = request.queryParam("activityId").orElse(null);
|
||||
if (activityIdStr == null) {
|
||||
return badRequest("activityId不能为空");
|
||||
}
|
||||
Long activityId = Long.valueOf(activityIdStr);
|
||||
return ServerResponse.ok()
|
||||
.body(flashSaleService.findItemsByActivityId(activityId), FlashSaleItem.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "创建秒杀商品")
|
||||
public Mono<ServerResponse> createItem(ServerRequest request) {
|
||||
return request.bodyToMono(FlashSaleItem.class)
|
||||
.flatMap(item -> flashSaleService.createItem(item)
|
||||
.flatMap(created -> successResponse("秒杀商品创建成功", created))
|
||||
.onErrorResume(this::errorResponse));
|
||||
}
|
||||
|
||||
@Operation(summary = "更新秒杀商品")
|
||||
public Mono<ServerResponse> updateItem(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return request.bodyToMono(FlashSaleItem.class)
|
||||
.flatMap(item -> flashSaleService.updateItem(id, item)
|
||||
.flatMap(updated -> successResponse("秒杀商品更新成功", updated))
|
||||
.onErrorResume(this::errorResponse));
|
||||
}
|
||||
|
||||
@Operation(summary = "秒杀抢购")
|
||||
public Mono<ServerResponse> grab(ServerRequest request) {
|
||||
return request.bodyToMono(GrabRequest.class)
|
||||
.flatMap(body -> {
|
||||
if (body.getItemId() == null || body.getMemberId() == null) {
|
||||
return badRequest("itemId和memberId不能为空");
|
||||
}
|
||||
return flashSaleService.grab(body)
|
||||
.flatMap(order -> successResponse("抢购成功，请尽快支付", order))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "支付秒杀订单")
|
||||
public Mono<ServerResponse> payOrder(ServerRequest request) {
|
||||
Long orderId = Long.valueOf(request.pathVariable("orderId"));
|
||||
return flashSaleService.payOrder(orderId)
|
||||
.flatMap(order -> successResponse("支付成功", order))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "取消秒杀订单")
|
||||
public Mono<ServerResponse> cancelOrder(ServerRequest request) {
|
||||
Long orderId = Long.valueOf(request.pathVariable("orderId"));
|
||||
return flashSaleService.cancelOrder(orderId)
|
||||
.flatMap(order -> successResponse("订单已取消", order))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取会员秒杀订单")
|
||||
public Mono<ServerResponse> getOrdersByMember(ServerRequest request) {
|
||||
Long memberId = Long.valueOf(request.pathVariable("memberId"));
|
||||
return ServerResponse.ok()
|
||||
.body(flashSaleService.findOrdersByMemberId(memberId), FlashSaleOrder.class);
|
||||
}
|
||||
|
||||
private void normalizePageRequest(PageRequest pageRequest) {
|
||||
if (pageRequest.getPage() < 0) {
|
||||
pageRequest.setPage(0);
|
||||
}
|
||||
if (pageRequest.getSize() <= 0 || pageRequest.getSize() > 100) {
|
||||
pageRequest.setSize(10);
|
||||
}
|
||||
if (pageRequest.getSort() == null || pageRequest.getSort().isEmpty()) {
|
||||
pageRequest.setSort("id");
|
||||
}
|
||||
if (pageRequest.getOrder() == null || pageRequest.getOrder().isEmpty()) {
|
||||
pageRequest.setOrder("desc");
|
||||
}
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> successResponse(String message, Object data) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", message);
|
||||
if (data != null) {
|
||||
response.put("data", data);
|
||||
}
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> badRequest(String message) {
|
||||
Map<String, Object> error = new HashMap<>();
|
||||
error.put("success", false);
|
||||
error.put("message", message);
|
||||
return ServerResponse.badRequest().bodyValue(error);
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> errorResponse(Throwable error) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
}
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IFlashSaleActivityRepository {
|
||||
|
||||
Mono<FlashSaleActivity> findById(Long id);
|
||||
|
||||
Flux<FlashSaleActivity> findAll(boolean includeDeleted);
|
||||
|
||||
Flux<FlashSaleActivity> findByKeyword(String keyword);
|
||||
|
||||
Flux<FlashSaleActivity> findByStatus(String status);
|
||||
|
||||
Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status);
|
||||
|
||||
Mono<FlashSaleActivity> save(FlashSaleActivity activity);
|
||||
|
||||
Mono<FlashSaleActivity> update(FlashSaleActivity activity);
|
||||
|
||||
Mono<Void> deleteById(Long id);
|
||||
|
||||
Mono<Void> updateStatus(Long id, String status);
|
||||
}
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IFlashSaleItemRepository {
|
||||
|
||||
Mono<FlashSaleItem> findById(Long id);
|
||||
|
||||
Flux<FlashSaleItem> findByActivityId(Long activityId);
|
||||
|
||||
Mono<FlashSaleItem> save(FlashSaleItem item);
|
||||
|
||||
Mono<FlashSaleItem> update(FlashSaleItem item);
|
||||
|
||||
Mono<Boolean> deductStock(Long id, int quantity);
|
||||
|
||||
Mono<Void> restoreStock(Long id, int quantity);
|
||||
|
||||
Mono<Void> incrementSoldCount(Long id, int count);
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
public interface IFlashSaleOrderRepository {
|
||||
|
||||
Mono<FlashSaleOrder> findById(Long id);
|
||||
|
||||
Flux<FlashSaleOrder> findByMemberId(Long memberId);
|
||||
|
||||
Flux<FlashSaleOrder> findByActivityId(Long activityId);
|
||||
|
||||
Flux<FlashSaleOrder> findExpiredPendingOrders();
|
||||
|
||||
Mono<Long> countByItemIdAndMemberIdAndStatusIn(Long itemId, Long memberId, Collection<String> statuses);
|
||||
|
||||
Mono<FlashSaleOrder> save(FlashSaleOrder order);
|
||||
|
||||
Mono<Void> updateStatus(Long id, String status);
|
||||
|
||||
Mono<Void> markPaid(Long id, String status);
|
||||
}
|
||||
+109
@@ -0,0 +1,109 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.converter.FlashSaleConverter;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.dao.FlashSaleActivityDao;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleActivityEntity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleActivityRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class FlashSaleActivityRepository implements IFlashSaleActivityRepository {
|
||||
|
||||
private final FlashSaleActivityDao activityDao;
|
||||
private final FlashSaleConverter converter;
|
||||
|
||||
public FlashSaleActivityRepository(FlashSaleActivityDao activityDao, FlashSaleConverter converter) {
|
||||
this.activityDao = activityDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> findById(Long id) {
|
||||
return activityDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findAll(boolean includeDeleted) {
|
||||
if (includeDeleted) {
|
||||
return activityDao.findAll().map(converter::toActivity);
|
||||
}
|
||||
return activityDao.findAllByDeletedAtIsNull().map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findByKeyword(String keyword) {
|
||||
if (keyword == null || keyword.isEmpty()) {
|
||||
return findAll(false);
|
||||
}
|
||||
return activityDao.findByNameContainingAndDeletedAtIsNull(keyword).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findByStatus(String status) {
|
||||
if (status == null || status.isEmpty()) {
|
||||
return findAll(false);
|
||||
}
|
||||
return activityDao.findByStatusAndDeletedAtIsNull(status).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status) {
|
||||
Flux<FlashSaleActivity> result = findByKeyword(keyword);
|
||||
if (status != null && !status.isEmpty()) {
|
||||
result = result.filter(a -> status.equals(a.getStatus()));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> save(FlashSaleActivity activity) {
|
||||
return activityDao.save(converter.toActivityEntity(activity)).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> update(FlashSaleActivity activity) {
|
||||
return activityDao.findByIdIsAndDeletedAtIsNull(activity.getId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
existing.markNotNew();
|
||||
if (activity.getName() != null) {
|
||||
existing.setName(activity.getName());
|
||||
}
|
||||
if (activity.getDescription() != null) {
|
||||
existing.setDescription(activity.getDescription());
|
||||
}
|
||||
if (activity.getStartTime() != null) {
|
||||
existing.setStartTime(activity.getStartTime());
|
||||
}
|
||||
if (activity.getEndTime() != null) {
|
||||
existing.setEndTime(activity.getEndTime());
|
||||
}
|
||||
if (activity.getPayTimeoutMinutes() != null) {
|
||||
existing.setPayTimeoutMinutes(activity.getPayTimeoutMinutes());
|
||||
}
|
||||
if (activity.getPerUserLimit() != null) {
|
||||
existing.setPerUserLimit(activity.getPerUserLimit());
|
||||
}
|
||||
existing.setUpdatedAt(LocalDateTime.now());
|
||||
return activityDao.save(existing);
|
||||
})
|
||||
.map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> deleteById(Long id) {
|
||||
return activityDao.softDelete(id, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatus(Long id, String status) {
|
||||
return activityDao.updateStatus(id, status, LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+90
@@ -0,0 +1,90 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.converter.FlashSaleConverter;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.dao.FlashSaleItemDao;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.entity.FlashSaleItemEntity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleItemRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class FlashSaleItemRepository implements IFlashSaleItemRepository {
|
||||
|
||||
private final FlashSaleItemDao itemDao;
|
||||
private final FlashSaleConverter converter;
|
||||
|
||||
public FlashSaleItemRepository(FlashSaleItemDao itemDao, FlashSaleConverter converter) {
|
||||
this.itemDao = itemDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> findById(Long id) {
|
||||
return itemDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleItem> findByActivityId(Long activityId) {
|
||||
return itemDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> save(FlashSaleItem item) {
|
||||
return itemDao.save(converter.toItemEntity(item)).map(converter::toItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> update(FlashSaleItem item) {
|
||||
return itemDao.findByIdIsAndDeletedAtIsNull(item.getId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀商品不存在")))
|
||||
.flatMap(existing -> {
|
||||
existing.markNotNew();
|
||||
if (item.getProductType() != null) {
|
||||
existing.setProductType(item.getProductType());
|
||||
}
|
||||
if (item.getProductId() != null) {
|
||||
existing.setProductId(item.getProductId());
|
||||
}
|
||||
if (item.getProductName() != null) {
|
||||
existing.setProductName(item.getProductName());
|
||||
}
|
||||
if (item.getOriginalPrice() != null) {
|
||||
existing.setOriginalPrice(item.getOriginalPrice());
|
||||
}
|
||||
if (item.getSeckillPrice() != null) {
|
||||
existing.setSeckillPrice(item.getSeckillPrice());
|
||||
}
|
||||
if (item.getStock() != null) {
|
||||
existing.setStock(item.getStock());
|
||||
}
|
||||
if (item.getPerUserLimit() != null) {
|
||||
existing.setPerUserLimit(item.getPerUserLimit());
|
||||
}
|
||||
existing.setUpdatedAt(LocalDateTime.now());
|
||||
return itemDao.save(existing);
|
||||
})
|
||||
.map(converter::toItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Boolean> deductStock(Long id, int quantity) {
|
||||
return itemDao.deductStock(id, quantity, LocalDateTime.now())
|
||||
.map(rows -> rows != null && rows > 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> restoreStock(Long id, int quantity) {
|
||||
return itemDao.restoreStock(id, quantity, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> incrementSoldCount(Long id, int count) {
|
||||
return itemDao.incrementSoldCount(id, count, LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+68
@@ -0,0 +1,68 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.converter.FlashSaleConverter;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.dao.FlashSaleOrderDao;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.enums.FlashSaleOrderStatus;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleOrderRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Collection;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class FlashSaleOrderRepository implements IFlashSaleOrderRepository {
|
||||
|
||||
private final FlashSaleOrderDao orderDao;
|
||||
private final FlashSaleConverter converter;
|
||||
|
||||
public FlashSaleOrderRepository(FlashSaleOrderDao orderDao, FlashSaleConverter converter) {
|
||||
this.orderDao = orderDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> findById(Long id) {
|
||||
return orderDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleOrder> findByMemberId(Long memberId) {
|
||||
return orderDao.findByMemberIdAndDeletedAtIsNull(memberId).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleOrder> findByActivityId(Long activityId) {
|
||||
return orderDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleOrder> findExpiredPendingOrders() {
|
||||
return orderDao.findExpiredPendingOrders(
|
||||
FlashSaleOrderStatus.PENDING.name(), LocalDateTime.now()).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Long> countByItemIdAndMemberIdAndStatusIn(Long itemId, Long memberId, Collection<String> statuses) {
|
||||
return orderDao.countByItemIdAndMemberIdAndStatusInAndDeletedAtIsNull(itemId, memberId, statuses);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> save(FlashSaleOrder order) {
|
||||
return orderDao.save(converter.toOrderEntity(order)).map(converter::toOrder);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatus(Long id, String status) {
|
||||
return orderDao.updateStatus(id, status, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> markPaid(Long id, String status) {
|
||||
return orderDao.markPaid(id, status, LocalDateTime.now(), LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.scheduler;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.flashsale.service.IFlashSaleActivityService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 秒杀订单过期定时任务
|
||||
*
|
||||
* 功能：定期检查已过期的待支付订单，取消订单并恢复库存
|
||||
*/
|
||||
@Component
|
||||
public class FlashSaleOrderExpireScheduler {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(FlashSaleOrderExpireScheduler.class);
|
||||
|
||||
private final IFlashSaleActivityService flashSaleService;
|
||||
|
||||
public FlashSaleOrderExpireScheduler(IFlashSaleActivityService flashSaleService) {
|
||||
this.flashSaleService = flashSaleService;
|
||||
}
|
||||
|
||||
@Scheduled(fixedRate = 60000)
|
||||
public void processExpiredOrders() {
|
||||
logger.debug("定时任务开始检查过期秒杀订单");
|
||||
|
||||
flashSaleService.processExpiredOrders()
|
||||
.subscribe(
|
||||
count -> logger.debug("定时任务完成，处理了 {} 个过期秒杀订单", count),
|
||||
error -> logger.error("秒杀订单过期定时任务执行失败：{}", error.getMessage(), error)
|
||||
);
|
||||
}
|
||||
}
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.service;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.common.dto.PageResponse;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleStatistics;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.GrabRequest;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IFlashSaleActivityService {
|
||||
|
||||
Mono<FlashSaleActivity> findById(Long id);
|
||||
|
||||
Flux<FlashSaleActivity> findAll(boolean includeDeleted);
|
||||
|
||||
Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status);
|
||||
|
||||
Mono<PageResponse<FlashSaleActivity>> findByPage(PageRequest pageRequest, String status);
|
||||
|
||||
Mono<FlashSaleActivity> create(FlashSaleActivity activity);
|
||||
|
||||
Mono<FlashSaleActivity> update(Long id, FlashSaleActivity activity);
|
||||
|
||||
Mono<Void> delete(Long id);
|
||||
|
||||
Mono<FlashSaleActivity> publish(Long id);
|
||||
|
||||
Mono<FlashSaleActivity> terminate(Long id);
|
||||
|
||||
Flux<FlashSaleItem> findItemsByActivityId(Long activityId);
|
||||
|
||||
Mono<FlashSaleItem> createItem(FlashSaleItem item);
|
||||
|
||||
Mono<FlashSaleItem> updateItem(Long id, FlashSaleItem item);
|
||||
|
||||
Mono<FlashSaleOrder> grab(GrabRequest request);
|
||||
|
||||
Mono<FlashSaleOrder> payOrder(Long orderId);
|
||||
|
||||
Mono<FlashSaleOrder> cancelOrder(Long orderId);
|
||||
|
||||
Flux<FlashSaleOrder> findOrdersByMemberId(Long memberId);
|
||||
|
||||
Mono<FlashSaleStatistics> getStatistics(Long id);
|
||||
|
||||
Mono<Long> processExpiredOrders();
|
||||
}
|
||||
+390
@@ -0,0 +1,390 @@
|
||||
package cn.novalon.gym.manage.coupon.flashsale.service.impl;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.common.dto.PageResponse;
|
||||
import cn.novalon.gym.manage.common.util.SnowflakeId;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleActivity;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleItem;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleOrder;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.FlashSaleStatistics;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.domain.GrabRequest;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.enums.FlashSaleActivityStatus;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.enums.FlashSaleOrderStatus;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleActivityRepository;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleItemRepository;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.repository.IFlashSaleOrderRepository;
|
||||
import cn.novalon.gym.manage.coupon.flashsale.service.IFlashSaleActivityService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Arrays;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class FlashSaleActivityService implements IFlashSaleActivityService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(FlashSaleActivityService.class);
|
||||
|
||||
private final IFlashSaleActivityRepository activityRepository;
|
||||
private final IFlashSaleItemRepository itemRepository;
|
||||
private final IFlashSaleOrderRepository orderRepository;
|
||||
|
||||
public FlashSaleActivityService(IFlashSaleActivityRepository activityRepository,
|
||||
IFlashSaleItemRepository itemRepository,
|
||||
IFlashSaleOrderRepository orderRepository) {
|
||||
this.activityRepository = activityRepository;
|
||||
this.itemRepository = itemRepository;
|
||||
this.orderRepository = orderRepository;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> findById(Long id) {
|
||||
return activityRepository.findById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findAll(boolean includeDeleted) {
|
||||
return activityRepository.findAll(includeDeleted);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleActivity> findByKeywordAndStatus(String keyword, String status) {
|
||||
return activityRepository.findByKeywordAndStatus(keyword, status);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<PageResponse<FlashSaleActivity>> findByPage(PageRequest pageRequest, String status) {
|
||||
int page = Math.max(pageRequest.getPage(), 0);
|
||||
int size = pageRequest.getSize() <= 0 || pageRequest.getSize() > 100 ? 10 : pageRequest.getSize();
|
||||
String keyword = pageRequest.getKeyword();
|
||||
|
||||
return activityRepository.findByKeywordAndStatus(keyword, status)
|
||||
.sort(Comparator.comparing(FlashSaleActivity::getCreatedAt,
|
||||
Comparator.nullsLast(Comparator.reverseOrder())))
|
||||
.collectList()
|
||||
.map(list -> {
|
||||
long total = list.size();
|
||||
int fromIndex = Math.min(page * size, list.size());
|
||||
int toIndex = Math.min(fromIndex + size, list.size());
|
||||
List<FlashSaleActivity> content = list.subList(fromIndex, toIndex);
|
||||
int totalPages = size == 0 ? 0 : (int) Math.ceil((double) total / size);
|
||||
return new PageResponse<>(content, totalPages, total, page, size);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> create(FlashSaleActivity activity) {
|
||||
return validateActivity(activity)
|
||||
.flatMap(validated -> {
|
||||
validated.generateId();
|
||||
validated.setStatus(FlashSaleActivityStatus.DRAFT.name());
|
||||
applyDefaults(validated);
|
||||
return activityRepository.save(validated);
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("秒杀活动创建成功 - id={}, name={}", a.getId(), a.getName()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> update(Long id, FlashSaleActivity activity) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可编辑"));
|
||||
}
|
||||
activity.setId(id);
|
||||
return validateActivity(activity)
|
||||
.flatMap(activityRepository::update);
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("秒杀活动更新成功 - id={}", id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> delete(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可删除"));
|
||||
}
|
||||
return activityRepository.deleteById(id);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> publish(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可发布"));
|
||||
}
|
||||
return validateActivity(existing)
|
||||
.flatMap(validated -> activityRepository.updateStatus(id, FlashSaleActivityStatus.ACTIVE.name())
|
||||
.then(activityRepository.findById(id)));
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("秒杀活动发布成功 - id={}", id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleActivity> terminate(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!FlashSaleActivityStatus.ACTIVE.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅进行中的秒杀活动可终止"));
|
||||
}
|
||||
return activityRepository.updateStatus(id, FlashSaleActivityStatus.TERMINATED.name())
|
||||
.then(activityRepository.findById(id));
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("秒杀活动已终止 - id={}", id));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleItem> findItemsByActivityId(Long activityId) {
|
||||
return itemRepository.findByActivityId(activityId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> createItem(FlashSaleItem item) {
|
||||
return validateItem(item)
|
||||
.flatMap(validated -> activityRepository.findById(validated.getActivityId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(activity -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(activity.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的秒杀活动可添加商品"));
|
||||
}
|
||||
validated.setId(SnowflakeId.nextId());
|
||||
validated.setSoldCount(0);
|
||||
if (validated.getPerUserLimit() == null) {
|
||||
validated.setPerUserLimit(activity.getPerUserLimit() != null ? activity.getPerUserLimit() : 1);
|
||||
}
|
||||
return itemRepository.save(validated);
|
||||
}));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleItem> updateItem(Long id, FlashSaleItem item) {
|
||||
return itemRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀商品不存在")))
|
||||
.flatMap(existing -> activityRepository.findById(existing.getActivityId())
|
||||
.flatMap(activity -> {
|
||||
if (!FlashSaleActivityStatus.DRAFT.name().equals(activity.getStatus())) {
|
||||
return Mono.error(new RuntimeException("活动已发布，不可修改商品"));
|
||||
}
|
||||
item.setId(id);
|
||||
return validateItem(item)
|
||||
.flatMap(itemRepository::update);
|
||||
}));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> grab(GrabRequest request) {
|
||||
if (request.getItemId() == null || request.getMemberId() == null) {
|
||||
return Mono.error(new RuntimeException("itemId和memberId不能为空"));
|
||||
}
|
||||
int quantity = request.getQuantity() != null && request.getQuantity() > 0 ? request.getQuantity() : 1;
|
||||
|
||||
return itemRepository.findById(request.getItemId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀商品不存在")))
|
||||
.flatMap(item -> activityRepository.findById(item.getActivityId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(activity -> validateActivityForGrab(activity)
|
||||
.then(checkUserLimit(item, activity, request.getMemberId(), quantity))
|
||||
.then(itemRepository.deductStock(item.getId(), quantity))
|
||||
.flatMap(success -> {
|
||||
if (!success) {
|
||||
return Mono.error(new RuntimeException("库存不足"));
|
||||
}
|
||||
return createOrder(item, activity, request.getMemberId(), quantity)
|
||||
.onErrorResume(e -> itemRepository.restoreStock(item.getId(), quantity)
|
||||
.then(Mono.error(e)));
|
||||
})));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> payOrder(Long orderId) {
|
||||
return orderRepository.findById(orderId)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀订单不存在")))
|
||||
.flatMap(order -> {
|
||||
if (!FlashSaleOrderStatus.PENDING.name().equals(order.getStatus())) {
|
||||
return Mono.error(new RuntimeException("订单状态不允许支付"));
|
||||
}
|
||||
if (order.getExpireAt() != null && order.getExpireAt().isBefore(LocalDateTime.now())) {
|
||||
return Mono.error(new RuntimeException("订单已过期"));
|
||||
}
|
||||
return orderRepository.markPaid(orderId, FlashSaleOrderStatus.PAID.name())
|
||||
.then(itemRepository.incrementSoldCount(order.getItemId(), order.getQuantity()))
|
||||
.then(orderRepository.findById(orderId));
|
||||
})
|
||||
.doOnSuccess(o -> logger.info("秒杀订单支付成功 - orderId={}", orderId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleOrder> cancelOrder(Long orderId) {
|
||||
return orderRepository.findById(orderId)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀订单不存在")))
|
||||
.flatMap(order -> {
|
||||
if (!FlashSaleOrderStatus.PENDING.name().equals(order.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅待支付订单可取消"));
|
||||
}
|
||||
return orderRepository.updateStatus(orderId, FlashSaleOrderStatus.CANCELLED.name())
|
||||
.then(itemRepository.restoreStock(order.getItemId(), order.getQuantity()))
|
||||
.then(orderRepository.findById(orderId));
|
||||
})
|
||||
.doOnSuccess(o -> logger.info("秒杀订单已取消 - orderId={}", orderId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<FlashSaleOrder> findOrdersByMemberId(Long memberId) {
|
||||
return orderRepository.findByMemberId(memberId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<FlashSaleStatistics> getStatistics(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("秒杀活动不存在")))
|
||||
.flatMap(activity -> orderRepository.findByActivityId(id)
|
||||
.collectList()
|
||||
.map(orders -> {
|
||||
FlashSaleStatistics stats = new FlashSaleStatistics();
|
||||
stats.setActivityId(id);
|
||||
stats.setTotalOrders(orders.size());
|
||||
stats.setPendingOrders(countByStatus(orders, FlashSaleOrderStatus.PENDING));
|
||||
stats.setPaidOrders(countByStatus(orders, FlashSaleOrderStatus.PAID));
|
||||
stats.setCancelledOrders(countByStatus(orders, FlashSaleOrderStatus.CANCELLED));
|
||||
stats.setExpiredOrders(countByStatus(orders, FlashSaleOrderStatus.EXPIRED));
|
||||
|
||||
long soldQty = orders.stream()
|
||||
.filter(o -> FlashSaleOrderStatus.PAID.name().equals(o.getStatus()))
|
||||
.mapToLong(o -> o.getQuantity() != null ? o.getQuantity() : 0)
|
||||
.sum();
|
||||
stats.setTotalSoldQuantity(soldQty);
|
||||
|
||||
BigDecimal revenue = orders.stream()
|
||||
.filter(o -> FlashSaleOrderStatus.PAID.name().equals(o.getStatus()))
|
||||
.map(o -> o.getPayAmount() != null ? o.getPayAmount() : BigDecimal.ZERO)
|
||||
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
stats.setTotalRevenue(revenue);
|
||||
|
||||
return stats;
|
||||
}));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Long> processExpiredOrders() {
|
||||
return orderRepository.findExpiredPendingOrders()
|
||||
.flatMap(order -> orderRepository.updateStatus(order.getId(), FlashSaleOrderStatus.EXPIRED.name())
|
||||
.then(itemRepository.restoreStock(order.getItemId(), order.getQuantity()))
|
||||
.thenReturn(1L))
|
||||
.reduce(0L, Long::sum)
|
||||
.doOnSuccess(count -> {
|
||||
if (count > 0) {
|
||||
logger.info("已处理 {} 个过期秒杀订单", count);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<FlashSaleOrder> createOrder(FlashSaleItem item, FlashSaleActivity activity,
|
||||
Long memberId, int quantity) {
|
||||
int timeoutMinutes = activity.getPayTimeoutMinutes() != null ? activity.getPayTimeoutMinutes() : 5;
|
||||
BigDecimal payAmount = item.getSeckillPrice().multiply(BigDecimal.valueOf(quantity));
|
||||
|
||||
FlashSaleOrder order = new FlashSaleOrder();
|
||||
order.setId(SnowflakeId.nextId());
|
||||
order.setActivityId(activity.getId());
|
||||
order.setItemId(item.getId());
|
||||
order.setMemberId(memberId);
|
||||
order.setQuantity(quantity);
|
||||
order.setPayAmount(payAmount);
|
||||
order.setStatus(FlashSaleOrderStatus.PENDING.name());
|
||||
order.setExpireAt(LocalDateTime.now().plusMinutes(timeoutMinutes));
|
||||
|
||||
return orderRepository.save(order);
|
||||
}
|
||||
|
||||
private Mono<Void> checkUserLimit(FlashSaleItem item, FlashSaleActivity activity,
|
||||
Long memberId, int quantity) {
|
||||
int itemLimit = item.getPerUserLimit() != null ? item.getPerUserLimit() : 1;
|
||||
int activityLimit = activity.getPerUserLimit() != null ? activity.getPerUserLimit() : 1;
|
||||
int effectiveLimit = Math.min(itemLimit, activityLimit);
|
||||
|
||||
return orderRepository.countByItemIdAndMemberIdAndStatusIn(
|
||||
item.getId(), memberId,
|
||||
Arrays.asList(FlashSaleOrderStatus.PENDING.name(), FlashSaleOrderStatus.PAID.name()))
|
||||
.flatMap(count -> {
|
||||
if (count + quantity > effectiveLimit) {
|
||||
return Mono.error(new RuntimeException("超出每人限购数量"));
|
||||
}
|
||||
return Mono.empty();
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<Void> validateActivityForGrab(FlashSaleActivity activity) {
|
||||
if (!FlashSaleActivityStatus.ACTIVE.name().equals(activity.getStatus())) {
|
||||
return Mono.error(new RuntimeException("秒杀活动未开始或已结束"));
|
||||
}
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
if (activity.getStartTime() != null && now.isBefore(activity.getStartTime())) {
|
||||
return Mono.error(new RuntimeException("秒杀活动尚未开始"));
|
||||
}
|
||||
if (activity.getEndTime() != null && now.isAfter(activity.getEndTime())) {
|
||||
return Mono.error(new RuntimeException("秒杀活动已结束"));
|
||||
}
|
||||
return Mono.empty();
|
||||
}
|
||||
|
||||
private Mono<FlashSaleActivity> validateActivity(FlashSaleActivity activity) {
|
||||
if (activity.getName() == null || activity.getName().isBlank()) {
|
||||
return Mono.error(new RuntimeException("活动名称不能为空"));
|
||||
}
|
||||
if (activity.getStartTime() == null || activity.getEndTime() == null) {
|
||||
return Mono.error(new RuntimeException("活动开始和结束时间不能为空"));
|
||||
}
|
||||
if (activity.getEndTime().isBefore(activity.getStartTime())) {
|
||||
return Mono.error(new RuntimeException("结束时间不能早于开始时间"));
|
||||
}
|
||||
return Mono.just(activity);
|
||||
}
|
||||
|
||||
private Mono<FlashSaleItem> validateItem(FlashSaleItem item) {
|
||||
if (item.getActivityId() == null) {
|
||||
return Mono.error(new RuntimeException("活动ID不能为空"));
|
||||
}
|
||||
if (item.getProductType() == null || item.getProductName() == null) {
|
||||
return Mono.error(new RuntimeException("商品类型和名称不能为空"));
|
||||
}
|
||||
if (item.getProductId() == null) {
|
||||
return Mono.error(new RuntimeException("商品ID不能为空"));
|
||||
}
|
||||
if (item.getOriginalPrice() == null || item.getSeckillPrice() == null) {
|
||||
return Mono.error(new RuntimeException("原价和秒杀价不能为空"));
|
||||
}
|
||||
if (item.getSeckillPrice().compareTo(item.getOriginalPrice()) >= 0) {
|
||||
return Mono.error(new RuntimeException("秒杀价必须低于原价"));
|
||||
}
|
||||
if (item.getStock() == null || item.getStock() < 0) {
|
||||
return Mono.error(new RuntimeException("库存不能为空且不能为负数"));
|
||||
}
|
||||
return Mono.just(item);
|
||||
}
|
||||
|
||||
private void applyDefaults(FlashSaleActivity activity) {
|
||||
if (activity.getPayTimeoutMinutes() == null) {
|
||||
activity.setPayTimeoutMinutes(5);
|
||||
}
|
||||
if (activity.getPerUserLimit() == null) {
|
||||
activity.setPerUserLimit(1);
|
||||
}
|
||||
}
|
||||
|
||||
private long countByStatus(List<FlashSaleOrder> orders, FlashSaleOrderStatus status) {
|
||||
return orders.stream().filter(o -> status.name().equals(o.getStatus())).count();
|
||||
}
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.converter;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyActivityEntity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyParticipantEntity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyTeamEntity;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class GroupBuyConverter {
|
||||
|
||||
public GroupBuyActivity toActivity(GroupBuyActivityEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyActivity domain = new GroupBuyActivity();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public GroupBuyActivityEntity toActivityEntity(GroupBuyActivity domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyActivityEntity entity = new GroupBuyActivityEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public GroupBuyTeam toTeam(GroupBuyTeamEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyTeam domain = new GroupBuyTeam();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public GroupBuyTeamEntity toTeamEntity(GroupBuyTeam domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyTeamEntity entity = new GroupBuyTeamEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
public GroupBuyParticipant toParticipant(GroupBuyParticipantEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyParticipant domain = new GroupBuyParticipant();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
return domain;
|
||||
}
|
||||
|
||||
public GroupBuyParticipantEntity toParticipantEntity(GroupBuyParticipant domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
GroupBuyParticipantEntity entity = new GroupBuyParticipantEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyActivityEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface GroupBuyActivityDao extends R2dbcRepository<GroupBuyActivityEntity, Long> {
|
||||
|
||||
Mono<GroupBuyActivityEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<GroupBuyActivityEntity> findAllByDeletedAtIsNull();
|
||||
|
||||
Flux<GroupBuyActivityEntity> findByNameContainingAndDeletedAtIsNull(String name);
|
||||
|
||||
Flux<GroupBuyActivityEntity> findByStatusAndDeletedAtIsNull(String status);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_activity SET deleted_at = :deletedAt WHERE id = :id")
|
||||
Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_activity SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_activity SET sold_count = sold_count + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementSoldCount(Long id, int count, LocalDateTime updatedAt);
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyParticipantEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface GroupBuyParticipantDao extends R2dbcRepository<GroupBuyParticipantEntity, Long> {
|
||||
|
||||
Flux<GroupBuyParticipantEntity> findByTeamIdAndDeletedAtIsNull(Long teamId);
|
||||
|
||||
Flux<GroupBuyParticipantEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
@Query("""
|
||||
SELECT p.* FROM group_buy_participant p
|
||||
INNER JOIN group_buy_team t ON p.team_id = t.id
|
||||
WHERE p.activity_id = :activityId AND p.member_id = :memberId
|
||||
AND p.status = :participantStatus AND t.status = :teamStatus
|
||||
AND p.deleted_at IS NULL AND t.deleted_at IS NULL
|
||||
""")
|
||||
Flux<GroupBuyParticipantEntity> findActiveParticipantInFormingTeam(
|
||||
Long activityId, Long memberId, String participantStatus, String teamStatus);
|
||||
|
||||
Mono<Long> countByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_participant SET status = :status, updated_at = :updatedAt WHERE team_id = :teamId")
|
||||
Mono<Integer> updateStatusByTeamId(Long teamId, String status, LocalDateTime updatedAt);
|
||||
}
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyTeamEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface GroupBuyTeamDao extends R2dbcRepository<GroupBuyTeamEntity, Long> {
|
||||
|
||||
Mono<GroupBuyTeamEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<GroupBuyTeamEntity> findByActivityIdAndDeletedAtIsNull(Long activityId);
|
||||
|
||||
Flux<GroupBuyTeamEntity> findByActivityIdAndStatusAndDeletedAtIsNull(Long activityId, String status);
|
||||
|
||||
Flux<GroupBuyTeamEntity> findByStatusAndDeletedAtIsNull(String status);
|
||||
|
||||
@Query("SELECT * FROM group_buy_team WHERE status = :status AND expire_at < :now AND deleted_at IS NULL")
|
||||
Flux<GroupBuyTeamEntity> findExpiredFormingTeams(String status, LocalDateTime now);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_team SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_team SET current_members = current_members + :count, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> incrementCurrentMembers(Long id, int count, LocalDateTime updatedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE group_buy_team SET status = :status, success_at = :successAt, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> markSuccess(Long id, String status, LocalDateTime successAt, LocalDateTime updatedAt);
|
||||
}
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "创建拼团团队请求")
|
||||
public class CreateTeamRequest {
|
||||
|
||||
private Long activityId;
|
||||
private Long memberId;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
}
|
||||
+138
@@ -0,0 +1,138 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "拼团活动")
|
||||
public class GroupBuyActivity extends BaseDomain {
|
||||
|
||||
private String name;
|
||||
private String description;
|
||||
private String productType;
|
||||
private Long productId;
|
||||
private String productName;
|
||||
private BigDecimal originalPrice;
|
||||
private BigDecimal groupPrice;
|
||||
private Integer requiredMembers;
|
||||
private Integer validHours;
|
||||
private LocalDateTime startTime;
|
||||
private LocalDateTime endTime;
|
||||
private Integer stock;
|
||||
private Integer soldCount;
|
||||
private String status;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getProductType() {
|
||||
return productType;
|
||||
}
|
||||
|
||||
public void setProductType(String productType) {
|
||||
this.productType = productType;
|
||||
}
|
||||
|
||||
public Long getProductId() {
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductId(Long productId) {
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public BigDecimal getOriginalPrice() {
|
||||
return originalPrice;
|
||||
}
|
||||
|
||||
public void setOriginalPrice(BigDecimal originalPrice) {
|
||||
this.originalPrice = originalPrice;
|
||||
}
|
||||
|
||||
public BigDecimal getGroupPrice() {
|
||||
return groupPrice;
|
||||
}
|
||||
|
||||
public void setGroupPrice(BigDecimal groupPrice) {
|
||||
this.groupPrice = groupPrice;
|
||||
}
|
||||
|
||||
public Integer getRequiredMembers() {
|
||||
return requiredMembers;
|
||||
}
|
||||
|
||||
public void setRequiredMembers(Integer requiredMembers) {
|
||||
this.requiredMembers = requiredMembers;
|
||||
}
|
||||
|
||||
public Integer getValidHours() {
|
||||
return validHours;
|
||||
}
|
||||
|
||||
public void setValidHours(Integer validHours) {
|
||||
this.validHours = validHours;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getStock() {
|
||||
return stock;
|
||||
}
|
||||
|
||||
public void setStock(Integer stock) {
|
||||
this.stock = stock;
|
||||
}
|
||||
|
||||
public Integer getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(Integer soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "拼团参与人")
|
||||
public class GroupBuyParticipant extends BaseDomain {
|
||||
|
||||
private Long teamId;
|
||||
private Long activityId;
|
||||
private Long memberId;
|
||||
private Boolean isLeader;
|
||||
private String status;
|
||||
private LocalDateTime joinAt;
|
||||
|
||||
public Long getTeamId() {
|
||||
return teamId;
|
||||
}
|
||||
|
||||
public void setTeamId(Long teamId) {
|
||||
this.teamId = teamId;
|
||||
}
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Boolean getIsLeader() {
|
||||
return isLeader;
|
||||
}
|
||||
|
||||
public void setIsLeader(Boolean isLeader) {
|
||||
this.isLeader = isLeader;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getJoinAt() {
|
||||
return joinAt;
|
||||
}
|
||||
|
||||
public void setJoinAt(LocalDateTime joinAt) {
|
||||
this.joinAt = joinAt;
|
||||
}
|
||||
}
|
||||
+91
@@ -0,0 +1,91 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Schema(description = "拼团统计数据")
|
||||
public class GroupBuyStatistics {
|
||||
|
||||
private Long activityId;
|
||||
private long totalTeams;
|
||||
private long formingTeams;
|
||||
private long successTeams;
|
||||
private long failedTeams;
|
||||
private long cancelledTeams;
|
||||
private long totalParticipants;
|
||||
private long soldCount;
|
||||
private BigDecimal totalRevenue;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public long getTotalTeams() {
|
||||
return totalTeams;
|
||||
}
|
||||
|
||||
public void setTotalTeams(long totalTeams) {
|
||||
this.totalTeams = totalTeams;
|
||||
}
|
||||
|
||||
public long getFormingTeams() {
|
||||
return formingTeams;
|
||||
}
|
||||
|
||||
public void setFormingTeams(long formingTeams) {
|
||||
this.formingTeams = formingTeams;
|
||||
}
|
||||
|
||||
public long getSuccessTeams() {
|
||||
return successTeams;
|
||||
}
|
||||
|
||||
public void setSuccessTeams(long successTeams) {
|
||||
this.successTeams = successTeams;
|
||||
}
|
||||
|
||||
public long getFailedTeams() {
|
||||
return failedTeams;
|
||||
}
|
||||
|
||||
public void setFailedTeams(long failedTeams) {
|
||||
this.failedTeams = failedTeams;
|
||||
}
|
||||
|
||||
public long getCancelledTeams() {
|
||||
return cancelledTeams;
|
||||
}
|
||||
|
||||
public void setCancelledTeams(long cancelledTeams) {
|
||||
this.cancelledTeams = cancelledTeams;
|
||||
}
|
||||
|
||||
public long getTotalParticipants() {
|
||||
return totalParticipants;
|
||||
}
|
||||
|
||||
public void setTotalParticipants(long totalParticipants) {
|
||||
this.totalParticipants = totalParticipants;
|
||||
}
|
||||
|
||||
public long getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(long soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public BigDecimal getTotalRevenue() {
|
||||
return totalRevenue;
|
||||
}
|
||||
|
||||
public void setTotalRevenue(BigDecimal totalRevenue) {
|
||||
this.totalRevenue = totalRevenue;
|
||||
}
|
||||
}
|
||||
+74
@@ -0,0 +1,74 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import cn.novalon.gym.manage.sys.core.domain.BaseDomain;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "拼团团队")
|
||||
public class GroupBuyTeam extends BaseDomain {
|
||||
|
||||
private Long activityId;
|
||||
private Long leaderMemberId;
|
||||
private Integer requiredMembers;
|
||||
private Integer currentMembers;
|
||||
private String status;
|
||||
private LocalDateTime expireAt;
|
||||
private LocalDateTime successAt;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getLeaderMemberId() {
|
||||
return leaderMemberId;
|
||||
}
|
||||
|
||||
public void setLeaderMemberId(Long leaderMemberId) {
|
||||
this.leaderMemberId = leaderMemberId;
|
||||
}
|
||||
|
||||
public Integer getRequiredMembers() {
|
||||
return requiredMembers;
|
||||
}
|
||||
|
||||
public void setRequiredMembers(Integer requiredMembers) {
|
||||
this.requiredMembers = requiredMembers;
|
||||
}
|
||||
|
||||
public Integer getCurrentMembers() {
|
||||
return currentMembers;
|
||||
}
|
||||
|
||||
public void setCurrentMembers(Integer currentMembers) {
|
||||
this.currentMembers = currentMembers;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getSuccessAt() {
|
||||
return successAt;
|
||||
}
|
||||
|
||||
public void setSuccessAt(LocalDateTime successAt) {
|
||||
this.successAt = successAt;
|
||||
}
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.domain;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
@Schema(description = "加入拼团团队请求")
|
||||
public class JoinTeamRequest {
|
||||
|
||||
private Long memberId;
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
}
|
||||
+166
@@ -0,0 +1,166 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("group_buy_activity")
|
||||
public class GroupBuyActivityEntity extends BaseEntity {
|
||||
|
||||
@Column("name")
|
||||
private String name;
|
||||
|
||||
@Column("description")
|
||||
private String description;
|
||||
|
||||
@Column("product_type")
|
||||
private String productType;
|
||||
|
||||
@Column("product_id")
|
||||
private Long productId;
|
||||
|
||||
@Column("product_name")
|
||||
private String productName;
|
||||
|
||||
@Column("original_price")
|
||||
private BigDecimal originalPrice;
|
||||
|
||||
@Column("group_price")
|
||||
private BigDecimal groupPrice;
|
||||
|
||||
@Column("required_members")
|
||||
private Integer requiredMembers;
|
||||
|
||||
@Column("valid_hours")
|
||||
private Integer validHours;
|
||||
|
||||
@Column("start_time")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Column("end_time")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Column("stock")
|
||||
private Integer stock;
|
||||
|
||||
@Column("sold_count")
|
||||
private Integer soldCount;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
}
|
||||
|
||||
public void setDescription(String description) {
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
public String getProductType() {
|
||||
return productType;
|
||||
}
|
||||
|
||||
public void setProductType(String productType) {
|
||||
this.productType = productType;
|
||||
}
|
||||
|
||||
public Long getProductId() {
|
||||
return productId;
|
||||
}
|
||||
|
||||
public void setProductId(Long productId) {
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public BigDecimal getOriginalPrice() {
|
||||
return originalPrice;
|
||||
}
|
||||
|
||||
public void setOriginalPrice(BigDecimal originalPrice) {
|
||||
this.originalPrice = originalPrice;
|
||||
}
|
||||
|
||||
public BigDecimal getGroupPrice() {
|
||||
return groupPrice;
|
||||
}
|
||||
|
||||
public void setGroupPrice(BigDecimal groupPrice) {
|
||||
this.groupPrice = groupPrice;
|
||||
}
|
||||
|
||||
public Integer getRequiredMembers() {
|
||||
return requiredMembers;
|
||||
}
|
||||
|
||||
public void setRequiredMembers(Integer requiredMembers) {
|
||||
this.requiredMembers = requiredMembers;
|
||||
}
|
||||
|
||||
public Integer getValidHours() {
|
||||
return validHours;
|
||||
}
|
||||
|
||||
public void setValidHours(Integer validHours) {
|
||||
this.validHours = validHours;
|
||||
}
|
||||
|
||||
public LocalDateTime getStartTime() {
|
||||
return startTime;
|
||||
}
|
||||
|
||||
public void setStartTime(LocalDateTime startTime) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public LocalDateTime getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(LocalDateTime endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Integer getStock() {
|
||||
return stock;
|
||||
}
|
||||
|
||||
public void setStock(Integer stock) {
|
||||
this.stock = stock;
|
||||
}
|
||||
|
||||
public Integer getSoldCount() {
|
||||
return soldCount;
|
||||
}
|
||||
|
||||
public void setSoldCount(Integer soldCount) {
|
||||
this.soldCount = soldCount;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
}
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("group_buy_participant")
|
||||
public class GroupBuyParticipantEntity extends BaseEntity {
|
||||
|
||||
@Column("team_id")
|
||||
private Long teamId;
|
||||
|
||||
@Column("activity_id")
|
||||
private Long activityId;
|
||||
|
||||
@Column("member_id")
|
||||
private Long memberId;
|
||||
|
||||
@Column("is_leader")
|
||||
private Boolean isLeader;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("join_at")
|
||||
private LocalDateTime joinAt;
|
||||
|
||||
public Long getTeamId() {
|
||||
return teamId;
|
||||
}
|
||||
|
||||
public void setTeamId(Long teamId) {
|
||||
this.teamId = teamId;
|
||||
}
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getMemberId() {
|
||||
return memberId;
|
||||
}
|
||||
|
||||
public void setMemberId(Long memberId) {
|
||||
this.memberId = memberId;
|
||||
}
|
||||
|
||||
public Boolean getIsLeader() {
|
||||
return isLeader;
|
||||
}
|
||||
|
||||
public void setIsLeader(Boolean isLeader) {
|
||||
this.isLeader = isLeader;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getJoinAt() {
|
||||
return joinAt;
|
||||
}
|
||||
|
||||
public void setJoinAt(LocalDateTime joinAt) {
|
||||
this.joinAt = joinAt;
|
||||
}
|
||||
}
|
||||
+88
@@ -0,0 +1,88 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.entity;
|
||||
|
||||
import cn.novalon.gym.manage.db.entity.BaseEntity;
|
||||
import org.springframework.data.relational.core.mapping.Column;
|
||||
import org.springframework.data.relational.core.mapping.Table;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Table("group_buy_team")
|
||||
public class GroupBuyTeamEntity extends BaseEntity {
|
||||
|
||||
@Column("activity_id")
|
||||
private Long activityId;
|
||||
|
||||
@Column("leader_member_id")
|
||||
private Long leaderMemberId;
|
||||
|
||||
@Column("required_members")
|
||||
private Integer requiredMembers;
|
||||
|
||||
@Column("current_members")
|
||||
private Integer currentMembers;
|
||||
|
||||
@Column("status")
|
||||
private String status;
|
||||
|
||||
@Column("expire_at")
|
||||
private LocalDateTime expireAt;
|
||||
|
||||
@Column("success_at")
|
||||
private LocalDateTime successAt;
|
||||
|
||||
public Long getActivityId() {
|
||||
return activityId;
|
||||
}
|
||||
|
||||
public void setActivityId(Long activityId) {
|
||||
this.activityId = activityId;
|
||||
}
|
||||
|
||||
public Long getLeaderMemberId() {
|
||||
return leaderMemberId;
|
||||
}
|
||||
|
||||
public void setLeaderMemberId(Long leaderMemberId) {
|
||||
this.leaderMemberId = leaderMemberId;
|
||||
}
|
||||
|
||||
public Integer getRequiredMembers() {
|
||||
return requiredMembers;
|
||||
}
|
||||
|
||||
public void setRequiredMembers(Integer requiredMembers) {
|
||||
this.requiredMembers = requiredMembers;
|
||||
}
|
||||
|
||||
public Integer getCurrentMembers() {
|
||||
return currentMembers;
|
||||
}
|
||||
|
||||
public void setCurrentMembers(Integer currentMembers) {
|
||||
this.currentMembers = currentMembers;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public LocalDateTime getExpireAt() {
|
||||
return expireAt;
|
||||
}
|
||||
|
||||
public void setExpireAt(LocalDateTime expireAt) {
|
||||
this.expireAt = expireAt;
|
||||
}
|
||||
|
||||
public LocalDateTime getSuccessAt() {
|
||||
return successAt;
|
||||
}
|
||||
|
||||
public void setSuccessAt(LocalDateTime successAt) {
|
||||
this.successAt = successAt;
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.enums;
|
||||
|
||||
/**
|
||||
* 拼团活动状态
|
||||
*/
|
||||
public enum GroupBuyActivityStatus {
|
||||
DRAFT,
|
||||
ACTIVE,
|
||||
TERMINATED,
|
||||
EXPIRED
|
||||
}
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.enums;
|
||||
|
||||
/**
|
||||
* 拼团参与人状态
|
||||
*/
|
||||
public enum GroupBuyParticipantStatus {
|
||||
JOINED,
|
||||
CANCELLED
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.enums;
|
||||
|
||||
/**
|
||||
* 拼团团队状态
|
||||
*/
|
||||
public enum GroupBuyTeamStatus {
|
||||
FORMING,
|
||||
SUCCESS,
|
||||
FAILED,
|
||||
CANCELLED
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.enums;
|
||||
|
||||
/**
|
||||
* 商品类型
|
||||
*/
|
||||
public enum ProductType {
|
||||
COURSE,
|
||||
MEMBER_CARD,
|
||||
PRODUCT
|
||||
}
|
||||
+220
@@ -0,0 +1,220 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.handler;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.CreateTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.JoinTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyActivityService;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyTeamService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.function.server.ServerRequest;
|
||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
@Tag(name = "拼团管理", description = "拼团相关操作")
|
||||
public class GroupBuyHandler {
|
||||
|
||||
private final IGroupBuyActivityService activityService;
|
||||
private final IGroupBuyTeamService teamService;
|
||||
|
||||
public GroupBuyHandler(IGroupBuyActivityService activityService, IGroupBuyTeamService teamService) {
|
||||
this.activityService = activityService;
|
||||
this.teamService = teamService;
|
||||
}
|
||||
|
||||
@Operation(summary = "获取所有拼团活动")
|
||||
public Mono<ServerResponse> getAllActivities(ServerRequest request) {
|
||||
boolean includeDeleted = Boolean.parseBoolean(request.queryParam("includeDeleted").orElse("false"));
|
||||
return ServerResponse.ok()
|
||||
.body(activityService.findAll(includeDeleted), GroupBuyActivity.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "分页获取拼团活动")
|
||||
public Mono<ServerResponse> getActivitiesByPage(ServerRequest request) {
|
||||
return request.bodyToMono(PageRequest.class)
|
||||
.flatMap(pageRequest -> {
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
normalizePageRequest(pageRequest);
|
||||
return activityService.findByPage(pageRequest, status)
|
||||
.flatMap(response -> ServerResponse.ok().bodyValue(response));
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "搜索拼团活动")
|
||||
public Mono<ServerResponse> searchActivities(ServerRequest request) {
|
||||
String keyword = request.queryParam("keyword").orElse("");
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
return ServerResponse.ok()
|
||||
.body(activityService.findByKeywordAndStatus(keyword, status), GroupBuyActivity.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "根据ID获取拼团活动")
|
||||
public Mono<ServerResponse> getActivityById(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.findById(id)
|
||||
.flatMap(activity -> ServerResponse.ok().bodyValue(activity))
|
||||
.switchIfEmpty(ServerResponse.notFound().build());
|
||||
}
|
||||
|
||||
@Operation(summary = "创建拼团活动")
|
||||
public Mono<ServerResponse> createActivity(ServerRequest request) {
|
||||
return request.bodyToMono(GroupBuyActivity.class)
|
||||
.flatMap(activity -> {
|
||||
if (activity.getName() == null || activity.getName().isEmpty()) {
|
||||
return badRequest("活动名称不能为空");
|
||||
}
|
||||
return activityService.create(activity)
|
||||
.flatMap(created -> successResponse("拼团活动创建成功", created))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "更新拼团活动")
|
||||
public Mono<ServerResponse> updateActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return request.bodyToMono(GroupBuyActivity.class)
|
||||
.flatMap(activity -> activityService.update(id, activity)
|
||||
.flatMap(updated -> successResponse("拼团活动更新成功", updated))
|
||||
.onErrorResume(this::errorResponse));
|
||||
}
|
||||
|
||||
@Operation(summary = "删除拼团活动")
|
||||
public Mono<ServerResponse> deleteActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.delete(id)
|
||||
.then(Mono.defer(() -> successResponse("拼团活动删除成功", null)))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "发布拼团活动")
|
||||
public Mono<ServerResponse> publishActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.publish(id)
|
||||
.flatMap(activity -> successResponse("拼团活动发布成功", activity))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "终止拼团活动")
|
||||
public Mono<ServerResponse> terminateActivity(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.terminate(id)
|
||||
.flatMap(activity -> successResponse("拼团活动已终止", activity))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取拼团统计")
|
||||
public Mono<ServerResponse> getStatistics(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return activityService.getStatistics(id)
|
||||
.flatMap(stats -> ServerResponse.ok().bodyValue(stats))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "创建拼团团队")
|
||||
public Mono<ServerResponse> createTeam(ServerRequest request) {
|
||||
return request.bodyToMono(CreateTeamRequest.class)
|
||||
.flatMap(body -> {
|
||||
if (body.getActivityId() == null || body.getMemberId() == null) {
|
||||
return badRequest("activityId和memberId不能为空");
|
||||
}
|
||||
return teamService.createTeam(body)
|
||||
.flatMap(team -> successResponse("拼团团队创建成功", team))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "加入拼团团队")
|
||||
public Mono<ServerResponse> joinTeam(ServerRequest request) {
|
||||
Long teamId = Long.valueOf(request.pathVariable("teamId"));
|
||||
return request.bodyToMono(JoinTeamRequest.class)
|
||||
.flatMap(body -> {
|
||||
if (body.getMemberId() == null) {
|
||||
return badRequest("memberId不能为空");
|
||||
}
|
||||
return teamService.joinTeam(teamId, body)
|
||||
.flatMap(team -> successResponse("加入拼团成功", team))
|
||||
.onErrorResume(this::errorResponse);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "取消拼团团队")
|
||||
public Mono<ServerResponse> cancelTeam(ServerRequest request) {
|
||||
Long teamId = Long.valueOf(request.pathVariable("teamId"));
|
||||
return teamService.cancelTeam(teamId)
|
||||
.flatMap(team -> successResponse("拼团团队已取消", team))
|
||||
.onErrorResume(this::errorResponse);
|
||||
}
|
||||
|
||||
@Operation(summary = "查询拼团团队列表")
|
||||
public Mono<ServerResponse> getTeams(ServerRequest request) {
|
||||
String activityIdStr = request.queryParam("activityId").orElse(null);
|
||||
if (activityIdStr == null) {
|
||||
return badRequest("activityId不能为空");
|
||||
}
|
||||
Long activityId = Long.valueOf(activityIdStr);
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
return ServerResponse.ok()
|
||||
.body(teamService.findTeams(activityId, status), GroupBuyTeam.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "获取拼团团队详情")
|
||||
public Mono<ServerResponse> getTeamById(ServerRequest request) {
|
||||
Long teamId = Long.valueOf(request.pathVariable("teamId"));
|
||||
return teamService.findTeamById(teamId)
|
||||
.flatMap(team -> teamService.findParticipantsByTeamId(teamId)
|
||||
.collectList()
|
||||
.flatMap(participants -> {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
result.put("team", team);
|
||||
result.put("participants", participants);
|
||||
return ServerResponse.ok().bodyValue(result);
|
||||
}))
|
||||
.switchIfEmpty(ServerResponse.notFound().build());
|
||||
}
|
||||
|
||||
private void normalizePageRequest(PageRequest pageRequest) {
|
||||
if (pageRequest.getPage() < 0) {
|
||||
pageRequest.setPage(0);
|
||||
}
|
||||
if (pageRequest.getSize() <= 0 || pageRequest.getSize() > 100) {
|
||||
pageRequest.setSize(10);
|
||||
}
|
||||
if (pageRequest.getSort() == null || pageRequest.getSort().isEmpty()) {
|
||||
pageRequest.setSort("id");
|
||||
}
|
||||
if (pageRequest.getOrder() == null || pageRequest.getOrder().isEmpty()) {
|
||||
pageRequest.setOrder("desc");
|
||||
}
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> successResponse(String message, Object data) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", message);
|
||||
if (data != null) {
|
||||
response.put("data", data);
|
||||
}
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> badRequest(String message) {
|
||||
Map<String, Object> error = new HashMap<>();
|
||||
error.put("success", false);
|
||||
error.put("message", message);
|
||||
return ServerResponse.badRequest().bodyValue(error);
|
||||
}
|
||||
|
||||
private Mono<ServerResponse> errorResponse(Throwable error) {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
}
|
||||
}
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyActivityRepository {
|
||||
|
||||
Mono<GroupBuyActivity> findById(Long id);
|
||||
|
||||
Flux<GroupBuyActivity> findAll(boolean includeDeleted);
|
||||
|
||||
Flux<GroupBuyActivity> findByKeyword(String keyword);
|
||||
|
||||
Flux<GroupBuyActivity> findByStatus(String status);
|
||||
|
||||
Flux<GroupBuyActivity> findByKeywordAndStatus(String keyword, String status);
|
||||
|
||||
Mono<GroupBuyActivity> save(GroupBuyActivity activity);
|
||||
|
||||
Mono<GroupBuyActivity> update(GroupBuyActivity activity);
|
||||
|
||||
Mono<Void> deleteById(Long id);
|
||||
|
||||
Mono<Void> updateStatus(Long id, String status);
|
||||
|
||||
Mono<Void> incrementSoldCount(Long id, int count);
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyParticipantRepository {
|
||||
|
||||
Flux<GroupBuyParticipant> findByTeamId(Long teamId);
|
||||
|
||||
Flux<GroupBuyParticipant> findByActivityId(Long activityId);
|
||||
|
||||
Mono<Boolean> existsInFormingTeam(Long activityId, Long memberId);
|
||||
|
||||
Mono<Long> countByActivityId(Long activityId);
|
||||
|
||||
Mono<GroupBuyParticipant> save(GroupBuyParticipant participant);
|
||||
|
||||
Mono<Void> updateStatusByTeamId(Long teamId, String status);
|
||||
}
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyTeamRepository {
|
||||
|
||||
Mono<GroupBuyTeam> findById(Long id);
|
||||
|
||||
Flux<GroupBuyTeam> findByActivityId(Long activityId);
|
||||
|
||||
Flux<GroupBuyTeam> findByActivityIdAndStatus(Long activityId, String status);
|
||||
|
||||
Flux<GroupBuyTeam> findExpiredFormingTeams();
|
||||
|
||||
Mono<GroupBuyTeam> save(GroupBuyTeam team);
|
||||
|
||||
Mono<Void> updateStatus(Long id, String status);
|
||||
|
||||
Mono<Void> incrementCurrentMembers(Long id, int count);
|
||||
|
||||
Mono<Void> markSuccess(Long id, String status);
|
||||
}
|
||||
+133
@@ -0,0 +1,133 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.converter.GroupBuyConverter;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.dao.GroupBuyActivityDao;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.entity.GroupBuyActivityEntity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyActivityRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class GroupBuyActivityRepository implements IGroupBuyActivityRepository {
|
||||
|
||||
private final GroupBuyActivityDao activityDao;
|
||||
private final GroupBuyConverter converter;
|
||||
|
||||
public GroupBuyActivityRepository(GroupBuyActivityDao activityDao, GroupBuyConverter converter) {
|
||||
this.activityDao = activityDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> findById(Long id) {
|
||||
return activityDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findAll(boolean includeDeleted) {
|
||||
if (includeDeleted) {
|
||||
return activityDao.findAll().map(converter::toActivity);
|
||||
}
|
||||
return activityDao.findAllByDeletedAtIsNull().map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findByKeyword(String keyword) {
|
||||
if (keyword == null || keyword.isEmpty()) {
|
||||
return findAll(false);
|
||||
}
|
||||
return activityDao.findByNameContainingAndDeletedAtIsNull(keyword).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findByStatus(String status) {
|
||||
if (status == null || status.isEmpty()) {
|
||||
return findAll(false);
|
||||
}
|
||||
return activityDao.findByStatusAndDeletedAtIsNull(status).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findByKeywordAndStatus(String keyword, String status) {
|
||||
Flux<GroupBuyActivity> result = findByKeyword(keyword);
|
||||
if (status != null && !status.isEmpty()) {
|
||||
result = result.filter(a -> status.equals(a.getStatus()));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> save(GroupBuyActivity activity) {
|
||||
GroupBuyActivityEntity entity = converter.toActivityEntity(activity);
|
||||
return activityDao.save(entity).map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> update(GroupBuyActivity activity) {
|
||||
return activityDao.findByIdIsAndDeletedAtIsNull(activity.getId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
existing.markNotNew();
|
||||
if (activity.getName() != null) {
|
||||
existing.setName(activity.getName());
|
||||
}
|
||||
if (activity.getDescription() != null) {
|
||||
existing.setDescription(activity.getDescription());
|
||||
}
|
||||
if (activity.getProductType() != null) {
|
||||
existing.setProductType(activity.getProductType());
|
||||
}
|
||||
if (activity.getProductId() != null) {
|
||||
existing.setProductId(activity.getProductId());
|
||||
}
|
||||
if (activity.getProductName() != null) {
|
||||
existing.setProductName(activity.getProductName());
|
||||
}
|
||||
if (activity.getOriginalPrice() != null) {
|
||||
existing.setOriginalPrice(activity.getOriginalPrice());
|
||||
}
|
||||
if (activity.getGroupPrice() != null) {
|
||||
existing.setGroupPrice(activity.getGroupPrice());
|
||||
}
|
||||
if (activity.getRequiredMembers() != null) {
|
||||
existing.setRequiredMembers(activity.getRequiredMembers());
|
||||
}
|
||||
if (activity.getValidHours() != null) {
|
||||
existing.setValidHours(activity.getValidHours());
|
||||
}
|
||||
if (activity.getStartTime() != null) {
|
||||
existing.setStartTime(activity.getStartTime());
|
||||
}
|
||||
if (activity.getEndTime() != null) {
|
||||
existing.setEndTime(activity.getEndTime());
|
||||
}
|
||||
if (activity.getStock() != null) {
|
||||
existing.setStock(activity.getStock());
|
||||
}
|
||||
existing.setUpdatedAt(LocalDateTime.now());
|
||||
return activityDao.save(existing);
|
||||
})
|
||||
.map(converter::toActivity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> deleteById(Long id) {
|
||||
return activityDao.softDelete(id, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatus(Long id, String status) {
|
||||
return activityDao.updateStatus(id, status, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> incrementSoldCount(Long id, int count) {
|
||||
return activityDao.incrementSoldCount(id, count, LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+61
@@ -0,0 +1,61 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.converter.GroupBuyConverter;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.dao.GroupBuyParticipantDao;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyParticipantStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyTeamStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyParticipantRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class GroupBuyParticipantRepository implements IGroupBuyParticipantRepository {
|
||||
|
||||
private final GroupBuyParticipantDao participantDao;
|
||||
private final GroupBuyConverter converter;
|
||||
|
||||
public GroupBuyParticipantRepository(GroupBuyParticipantDao participantDao, GroupBuyConverter converter) {
|
||||
this.participantDao = participantDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyParticipant> findByTeamId(Long teamId) {
|
||||
return participantDao.findByTeamIdAndDeletedAtIsNull(teamId).map(converter::toParticipant);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyParticipant> findByActivityId(Long activityId) {
|
||||
return participantDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toParticipant);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Boolean> existsInFormingTeam(Long activityId, Long memberId) {
|
||||
return participantDao.findActiveParticipantInFormingTeam(
|
||||
activityId, memberId,
|
||||
GroupBuyParticipantStatus.JOINED.name(),
|
||||
GroupBuyTeamStatus.FORMING.name())
|
||||
.hasElements();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Long> countByActivityId(Long activityId) {
|
||||
return participantDao.countByActivityIdAndDeletedAtIsNull(activityId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyParticipant> save(GroupBuyParticipant participant) {
|
||||
return participantDao.save(converter.toParticipantEntity(participant)).map(converter::toParticipant);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatusByTeamId(Long teamId, String status) {
|
||||
return participantDao.updateStatusByTeamId(teamId, status, LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+70
@@ -0,0 +1,70 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.repository.impl;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.converter.GroupBuyConverter;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.dao.GroupBuyTeamDao;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyTeamStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyTeamRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
@Transactional
|
||||
public class GroupBuyTeamRepository implements IGroupBuyTeamRepository {
|
||||
|
||||
private final GroupBuyTeamDao teamDao;
|
||||
private final GroupBuyConverter converter;
|
||||
|
||||
public GroupBuyTeamRepository(GroupBuyTeamDao teamDao, GroupBuyConverter converter) {
|
||||
this.teamDao = teamDao;
|
||||
this.converter = converter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> findById(Long id) {
|
||||
return teamDao.findByIdIsAndDeletedAtIsNull(id).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyTeam> findByActivityId(Long activityId) {
|
||||
return teamDao.findByActivityIdAndDeletedAtIsNull(activityId).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyTeam> findByActivityIdAndStatus(Long activityId, String status) {
|
||||
if (status == null || status.isEmpty()) {
|
||||
return findByActivityId(activityId);
|
||||
}
|
||||
return teamDao.findByActivityIdAndStatusAndDeletedAtIsNull(activityId, status).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyTeam> findExpiredFormingTeams() {
|
||||
return teamDao.findExpiredFormingTeams(
|
||||
GroupBuyTeamStatus.FORMING.name(), LocalDateTime.now()).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> save(GroupBuyTeam team) {
|
||||
return teamDao.save(converter.toTeamEntity(team)).map(converter::toTeam);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> updateStatus(Long id, String status) {
|
||||
return teamDao.updateStatus(id, status, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> incrementCurrentMembers(Long id, int count) {
|
||||
return teamDao.incrementCurrentMembers(id, count, LocalDateTime.now()).then();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> markSuccess(Long id, String status) {
|
||||
return teamDao.markSuccess(id, status, LocalDateTime.now(), LocalDateTime.now()).then();
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.scheduler;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyTeamService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 拼团过期团队定时任务
|
||||
*
|
||||
* 功能：定期检查已过期的拼团中团队，标记为失败
|
||||
*/
|
||||
@Component
|
||||
public class GroupBuyTeamExpireScheduler {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(GroupBuyTeamExpireScheduler.class);
|
||||
|
||||
private final IGroupBuyTeamService teamService;
|
||||
|
||||
public GroupBuyTeamExpireScheduler(IGroupBuyTeamService teamService) {
|
||||
this.teamService = teamService;
|
||||
}
|
||||
|
||||
@Scheduled(fixedRate = 60000)
|
||||
public void processExpiredTeams() {
|
||||
logger.debug("定时任务开始检查过期拼团团队");
|
||||
|
||||
teamService.processExpiredTeams()
|
||||
.subscribe(
|
||||
count -> logger.debug("定时任务完成，处理了 {} 个过期拼团团队", count),
|
||||
error -> logger.error("拼团过期定时任务执行失败：{}", error.getMessage(), error)
|
||||
);
|
||||
}
|
||||
}
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.service;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.common.dto.PageResponse;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyStatistics;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyActivityService {
|
||||
|
||||
Mono<GroupBuyActivity> findById(Long id);
|
||||
|
||||
Flux<GroupBuyActivity> findAll(boolean includeDeleted);
|
||||
|
||||
Flux<GroupBuyActivity> findByKeywordAndStatus(String keyword, String status);
|
||||
|
||||
Mono<PageResponse<GroupBuyActivity>> findByPage(PageRequest pageRequest, String status);
|
||||
|
||||
Mono<GroupBuyActivity> create(GroupBuyActivity activity);
|
||||
|
||||
Mono<GroupBuyActivity> update(Long id, GroupBuyActivity activity);
|
||||
|
||||
Mono<Void> delete(Long id);
|
||||
|
||||
Mono<GroupBuyActivity> publish(Long id);
|
||||
|
||||
Mono<GroupBuyActivity> terminate(Long id);
|
||||
|
||||
Mono<GroupBuyStatistics> getStatistics(Long id);
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.service;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.CreateTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.JoinTeamRequest;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
public interface IGroupBuyTeamService {
|
||||
|
||||
Mono<GroupBuyTeam> createTeam(CreateTeamRequest request);
|
||||
|
||||
Mono<GroupBuyTeam> joinTeam(Long teamId, JoinTeamRequest request);
|
||||
|
||||
Mono<GroupBuyTeam> cancelTeam(Long teamId);
|
||||
|
||||
Flux<GroupBuyTeam> findTeams(Long activityId, String status);
|
||||
|
||||
Mono<GroupBuyTeam> findTeamById(Long teamId);
|
||||
|
||||
Flux<GroupBuyParticipant> findParticipantsByTeamId(Long teamId);
|
||||
|
||||
Mono<Long> processExpiredTeams();
|
||||
}
|
||||
+226
@@ -0,0 +1,226 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.service.impl;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.common.dto.PageResponse;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyStatistics;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyActivityStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyTeamStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyActivityRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyParticipantRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyTeamRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyActivityService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class GroupBuyActivityService implements IGroupBuyActivityService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(GroupBuyActivityService.class);
|
||||
|
||||
private final IGroupBuyActivityRepository activityRepository;
|
||||
private final IGroupBuyTeamRepository teamRepository;
|
||||
private final IGroupBuyParticipantRepository participantRepository;
|
||||
|
||||
public GroupBuyActivityService(IGroupBuyActivityRepository activityRepository,
|
||||
IGroupBuyTeamRepository teamRepository,
|
||||
IGroupBuyParticipantRepository participantRepository) {
|
||||
this.activityRepository = activityRepository;
|
||||
this.teamRepository = teamRepository;
|
||||
this.participantRepository = participantRepository;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> findById(Long id) {
|
||||
return activityRepository.findById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findAll(boolean includeDeleted) {
|
||||
return activityRepository.findAll(includeDeleted);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyActivity> findByKeywordAndStatus(String keyword, String status) {
|
||||
return activityRepository.findByKeywordAndStatus(keyword, status);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<PageResponse<GroupBuyActivity>> findByPage(PageRequest pageRequest, String status) {
|
||||
int page = Math.max(pageRequest.getPage(), 0);
|
||||
int size = pageRequest.getSize() <= 0 || pageRequest.getSize() > 100 ? 10 : pageRequest.getSize();
|
||||
String keyword = pageRequest.getKeyword();
|
||||
|
||||
return activityRepository.findByKeywordAndStatus(keyword, status)
|
||||
.sort(Comparator.comparing(GroupBuyActivity::getCreatedAt,
|
||||
Comparator.nullsLast(Comparator.reverseOrder())))
|
||||
.collectList()
|
||||
.map(list -> {
|
||||
long total = list.size();
|
||||
int fromIndex = Math.min(page * size, list.size());
|
||||
int toIndex = Math.min(fromIndex + size, list.size());
|
||||
List<GroupBuyActivity> content = list.subList(fromIndex, toIndex);
|
||||
int totalPages = size == 0 ? 0 : (int) Math.ceil((double) total / size);
|
||||
return new PageResponse<>(content, totalPages, total, page, size);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> create(GroupBuyActivity activity) {
|
||||
return validateActivity(activity)
|
||||
.flatMap(validated -> {
|
||||
validated.generateId();
|
||||
validated.setStatus(GroupBuyActivityStatus.DRAFT.name());
|
||||
validated.setSoldCount(0);
|
||||
applyDefaults(validated);
|
||||
return activityRepository.save(validated);
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("拼团活动创建成功 - id={}, name={}", a.getId(), a.getName()))
|
||||
.doOnError(error -> logger.error("拼团活动创建失败 - error: {}", error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> update(Long id, GroupBuyActivity activity) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!GroupBuyActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的拼团活动可编辑"));
|
||||
}
|
||||
activity.setId(id);
|
||||
return validateActivity(activity)
|
||||
.flatMap(activityRepository::update);
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("拼团活动更新成功 - id={}", id))
|
||||
.doOnError(error -> logger.error("拼团活动更新失败 - id={}, error: {}", id, error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Void> delete(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!GroupBuyActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的拼团活动可删除"));
|
||||
}
|
||||
return activityRepository.deleteById(id);
|
||||
})
|
||||
.doOnSuccess(v -> logger.info("拼团活动删除成功 - id={}", id))
|
||||
.doOnError(error -> logger.error("拼团活动删除失败 - id={}, error: {}", id, error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> publish(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!GroupBuyActivityStatus.DRAFT.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅草稿状态的拼团活动可发布"));
|
||||
}
|
||||
return validateActivity(existing)
|
||||
.flatMap(validated -> activityRepository.updateStatus(id, GroupBuyActivityStatus.ACTIVE.name())
|
||||
.then(activityRepository.findById(id)));
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("拼团活动发布成功 - id={}", id))
|
||||
.doOnError(error -> logger.error("拼团活动发布失败 - id={}, error: {}", id, error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyActivity> terminate(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(existing -> {
|
||||
if (!GroupBuyActivityStatus.ACTIVE.name().equals(existing.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅进行中的拼团活动可终止"));
|
||||
}
|
||||
return activityRepository.updateStatus(id, GroupBuyActivityStatus.TERMINATED.name())
|
||||
.then(activityRepository.findById(id));
|
||||
})
|
||||
.doOnSuccess(a -> logger.info("拼团活动已终止 - id={}", id))
|
||||
.doOnError(error -> logger.error("拼团活动终止失败 - id={}, error: {}", id, error.getMessage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyStatistics> getStatistics(Long id) {
|
||||
return activityRepository.findById(id)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(activity -> teamRepository.findByActivityId(id)
|
||||
.collectList()
|
||||
.zipWith(participantRepository.countByActivityId(id))
|
||||
.map(tuple -> {
|
||||
List<GroupBuyTeam> teams = tuple.getT1();
|
||||
long participants = tuple.getT2();
|
||||
|
||||
GroupBuyStatistics stats = new GroupBuyStatistics();
|
||||
stats.setActivityId(id);
|
||||
stats.setTotalTeams(teams.size());
|
||||
stats.setFormingTeams(teams.stream()
|
||||
.filter(t -> GroupBuyTeamStatus.FORMING.name().equals(t.getStatus())).count());
|
||||
stats.setSuccessTeams(teams.stream()
|
||||
.filter(t -> GroupBuyTeamStatus.SUCCESS.name().equals(t.getStatus())).count());
|
||||
stats.setFailedTeams(teams.stream()
|
||||
.filter(t -> GroupBuyTeamStatus.FAILED.name().equals(t.getStatus())).count());
|
||||
stats.setCancelledTeams(teams.stream()
|
||||
.filter(t -> GroupBuyTeamStatus.CANCELLED.name().equals(t.getStatus())).count());
|
||||
stats.setTotalParticipants(participants);
|
||||
stats.setSoldCount(activity.getSoldCount() != null ? activity.getSoldCount() : 0);
|
||||
|
||||
BigDecimal groupPrice = activity.getGroupPrice() != null ? activity.getGroupPrice() : BigDecimal.ZERO;
|
||||
stats.setTotalRevenue(groupPrice.multiply(
|
||||
BigDecimal.valueOf(stats.getSuccessTeams() * activity.getRequiredMembers())));
|
||||
|
||||
return stats;
|
||||
}));
|
||||
}
|
||||
|
||||
private Mono<GroupBuyActivity> validateActivity(GroupBuyActivity activity) {
|
||||
if (activity.getName() == null || activity.getName().isBlank()) {
|
||||
return Mono.error(new RuntimeException("活动名称不能为空"));
|
||||
}
|
||||
if (activity.getProductType() == null || activity.getProductType().isBlank()) {
|
||||
return Mono.error(new RuntimeException("商品类型不能为空"));
|
||||
}
|
||||
if (activity.getProductId() == null) {
|
||||
return Mono.error(new RuntimeException("商品ID不能为空"));
|
||||
}
|
||||
if (activity.getOriginalPrice() == null || activity.getGroupPrice() == null) {
|
||||
return Mono.error(new RuntimeException("原价和拼团价不能为空"));
|
||||
}
|
||||
if (activity.getGroupPrice().compareTo(activity.getOriginalPrice()) >= 0) {
|
||||
return Mono.error(new RuntimeException("拼团价必须低于原价"));
|
||||
}
|
||||
if (activity.getRequiredMembers() == null || activity.getRequiredMembers() < 2) {
|
||||
return Mono.error(new RuntimeException("成团人数至少为2人"));
|
||||
}
|
||||
if (activity.getValidHours() == null || activity.getValidHours() <= 0) {
|
||||
return Mono.error(new RuntimeException("拼团有效时长必须大于0"));
|
||||
}
|
||||
if (activity.getStartTime() == null || activity.getEndTime() == null) {
|
||||
return Mono.error(new RuntimeException("活动开始和结束时间不能为空"));
|
||||
}
|
||||
if (activity.getEndTime().isBefore(activity.getStartTime())) {
|
||||
return Mono.error(new RuntimeException("结束时间不能早于开始时间"));
|
||||
}
|
||||
return Mono.just(activity);
|
||||
}
|
||||
|
||||
private void applyDefaults(GroupBuyActivity activity) {
|
||||
if (activity.getRequiredMembers() == null) {
|
||||
activity.setRequiredMembers(2);
|
||||
}
|
||||
if (activity.getValidHours() == null) {
|
||||
activity.setValidHours(24);
|
||||
}
|
||||
if (activity.getStock() == null) {
|
||||
activity.setStock(-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
+200
@@ -0,0 +1,200 @@
|
||||
package cn.novalon.gym.manage.coupon.groupbuy.service.impl;
|
||||
|
||||
import cn.novalon.gym.manage.common.util.SnowflakeId;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.CreateTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyActivity;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyParticipant;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.GroupBuyTeam;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.domain.JoinTeamRequest;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyActivityStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyParticipantStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.enums.GroupBuyTeamStatus;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyActivityRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyParticipantRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.repository.IGroupBuyTeamRepository;
|
||||
import cn.novalon.gym.manage.coupon.groupbuy.service.IGroupBuyTeamService;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Service
|
||||
public class GroupBuyTeamService implements IGroupBuyTeamService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(GroupBuyTeamService.class);
|
||||
|
||||
private final IGroupBuyActivityRepository activityRepository;
|
||||
private final IGroupBuyTeamRepository teamRepository;
|
||||
private final IGroupBuyParticipantRepository participantRepository;
|
||||
|
||||
public GroupBuyTeamService(IGroupBuyActivityRepository activityRepository,
|
||||
IGroupBuyTeamRepository teamRepository,
|
||||
IGroupBuyParticipantRepository participantRepository) {
|
||||
this.activityRepository = activityRepository;
|
||||
this.teamRepository = teamRepository;
|
||||
this.participantRepository = participantRepository;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> createTeam(CreateTeamRequest request) {
|
||||
if (request.getActivityId() == null || request.getMemberId() == null) {
|
||||
return Mono.error(new RuntimeException("activityId和memberId不能为空"));
|
||||
}
|
||||
|
||||
return activityRepository.findById(request.getActivityId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(activity -> validateActivityForTeam(activity)
|
||||
.then(checkMemberNotInFormingTeam(activity.getId(), request.getMemberId()))
|
||||
.then(createTeamInternal(activity, request.getMemberId())));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> joinTeam(Long teamId, JoinTeamRequest request) {
|
||||
if (request.getMemberId() == null) {
|
||||
return Mono.error(new RuntimeException("memberId不能为空"));
|
||||
}
|
||||
|
||||
return teamRepository.findById(teamId)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团团队不存在")))
|
||||
.flatMap(team -> {
|
||||
if (!GroupBuyTeamStatus.FORMING.name().equals(team.getStatus())) {
|
||||
return Mono.error(new RuntimeException("该团不在拼团中，无法加入"));
|
||||
}
|
||||
if (team.getExpireAt() != null && team.getExpireAt().isBefore(LocalDateTime.now())) {
|
||||
return Mono.error(new RuntimeException("该团已过期"));
|
||||
}
|
||||
return activityRepository.findById(team.getActivityId())
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团活动不存在")))
|
||||
.flatMap(activity -> validateActivityForTeam(activity)
|
||||
.then(checkMemberNotInFormingTeam(activity.getId(), request.getMemberId()))
|
||||
.then(addParticipant(team, activity, request.getMemberId(), false))
|
||||
.flatMap(updatedTeam -> checkAndCompleteTeam(updatedTeam, activity)));
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> cancelTeam(Long teamId) {
|
||||
return teamRepository.findById(teamId)
|
||||
.switchIfEmpty(Mono.error(new RuntimeException("拼团团队不存在")))
|
||||
.flatMap(team -> {
|
||||
if (!GroupBuyTeamStatus.FORMING.name().equals(team.getStatus())) {
|
||||
return Mono.error(new RuntimeException("仅拼团中的团队可取消"));
|
||||
}
|
||||
return teamRepository.updateStatus(teamId, GroupBuyTeamStatus.CANCELLED.name())
|
||||
.then(participantRepository.updateStatusByTeamId(
|
||||
teamId, GroupBuyParticipantStatus.CANCELLED.name()))
|
||||
.then(teamRepository.findById(teamId));
|
||||
})
|
||||
.doOnSuccess(t -> logger.info("拼团团队已取消 - teamId={}", teamId));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyTeam> findTeams(Long activityId, String status) {
|
||||
if (activityId == null) {
|
||||
return Flux.error(new RuntimeException("activityId不能为空"));
|
||||
}
|
||||
return teamRepository.findByActivityIdAndStatus(activityId, status);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<GroupBuyTeam> findTeamById(Long teamId) {
|
||||
return teamRepository.findById(teamId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flux<GroupBuyParticipant> findParticipantsByTeamId(Long teamId) {
|
||||
return participantRepository.findByTeamId(teamId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Long> processExpiredTeams() {
|
||||
return teamRepository.findExpiredFormingTeams()
|
||||
.flatMap(team -> teamRepository.updateStatus(team.getId(), GroupBuyTeamStatus.FAILED.name())
|
||||
.then(participantRepository.updateStatusByTeamId(
|
||||
team.getId(), GroupBuyParticipantStatus.CANCELLED.name()))
|
||||
.thenReturn(1L))
|
||||
.reduce(0L, Long::sum)
|
||||
.doOnSuccess(count -> {
|
||||
if (count > 0) {
|
||||
logger.info("已处理 {} 个过期拼团团队", count);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<GroupBuyTeam> createTeamInternal(GroupBuyActivity activity, Long leaderMemberId) {
|
||||
int validHours = activity.getValidHours() != null ? activity.getValidHours() : 24;
|
||||
|
||||
GroupBuyTeam team = new GroupBuyTeam();
|
||||
team.setId(SnowflakeId.nextId());
|
||||
team.setActivityId(activity.getId());
|
||||
team.setLeaderMemberId(leaderMemberId);
|
||||
team.setRequiredMembers(activity.getRequiredMembers());
|
||||
team.setCurrentMembers(1);
|
||||
team.setStatus(GroupBuyTeamStatus.FORMING.name());
|
||||
team.setExpireAt(LocalDateTime.now().plusHours(validHours));
|
||||
|
||||
return teamRepository.save(team)
|
||||
.flatMap(saved -> addParticipant(saved, activity, leaderMemberId, true));
|
||||
}
|
||||
|
||||
private Mono<GroupBuyTeam> addParticipant(GroupBuyTeam team, GroupBuyActivity activity,
|
||||
Long memberId, boolean isLeader) {
|
||||
GroupBuyParticipant participant = new GroupBuyParticipant();
|
||||
participant.setId(SnowflakeId.nextId());
|
||||
participant.setTeamId(team.getId());
|
||||
participant.setActivityId(activity.getId());
|
||||
participant.setMemberId(memberId);
|
||||
participant.setIsLeader(isLeader);
|
||||
participant.setStatus(GroupBuyParticipantStatus.JOINED.name());
|
||||
participant.setJoinAt(LocalDateTime.now());
|
||||
|
||||
Mono<GroupBuyTeam> teamUpdate = isLeader
|
||||
? Mono.just(team)
|
||||
: teamRepository.incrementCurrentMembers(team.getId(), 1)
|
||||
.then(teamRepository.findById(team.getId()));
|
||||
|
||||
return participantRepository.save(participant)
|
||||
.then(teamUpdate);
|
||||
}
|
||||
|
||||
private Mono<GroupBuyTeam> checkAndCompleteTeam(GroupBuyTeam team, GroupBuyActivity activity) {
|
||||
return teamRepository.findById(team.getId())
|
||||
.flatMap(updated -> {
|
||||
if (updated.getCurrentMembers() >= updated.getRequiredMembers()) {
|
||||
return teamRepository.markSuccess(updated.getId(), GroupBuyTeamStatus.SUCCESS.name())
|
||||
.then(activityRepository.incrementSoldCount(activity.getId(), updated.getRequiredMembers()))
|
||||
.then(teamRepository.findById(updated.getId()));
|
||||
}
|
||||
return Mono.just(updated);
|
||||
});
|
||||
}
|
||||
|
||||
private Mono<Void> validateActivityForTeam(GroupBuyActivity activity) {
|
||||
if (!GroupBuyActivityStatus.ACTIVE.name().equals(activity.getStatus())) {
|
||||
return Mono.error(new RuntimeException("拼团活动未开始或已结束"));
|
||||
}
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
if (activity.getStartTime() != null && now.isBefore(activity.getStartTime())) {
|
||||
return Mono.error(new RuntimeException("拼团活动尚未开始"));
|
||||
}
|
||||
if (activity.getEndTime() != null && now.isAfter(activity.getEndTime())) {
|
||||
return Mono.error(new RuntimeException("拼团活动已结束"));
|
||||
}
|
||||
int stock = activity.getStock() != null ? activity.getStock() : -1;
|
||||
int sold = activity.getSoldCount() != null ? activity.getSoldCount() : 0;
|
||||
if (stock >= 0 && sold >= stock) {
|
||||
return Mono.error(new RuntimeException("拼团活动库存不足"));
|
||||
}
|
||||
return Mono.empty();
|
||||
}
|
||||
|
||||
private Mono<Void> checkMemberNotInFormingTeam(Long activityId, Long memberId) {
|
||||
return participantRepository.existsInFormingTeam(activityId, memberId)
|
||||
.flatMap(exists -> exists
|
||||
? Mono.error(new RuntimeException("您已在该活动的拼团中，不能重复参团"))
|
||||
: Mono.empty());
|
||||
}
|
||||
}
|
||||
+227
@@ -0,0 +1,227 @@
|
||||
package cn.novalon.gym.manage.coupon.handler;
|
||||
|
||||
import cn.novalon.gym.manage.common.dto.PageRequest;
|
||||
import cn.novalon.gym.manage.coupon.domain.CouponTemplate;
|
||||
import cn.novalon.gym.manage.coupon.domain.DistributeCouponRequest;
|
||||
import cn.novalon.gym.manage.coupon.service.ICouponTemplateService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.function.server.ServerRequest;
|
||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
@Tag(name = "优惠券管理", description = "优惠券相关操作")
|
||||
public class CouponHandler {
|
||||
|
||||
private final ICouponTemplateService couponTemplateService;
|
||||
|
||||
public CouponHandler(ICouponTemplateService couponTemplateService) {
|
||||
this.couponTemplateService = couponTemplateService;
|
||||
}
|
||||
|
||||
@Operation(summary = "获取所有优惠券", description = "获取系统中所有优惠券列表")
|
||||
public Mono<ServerResponse> getAllCoupons(ServerRequest request) {
|
||||
boolean includeDeleted = Boolean.parseBoolean(request.queryParam("includeDeleted").orElse("false"));
|
||||
return ServerResponse.ok()
|
||||
.body(couponTemplateService.findAll(includeDeleted), CouponTemplate.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "分页获取优惠券", description = "根据分页参数获取优惠券列表")
|
||||
public Mono<ServerResponse> getCouponsByPage(ServerRequest request) {
|
||||
return request.bodyToMono(PageRequest.class)
|
||||
.flatMap(pageRequest -> {
|
||||
String couponType = request.queryParam("couponType").orElse(null);
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
|
||||
if (pageRequest.getPage() < 0) {
|
||||
pageRequest.setPage(0);
|
||||
}
|
||||
if (pageRequest.getSize() <= 0 || pageRequest.getSize() > 100) {
|
||||
pageRequest.setSize(10);
|
||||
}
|
||||
if (pageRequest.getSort() == null || pageRequest.getSort().isEmpty()) {
|
||||
pageRequest.setSort("id");
|
||||
}
|
||||
if (pageRequest.getOrder() == null || pageRequest.getOrder().isEmpty()) {
|
||||
pageRequest.setOrder("desc");
|
||||
}
|
||||
|
||||
return couponTemplateService.findByPage(pageRequest, couponType, status)
|
||||
.flatMap(response -> ServerResponse.ok().bodyValue(response));
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "搜索优惠券", description = "根据关键词、类型、状态搜索优惠券")
|
||||
public Mono<ServerResponse> searchCoupons(ServerRequest request) {
|
||||
String keyword = request.queryParam("keyword").orElse("");
|
||||
String couponType = request.queryParam("couponType").orElse(null);
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
return ServerResponse.ok()
|
||||
.body(couponTemplateService.findByCouponTypeAndKeyword(couponType, keyword, status), CouponTemplate.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "根据ID获取优惠券", description = "根据ID获取优惠券详情")
|
||||
public Mono<ServerResponse> getCouponById(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
return couponTemplateService.findById(id)
|
||||
.flatMap(coupon -> ServerResponse.ok().bodyValue(coupon))
|
||||
.switchIfEmpty(ServerResponse.notFound().build());
|
||||
}
|
||||
|
||||
@Operation(summary = "创建优惠券", description = "创建新的优惠券")
|
||||
public Mono<ServerResponse> createCoupon(ServerRequest request) {
|
||||
return request.bodyToMono(CouponTemplate.class)
|
||||
.flatMap(couponTemplate -> {
|
||||
if (couponTemplate.getName() == null || couponTemplate.getName().isEmpty()) {
|
||||
Map<String, Object> error = new HashMap<>();
|
||||
error.put("success", false);
|
||||
error.put("message", "优惠券名称不能为空");
|
||||
return ServerResponse.badRequest().bodyValue(error);
|
||||
}
|
||||
|
||||
return couponTemplateService.create(couponTemplate)
|
||||
.flatMap(coupon -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", "优惠券创建成功");
|
||||
response.put("data", coupon);
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
})
|
||||
.onErrorResume(error -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "更新优惠券", description = "更新指定优惠券信息")
|
||||
public Mono<ServerResponse> updateCoupon(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
|
||||
return request.bodyToMono(CouponTemplate.class)
|
||||
.flatMap(couponTemplate -> couponTemplateService.update(id, couponTemplate)
|
||||
.flatMap(coupon -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", "优惠券更新成功");
|
||||
response.put("data", coupon);
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
})
|
||||
.onErrorResume(error -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
}));
|
||||
}
|
||||
|
||||
@Operation(summary = "删除优惠券", description = "删除指定优惠券（软删除）")
|
||||
public Mono<ServerResponse> deleteCoupon(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
|
||||
return couponTemplateService.delete(id)
|
||||
.then(Mono.defer(() -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", "优惠券删除成功");
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
}))
|
||||
.onErrorResume(error -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "发布优惠券", description = "发布优惠券使其可进行发放")
|
||||
public Mono<ServerResponse> publishCoupon(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
|
||||
return couponTemplateService.publish(id)
|
||||
.flatMap(coupon -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", "优惠券发布成功");
|
||||
response.put("data", coupon);
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
})
|
||||
.onErrorResume(error -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "终止优惠券", description = "提前终止优惠券活动")
|
||||
public Mono<ServerResponse> terminateCoupon(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
|
||||
return couponTemplateService.terminate(id)
|
||||
.flatMap(coupon -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", "优惠券已终止");
|
||||
response.put("data", coupon);
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
})
|
||||
.onErrorResume(error -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "发放优惠券", description = "手动或批量发放优惠券给指定会员")
|
||||
public Mono<ServerResponse> distributeCoupon(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
|
||||
return request.bodyToMono(DistributeCouponRequest.class)
|
||||
.flatMap(body -> {
|
||||
if (body.getMemberIds() == null || body.getMemberIds().isEmpty()) {
|
||||
Map<String, Object> error = new HashMap<>();
|
||||
error.put("success", false);
|
||||
error.put("message", "memberIds不能为空");
|
||||
return ServerResponse.badRequest().bodyValue(error);
|
||||
}
|
||||
|
||||
return couponTemplateService.distribute(id, body)
|
||||
.flatMap(result -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", result.getMessage());
|
||||
response.put("data", result);
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
})
|
||||
.onErrorResume(error -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@Operation(summary = "获取优惠券统计", description = "获取优惠券领取、使用等统计数据")
|
||||
public Mono<ServerResponse> getCouponStatistics(ServerRequest request) {
|
||||
Long id = Long.valueOf(request.pathVariable("id"));
|
||||
|
||||
return couponTemplateService.getStatistics(id)
|
||||
.flatMap(stats -> ServerResponse.ok().bodyValue(stats))
|
||||
.onErrorResume(error -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
});
|
||||
}
|
||||
}
|
||||
+67
@@ -0,0 +1,67 @@
|
||||
package cn.novalon.gym.manage.coupon.handler;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.domain.ClaimCouponRequest;
|
||||
import cn.novalon.gym.manage.coupon.domain.MemberCoupon;
|
||||
import cn.novalon.gym.manage.coupon.service.IMemberCouponService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.reactive.function.server.ServerRequest;
|
||||
import org.springframework.web.reactive.function.server.ServerResponse;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Component
|
||||
@Tag(name = "会员优惠券", description = "会员优惠券领取与查询")
|
||||
public class MemberCouponHandler {
|
||||
|
||||
private final IMemberCouponService memberCouponService;
|
||||
|
||||
public MemberCouponHandler(IMemberCouponService memberCouponService) {
|
||||
this.memberCouponService = memberCouponService;
|
||||
}
|
||||
|
||||
@Operation(summary = "查询会员优惠券", description = "查询指定会员的优惠券列表")
|
||||
public Mono<ServerResponse> getMemberCoupons(ServerRequest request) {
|
||||
Long memberId = Long.valueOf(request.pathVariable("memberId"));
|
||||
String status = request.queryParam("status").orElse(null);
|
||||
return ServerResponse.ok()
|
||||
.body(memberCouponService.findByMemberIdAndStatus(memberId, status), MemberCoupon.class);
|
||||
}
|
||||
|
||||
@Operation(summary = "领取码兑换优惠券", description = "会员通过领取码/二维码兑换优惠券")
|
||||
public Mono<ServerResponse> claimCoupon(ServerRequest request) {
|
||||
return request.bodyToMono(ClaimCouponRequest.class)
|
||||
.flatMap(body -> {
|
||||
if (body.getMemberId() == null) {
|
||||
Map<String, Object> error = new HashMap<>();
|
||||
error.put("success", false);
|
||||
error.put("message", "memberId不能为空");
|
||||
return ServerResponse.badRequest().bodyValue(error);
|
||||
}
|
||||
if (body.getClaimCode() == null || body.getClaimCode().isBlank()) {
|
||||
Map<String, Object> error = new HashMap<>();
|
||||
error.put("success", false);
|
||||
error.put("message", "claimCode不能为空");
|
||||
return ServerResponse.badRequest().bodyValue(error);
|
||||
}
|
||||
|
||||
return memberCouponService.claimByCode(body.getMemberId(), body.getClaimCode())
|
||||
.flatMap(coupon -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", true);
|
||||
response.put("message", "优惠券领取成功");
|
||||
response.put("data", coupon);
|
||||
return ServerResponse.ok().bodyValue(response);
|
||||
})
|
||||
.onErrorResume(error -> {
|
||||
Map<String, Object> response = new HashMap<>();
|
||||
response.put("success", false);
|
||||
response.put("message", error.getMessage());
|
||||
return ServerResponse.badRequest().bodyValue(response);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package cn.novalon.gym.manage.coupon.marketing.converter;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.novalon.gym.manage.coupon.marketing.domain.MarketingActivity;
|
||||
import cn.novalon.gym.manage.coupon.marketing.entity.MarketingActivityEntity;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@Slf4j
|
||||
public class MarketingConverter {
|
||||
|
||||
public MarketingActivity toMarketingActivity(MarketingActivityEntity entity) {
|
||||
if (entity == null) {
|
||||
return null;
|
||||
}
|
||||
MarketingActivity domain = new MarketingActivity();
|
||||
BeanUtil.copyProperties(entity, domain);
|
||||
log.debug("转换营销活动实体到领域模型：activityId={}", entity.getId());
|
||||
return domain;
|
||||
}
|
||||
|
||||
public MarketingActivityEntity toMarketingActivityEntity(MarketingActivity domain) {
|
||||
if (domain == null) {
|
||||
return null;
|
||||
}
|
||||
MarketingActivityEntity entity = new MarketingActivityEntity();
|
||||
BeanUtil.copyProperties(domain, entity);
|
||||
if (domain.getId() != null) {
|
||||
entity.markNotNew();
|
||||
}
|
||||
log.debug("转换营销活动领域模型到实体：activityId={}", domain.getId());
|
||||
return entity;
|
||||
}
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
package cn.novalon.gym.manage.coupon.marketing.dao;
|
||||
|
||||
import cn.novalon.gym.manage.coupon.marketing.entity.MarketingActivityEntity;
|
||||
import org.springframework.data.r2dbc.repository.Modifying;
|
||||
import org.springframework.data.r2dbc.repository.Query;
|
||||
import org.springframework.data.r2dbc.repository.R2dbcRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import reactor.core.publisher.Flux;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Repository
|
||||
public interface MarketingActivityDao extends R2dbcRepository<MarketingActivityEntity, Long> {
|
||||
|
||||
Mono<MarketingActivityEntity> findByIdIsAndDeletedAtIsNull(Long id);
|
||||
|
||||
Flux<MarketingActivityEntity> findAllByDeletedAtIsNull();
|
||||
|
||||
Flux<MarketingActivityEntity> findByNameContainingAndDeletedAtIsNull(String name);
|
||||
|
||||
Flux<MarketingActivityEntity> findByActivityTypeAndDeletedAtIsNull(String activityType);
|
||||
|
||||
Flux<MarketingActivityEntity> findByStatusAndDeletedAtIsNull(String status);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE marketing_activity SET deleted_at = :deletedAt WHERE id = :id")
|
||||
Mono<Integer> softDelete(Long id, LocalDateTime deletedAt);
|
||||
|
||||
@Modifying
|
||||
@Query("UPDATE marketing_activity SET status = :status, updated_at = :updatedAt WHERE id = :id")
|
||||
Mono<Integer> updateStatus(Long id, String status, LocalDateTime updatedAt);
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user