diff --git a/gym-manage-api/docs/datacount-api.md b/gym-manage-api/docs/datacount-api.md new file mode 100644 index 0000000..1dc7e02 --- /dev/null +++ b/gym-manage-api/docs/datacount-api.md @@ -0,0 +1,848 @@ +# 数据统计模块 API 文档 + +> 模块：gym-dataCount +> 版本：1.0.0 +> 更新日期：2026-06-06 + +## 概述 + +数据统计模块提供会员数据统计、预约数据统计和数据导出功能，支持按日期查询、日期范围查询和汇总统计。 + +--- + +## 基础信息 + +- **Base URL**: `/api/stats` +- **Content-Type**: `application/json` +- **响应格式**: JSON + +--- + +## 1. 会员数据统计 + +### 1.1 获取指定日期的会员统计 + +获取某一天的会员数据统计信息。 + +**请求** + +```http +GET /api/stats/member/date/{date} +``` + +**路径参数** + +| 参数 | 类型 | 必填 | 说明 | +|-----|------|-----|------| +| date | string | 是 | 统计日期，格式：yyyy-MM-dd | + +**请求示例** + +```bash +curl -X GET "http://localhost:8080/api/stats/member/date/2026-06-01" +``` + +**响应示例** + +```json +{ + "date": "2026-06-01", + "newMembers": 5, + "activeMembers": 0, + "retainedMembers": 0, + "totalMembers": 19, + "maleMembers": 10, + "femaleMembers": 9, + "cardPurchaseCount": 19, + "averageAge": 29.5 +} +``` + +**响应字段说明** + +| 字段 | 类型 | 说明 | +|-----|------|------| +| date | string | 统计日期 | +| newMembers | integer | 当日新增会员数 | +| activeMembers | integer | 当日活跃会员数（有会员卡操作的会员） | +| retainedMembers | integer | 留存会员数 | +| totalMembers | integer | 总会员数（累计） | +| maleMembers | integer | 男性会员总数 | +| femaleMembers | integer | 女性会员总数 | +| cardPurchaseCount | integer | 当日购卡人数 | +| averageAge | number | 会员平均年龄 | + +--- + +### 1.2 获取日期范围内的会员统计列表 + +获取指定日期范围内每天的会员统计数据。 + +**请求** + +```http +GET /api/stats/member/range?startDate=2026-06-01&endDate=2026-06-05 +``` + +**查询参数** + +| 参数 | 类型 | 必填 | 说明 | +|-----|------|-----|------| +| startDate | string | 是 | 开始日期，格式：yyyy-MM-dd | +| endDate | string | 是 | 结束日期，格式：yyyy-MM-dd | + +**请求示例** + +```bash +curl -X GET "http://localhost:8080/api/stats/member/range?startDate=2026-06-01&endDate=2026-06-03" +``` + +**响应示例** + +```json +[ + { + "date": "2026-06-01", + "newMembers": 5, + "activeMembers": 0, + "totalMembers": 19, + "maleMembers": 10, + "femaleMembers": 9, + "cardPurchaseCount": 19, + "averageAge": 29.5 + }, + { + "date": "2026-06-02", + "newMembers": 4, + "activeMembers": 0, + "totalMembers": 19, + "maleMembers": 10, + "femaleMembers": 9, + "cardPurchaseCount": 19, + "averageAge": 29.5 + }, + { + "date": "2026-06-03", + "newMembers": 3, + "activeMembers": 0, + "totalMembers": 19, + "maleMembers": 10, + "femaleMembers": 9, + "cardPurchaseCount": 19, + "averageAge": 29.5 + } +] +``` + +--- + +### 1.3 获取会员统计汇总 + +获取指定日期范围内的会员数据汇总统计。 + +**请求** + +```http +GET /api/stats/member/summary?startDate=2026-06-01&endDate=2026-06-30 +``` + +**查询参数** + +| 参数 | 类型 | 必填 | 说明 | +|-----|------|-----|------| +| startDate | string | 是 | 开始日期，格式：yyyy-MM-dd | +| endDate | string | 是 | 结束日期，格式：yyyy-MM-dd | + +**请求示例** + +```bash +curl -X GET "http://localhost:8080/api/stats/member/summary?startDate=2026-06-01&endDate=2026-06-06" +``` + +**响应示例** + +```json +{ + "startDate": "2026-06-01", + "endDate": "2026-06-06", + "newMembers": 19, + "activeMembers": 0, + "totalMembers": 19, + "maleMembers": 10, + "femaleMembers": 9, + "cardPurchaseCount": 19, + "averageAge": 29.5 +} +``` + +--- + +## 2. 预约数据统计 + +### 2.1 获取指定日期的预约统计 + +获取某一天的团课预约数据统计信息。 + +**请求** + +```http +GET /api/stats/booking/date/{date} +``` + +**路径参数** + +| 参数 | 类型 | 必填 | 说明 | +|-----|------|-----|------| +| date | string | 是 | 统计日期，格式：yyyy-MM-dd | + +**请求示例** + +```bash +curl -X GET "http://localhost:8080/api/stats/booking/date/2026-06-01" +``` + +**响应示例** + +```json +{ + "date": "2026-06-01", + "totalBookings": 32, + "cancelledBookings": 5, + "attendedBookings": 27, + "bookingSuccessRate": 0.0, + "cancellationRate": 15.63, + "attendanceRate": 84.38, + "popularCourseName": "燃脂单车", + "popularCourseCount": 19, + "totalCourses": 3, + "fullCourses": 1 +} +``` + +**响应字段说明** + +| 字段 | 类型 | 说明 | +|-----|------|------| +| date | string | 统计日期 | +| totalBookings | integer | 预约总数 | +| cancelledBookings | integer | 取消预约数 | +| attendedBookings | integer | 实际到场数 | +| bookingSuccessRate | number | 预约成功率（保留） | +| cancellationRate | number | 取消率（百分比） | +| attendanceRate | number | 到场率（百分比） | +| popularCourseName | string | 最热门课程名称 | +| popularCourseCount | integer | 热门课程预约数 | +| totalCourses | integer | 当日团课总数 | +| fullCourses | integer | 满员课程数 | + +--- + +### 2.2 获取日期范围内的预约统计列表 + +获取指定日期范围内每天的预约统计数据。 + +**请求** + +```http +GET /api/stats/booking/range?startDate=2026-06-01&endDate=2026-06-05 +``` + +**查询参数** + +| 参数 | 类型 | 必填 | 说明 | +|-----|------|-----|------| +| startDate | string | 是 | 开始日期，格式：yyyy-MM-dd | +| endDate | string | 是 | 结束日期，格式：yyyy-MM-dd | + +**请求示例** + +```bash +curl -X GET "http://localhost:8080/api/stats/booking/range?startDate=2026-06-01&endDate=2026-06-03" +``` + +**响应示例** + +```json +[ + { + "date": "2026-06-01", + "totalBookings": 32, + "cancelledBookings": 5, + "attendedBookings": 27, + "cancellationRate": 15.63, + "attendanceRate": 84.38, + "popularCourseName": "燃脂单车", + "popularCourseCount": 19, + "totalCourses": 3, + "fullCourses": 1 + }, + { + "date": "2026-06-02", + "totalBookings": 30, + "cancelledBookings": 3, + "attendedBookings": 27, + "cancellationRate": 10.00, + "attendanceRate": 90.00, + "popularCourseName": "流瑜伽", + "popularCourseCount": 10, + "totalCourses": 3, + "fullCourses": 0 + }, + { + "date": "2026-06-03", + "totalBookings": 35, + "cancelledBookings": 4, + "attendedBookings": 31, + "cancellationRate": 11.43, + "attendanceRate": 88.57, + "popularCourseName": "哈他瑜伽", + "popularCourseCount": 12, + "totalCourses": 3, + "fullCourses": 2 + } +] +``` + +--- + +### 2.3 获取预约统计汇总 + +获取指定日期范围内的预约数据汇总统计。 + +**请求** + +```http +GET /api/stats/booking/summary?startDate=2026-06-01&endDate=2026-06-30 +``` + +**查询参数** + +| 参数 | 类型 | 必填 | 说明 | +|-----|------|-----|------| +| startDate | string | 是 | 开始日期，格式：yyyy-MM-dd | +| endDate | string | 是 | 结束日期，格式：yyyy-MM-dd | + +**请求示例** + +```bash +curl -X GET "http://localhost:8080/api/stats/booking/summary?startDate=2026-06-01&endDate=2026-06-06" +``` + +**响应示例** + +```json +{ + "startDate": "2026-06-01", + "endDate": "2026-06-06", + "totalBookings": 172, + "cancelledBookings": 16, + "attendedBookings": 156, + "cancellationRate": 9.30, + "attendanceRate": 90.70 +} +``` + +--- + +## 3. 数据导出 + +### 3.1 导出会员统计数据 + +导出指定日期范围内的会员统计数据为CSV文件。 + +**请求** + +```http +GET /api/stats/export/member?startDate=2026-06-01&endDate=2026-06-30 +``` + +**查询参数** + +| 参数 | 类型 | 必填 | 说明 | +|-----|------|-----|------| +| startDate | string | 是 | 开始日期，格式：yyyy-MM-dd | +| endDate | string | 是 | 结束日期，格式：yyyy-MM-dd | + +**请求示例** + +```bash +curl -X GET "http://localhost:8080/api/stats/export/member?startDate=2026-06-01&endDate=2026-06-03" \ + -H "Accept: text/csv" \ + --output member_stats.csv +``` + +**响应** + +- **Content-Type**: `text/csv; charset=UTF-8` +- **Content-Disposition**: `attachment; filename=member_statistics_2026-06-01_2026-06-03.csv` + +**CSV格式示例** + +```csv +统计日期,新增会员数,活跃会员数,总会员数,男性会员数,女性会员数,购卡人数,平均年龄 +2026-06-01,5,0,19,10,9,19,29.5 +2026-06-02,4,0,19,10,9,19,29.5 +2026-06-03,3,0,19,10,9,19,29.5 +``` + +--- + +### 3.2 导出预约统计数据 + +导出指定日期范围内的预约统计数据为CSV文件。 + +**请求** + +```http +GET /api/stats/export/booking?startDate=2026-06-01&endDate=2026-06-30 +``` + +**查询参数** + +| 参数 | 类型 | 必填 | 说明 | +|-----|------|-----|------| +| startDate | string | 是 | 开始日期，格式：yyyy-MM-dd | +| endDate | string | 是 | 结束日期，格式：yyyy-MM-dd | + +**请求示例** + +```bash +curl -X GET "http://localhost:8080/api/stats/export/booking?startDate=2026-06-01&endDate=2026-06-03" \ + -H "Accept: text/csv" \ + --output booking_stats.csv +``` + +**响应** + +- **Content-Type**: `text/csv; charset=UTF-8` +- **Content-Disposition**: `attachment; filename=booking_statistics_2026-06-01_2026-06-03.csv` + +**CSV格式示例** + +```csv +统计日期,预约总数,取消预约数,实际到场数,取消率(%),到场率(%),热门课程,热门课程预约数,团课总数,满员课程数 +2026-06-01,32,5,27,15.63,84.38,燃脂单车,19,3,1 +2026-06-02,30,3,27,10.00,90.00,流瑜伽,10,3,0 +2026-06-03,35,4,31,11.43,88.57,哈他瑜伽,12,3,2 +``` + +--- + +### 3.3 导出全部统计数据 + +导出指定日期范围内的会员和预约统计数据为CSV文件。 + +**请求** + +```http +GET /api/stats/export/all?startDate=2026-06-01&endDate=2026-06-30 +``` + +**查询参数** + +| 参数 | 类型 | 必填 | 说明 | +|-----|------|-----|------| +| startDate | string | 是 | 开始日期，格式：yyyy-MM-dd | +| endDate | string | 是 | 结束日期，格式：yyyy-MM-dd | + +**请求示例** + +```bash +curl -X GET "http://localhost:8080/api/stats/export/all?startDate=2026-06-01&endDate=2026-06-03" \ + -H "Accept: text/csv" \ + --output all_stats.csv +``` + +**响应** + +- **Content-Type**: `text/csv; charset=UTF-8` +- **Content-Disposition**: `attachment; filename=all_statistics_2026-06-01_2026-06-03.csv` + +**CSV格式示例** + +```csv +=== 会员数据统计 === +统计日期,新增会员数,活跃会员数,总会员数,男性会员数,女性会员数,购卡人数,平均年龄 +2026-06-01,5,0,19,10,9,19,29.5 +2026-06-02,4,0,19,10,9,19,29.5 +2026-06-03,3,0,19,10,9,19,29.5 + +=== 预约数据统计 === +统计日期,预约总数,取消预约数,实际到场数,取消率(%),到场率(%),热门课程,热门课程预约数,团课总数,满员课程数 +2026-06-01,32,5,27,15.63,84.38,燃脂单车,19,3,1 +2026-06-02,30,3,27,10.00,90.00,流瑜伽,10,3,0 +2026-06-03,35,4,31,11.43,88.57,哈他瑜伽,12,3,2 +``` + +--- + +## 4. 错误响应 + +所有接口在发生错误时返回统一的错误格式： + +```json +{ + "success": false, + "message": "错误描述信息" +} +``` + +**常见错误码** + +| HTTP状态码 | 说明 | +|-----------|------| +| 400 Bad Request | 参数格式错误或缺少必填参数 | +| 404 Not Found | 指定日期的数据不存在 | +| 500 Internal Server Error | 服务器内部错误 | + +--- + +## 5. 定时任务 + +模块内置以下定时任务，自动计算统计数据并缓存到Redis： + +| 任务名称 | 执行时间 | 说明 | +|---------|---------|------| +| 每日统计 | 每日凌晨1点 | 计算前一天的会员和预约统计 | +| 每周汇总 | 每周一凌晨2点 | 计算上周的汇总统计 | +| 每月汇总 | 每月1号凌晨3点 | 计算上月的汇总统计 | + +**缓存策略** + +- 缓存键前缀：`stats:member:` 和 `stats:booking:` +- 缓存过期时间：3600秒（1小时） +- 每日定时任务会自动刷新缓存 + +--- + +## 6. 数据来源 + +统计数据来源于以下数据表： + +| 统计类型 | 数据表 | 说明 | +|---------|-------|------| +| 会员统计 | `member_user` | 会员基本信息表 | +| 会员卡统计 | `member_card_record` | 会员卡记录表 | +| 预约统计 | `group_course_booking` | 团课预约记录表 | +| 课程统计 | `group_course` | 团课课程表 | + +--- + +## 7. 技术实现 + +- **框架**: Spring WebFlux（响应式编程） +- **数据库访问**: Spring Data R2DBC +- **缓存**: Redis（ReactiveRedisTemplate） +- **API文档**: OpenAPI 3.0 / Swagger +- **导出格式**: CSV + +--- + +## 附录：接口列表汇总 + +| 方法 | 路径 | 说明 | +|-----|------|------| +| GET | `/api/stats/member/date/{date}` | 获取指定日期会员统计 | +| GET | `/api/stats/member/range` | 获取日期范围会员统计列表 | +| GET | `/api/stats/member/summary` | 获取会员统计汇总 | +| GET | `/api/stats/booking/date/{date}` | 获取指定日期预约统计 | +| GET | `/api/stats/booking/range` | 获取日期范围预约统计列表 | +| GET | `/api/stats/booking/summary` | 获取预约统计汇总 | +| GET | `/api/stats/export/member` | 导出会员统计CSV | +| GET | `/api/stats/export/booking` | 导出预约统计CSV | +| GET | `/api/stats/export/all` | 导出全部统计CSV | + +--- + +## 8. 测试指南 + +### 8.1 测试数据说明 + +数据库已预置测试数据，日期范围为 **2026-06-01 至 2026-06-10**。 + +#### 会员数据分布 + +| 日期 | 新增会员数 | 男性会员 | 女性会员 | +|------|-----------|---------|---------| +| 2026-06-01 | 5 | 3 | 2 | +| 2026-06-02 | 4 | 2 | 2 | +| 2026-06-03 | 3 | 1 | 2 | +| 2026-06-04 | 2 | 1 | 1 | +| 2026-06-05 | 3 | 2 | 1 | +| 2026-06-06 | 2 | 1 | 1 | +| **合计** | **19** | **10** | **9** | + +#### 预约数据分布 + +| 日期 | 预约总数 | 取消预约 | 实际到场 | 满员课程数 | +|------|---------|---------|---------|-----------| +| 2026-06-01 | 32 | 5 | 27 | 1 | +| 2026-06-02 | 30 | 3 | 27 | 0 | +| 2026-06-03 | 35 | 4 | 31 | 2 | +| 2026-06-04 | 28 | 2 | 26 | 1 | +| 2026-06-05 | 25 | 1 | 24 | 0 | +| 2026-06-06 | 22 | 1 | 21 | 0 | + +--- + +### 8.2 测试用例 + +#### 8.2.1 会员数据统计 + +**测试1：获取单日会员统计** + +```bash +curl -X GET "http://localhost:8080/api/stats/member/date/2026-06-01" +``` + +**预期结果**： +```json +{ + "date": "2026-06-01", + "newMembers": 5, + "activeMembers": 0, + "retainedMembers": 0, + "totalMembers": 19, + "maleMembers": 10, + "femaleMembers": 9, + "cardPurchaseCount": 19, + "averageAge": 29.5 +} +``` + +--- + +**测试2：获取日期范围会员统计** + +```bash +curl -X GET "http://localhost:8080/api/stats/member/range?startDate=2026-06-01&endDate=2026-06-03" +``` + +**预期结果**：返回3条记录，分别为 2026-06-01、2026-06-02、2026-06-03 的统计数据。 + +--- + +**测试3：获取会员统计汇总** + +```bash +curl -X GET "http://localhost:8080/api/stats/member/summary?startDate=2026-06-01&endDate=2026-06-06" +``` + +**预期结果**： +```json +{ + "startDate": "2026-06-01", + "endDate": "2026-06-06", + "newMembers": 19, + "activeMembers": 0, + "totalMembers": 19, + "maleMembers": 10, + "femaleMembers": 9, + "cardPurchaseCount": 19, + "averageAge": 29.5 +} +``` + +--- + +#### 8.2.2 预约数据统计 + +**测试4：获取单日预约统计** + +```bash +curl -X GET "http://localhost:8080/api/stats/booking/date/2026-06-01" +``` + +**预期结果**： +```json +{ + "date": "2026-06-01", + "totalBookings": 32, + "cancelledBookings": 5, + "attendedBookings": 27, + "bookingSuccessRate": 0.0, + "cancellationRate": 15.63, + "attendanceRate": 84.38, + "popularCourseName": "燃脂单车", + "popularCourseCount": 19, + "totalCourses": 3, + "fullCourses": 1 +} +``` + +--- + +**测试5：获取日期范围预约统计** + +```bash +curl -X GET "http://localhost:8080/api/stats/booking/range?startDate=2026-06-01&endDate=2026-06-03" +``` + +**预期结果**：返回3条记录，分别为 2026-06-01、2026-06-02、2026-06-03 的统计数据。 + +--- + +**测试6：获取预约统计汇总** + +```bash +curl -X GET "http://localhost:8080/api/stats/booking/summary?startDate=2026-06-01&endDate=2026-06-06" +``` + +**预期结果**： +```json +{ + "startDate": "2026-06-01", + "endDate": "2026-06-06", + "totalBookings": 172, + "cancelledBookings": 16, + "attendedBookings": 156, + "cancellationRate": 9.30, + "attendanceRate": 90.70 +} +``` + +--- + +#### 8.2.3 数据导出 + +**测试7：导出会员统计数据** + +```bash +curl -X GET "http://localhost:8080/api/stats/export/member?startDate=2026-06-01&endDate=2026-06-03" \ + -H "Accept: text/csv" \ + --output member_stats.csv +``` + +**预期结果**：下载 CSV 文件，包含 2026-06-01 至 2026-06-03 的会员统计数据。 + +--- + +**测试8：导出预约统计数据** + +```bash +curl -X GET "http://localhost:8080/api/stats/export/booking?startDate=2026-06-01&endDate=2026-06-03" \ + -H "Accept: text/csv" \ + --output booking_stats.csv +``` + +**预期结果**：下载 CSV 文件，包含 2026-06-01 至 2026-06-03 的预约统计数据。 + +--- + +**测试9：导出全部统计数据** + +```bash +curl -X GET "http://localhost:8080/api/stats/export/all?startDate=2026-06-01&endDate=2026-06-03" \ + -H "Accept: text/csv" \ + --output all_stats.csv +``` + +**预期结果**：下载 CSV 文件，包含会员和预约的完整统计数据。 + +--- + +### 8.3 测试参数说明 + +#### 日期参数格式 + +所有日期参数必须使用 `yyyy-MM-dd` 格式，例如： +- ✅ `2026-06-01` +- ❌ `2026/06/01` +- ❌ `2026-6-1` +- ❌ `06-01-2026` + +#### 日期范围参数 + +| 参数 | 说明 | 示例 | +|-----|------|------| +| startDate | 开始日期（包含） | `2026-06-01` | +| endDate | 结束日期（包含） | `2026-06-06` | + +**注意事项**： +- `startDate` 必须 ≤ `endDate` +- 日期范围不能超过 365 天 +- 日期必须在测试数据范围内（2026-06-01 至 2026-06-10） + +--- + +### 8.4 常见测试场景 + +#### 场景1：测试单日统计 + +```bash +# 测试6月1日的会员和预约统计 +curl "http://localhost:8080/api/stats/member/date/2026-06-01" +curl "http://localhost:8080/api/stats/booking/date/2026-06-01" +``` + +--- + +#### 场景2：测试一周统计 + +```bash +# 测试6月第一周的统计 +curl "http://localhost:8080/api/stats/member/summary?startDate=2026-06-01&endDate=2026-06-06" +curl "http://localhost:8080/api/stats/booking/summary?startDate=2026-06-01&endDate=2026-06-06" +``` + +--- + +#### 场景3：测试数据导出 + +```bash +# 导出6月前3天的所有统计数据 +curl "http://localhost:8080/api/stats/export/all?startDate=2026-06-01&endDate=2026-06-03" \ + --output test_data.csv +``` + +--- + +### 8.5 错误测试用例 + +#### 测试10：日期格式错误 + +```bash +curl -X GET "http://localhost:8080/api/stats/member/date/2026/06/01" +``` + +**预期结果**：HTTP 400 Bad Request + +--- + +#### 测试11：日期范围无效 + +```bash +curl -X GET "http://localhost:8080/api/stats/member/range?startDate=2026-06-06&endDate=2026-06-01" +``` + +**预期结果**：HTTP 400 Bad Request + +--- + +#### 测试12：日期超出测试数据范围 + +```bash +curl -X GET "http://localhost:8080/api/stats/member/date/2025-01-01" +``` + +**预期结果**：HTTP 404 Not Found 或返回空数据 + +--- + +### 8.6 使用 Postman 测试 + +导入以下环境变量到 Postman： + +| 变量名 | 值 | 说明 | +|-------|---|------| +| `base_url` | `http://localhost:8080` | API 基础地址 | +| `test_start_date` | `2026-06-01` | 测试开始日期 | +| `test_end_date` | `2026-06-06` | 测试结束日期 | + +示例请求： + +``` +GET {{base_url}}/api/stats/member/date/2026-06-01 +GET {{base_url}}/api/stats/member/range?startDate={{test_start_date}}&endDate={{test_end_date}} +GET {{base_url}}/api/stats/booking/summary?startDate={{test_start_date}}&endDate={{test_end_date}} +``` diff --git a/gym-manage-api/gym-dataCount/.mvn/wrapper/maven-wrapper.properties b/gym-manage-api/gym-dataCount/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..216df05 --- /dev/null +++ b/gym-manage-api/gym-dataCount/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/gym-manage-api/gym-dataCount/pom.xml b/gym-manage-api/gym-dataCount/pom.xml new file mode 100644 index 0000000..792603e --- /dev/null +++ b/gym-manage-api/gym-dataCount/pom.xml @@ -0,0 +1,101 @@ + + + 4.0.0 + + cn.novalon.gym.manage + gym-manage-api + 1.0.0 + ../pom.xml + + cn.novalon.gym.manage + gym-dataCount + 1.0.0 + gym-dataCount + Data Statistics Module + + + + + + + + + + + + + + + 21 + + + + cn.novalon.gym.manage + manage-common + ${project.version} + + + cn.novalon.gym.manage + manage-db + ${project.version} + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-data-r2dbc + + + org.springframework.boot + spring-boot-starter-validation + + + org.springdoc + springdoc-openapi-starter-webflux-ui + + + org.springframework.boot + spring-boot-starter-test + test + + + io.swagger.core.v3 + swagger-annotations-jakarta + 2.2.43 + compile + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + cn.novalon.gym.manage + gym-member + ${project.version} + + + + + cn.novalon.gym.manage + gym-groupCourse + ${project.version} + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/GymDataCountApplication.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/GymDataCountApplication.java new file mode 100644 index 0000000..b17a83e --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/GymDataCountApplication.java @@ -0,0 +1,29 @@ +package cn.novalon.gym.manage.datacount; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.security.reactive.ReactiveUserDetailsServiceAutoConfiguration; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories; + +@SpringBootApplication(scanBasePackages = "cn.novalon.gym.manage", exclude = { + ReactiveUserDetailsServiceAutoConfiguration.class }) +@EnableR2dbcRepositories(basePackages = { + "cn.novalon.gym.manage.db.dao", + "cn.novalon.gym.manage.member.repository", + "cn.novalon.gym.manage.groupcourse.dao", + "cn.novalon.gym.manage.datacount.dao" +}) +@ComponentScan(basePackages = "cn.novalon.gym.manage") +public class GymDataCountApplication { + + private static final Logger logger = LoggerFactory.getLogger(GymDataCountApplication.class); + + public static void main(String[] args) { + logger.info("数据统计模块启动中..."); + SpringApplication.run(GymDataCountApplication.class, args); + logger.info("数据统计模块启动完成"); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/config/DataCountRouter.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/config/DataCountRouter.java new file mode 100644 index 0000000..2749d6c --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/config/DataCountRouter.java @@ -0,0 +1,34 @@ +package cn.novalon.gym.manage.datacount.config; + +import cn.novalon.gym.manage.datacount.handler.DataCountHandler; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.ServerResponse; + +import static org.springframework.web.reactive.function.server.RouterFunctions.route; + +@Configuration +public class DataCountRouter { + + @Bean + public RouterFunction dataCountRoutes(DataCountHandler dataCountHandler) { + return route() + // ========== 会员数据统计路由 ========== + .GET("/api/stats/member/date/{date}", dataCountHandler::getMemberStatisticsByDate) + .GET("/api/stats/member/range", dataCountHandler::getMemberStatisticsByDateRange) + .GET("/api/stats/member/summary", dataCountHandler::getMemberStatisticsSummary) + + // ========== 预约数据统计路由 ========== + .GET("/api/stats/booking/date/{date}", dataCountHandler::getBookingStatisticsByDate) + .GET("/api/stats/booking/range", dataCountHandler::getBookingStatisticsByDateRange) + .GET("/api/stats/booking/summary", dataCountHandler::getBookingStatisticsSummary) + + // ========== 数据导出路由 ========== + .GET("/api/stats/export/member", dataCountHandler::exportMemberStatistics) + .GET("/api/stats/export/booking", dataCountHandler::exportBookingStatistics) + .GET("/api/stats/export/all", dataCountHandler::exportAllStatistics) + + .build(); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/dao/StatisticsDao.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/dao/StatisticsDao.java new file mode 100644 index 0000000..d2530ab --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/dao/StatisticsDao.java @@ -0,0 +1,175 @@ +package cn.novalon.gym.manage.datacount.dao; + +import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; +import org.springframework.stereotype.Repository; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 统计数据访问层 + * 使用 R2dbcEntityTemplate 执行原生SQL查询 + * + * @author 数据统计模块 + * @date 2026-06-06 + */ +@Repository +public class StatisticsDao { + + private final R2dbcEntityTemplate r2dbcEntityTemplate; + + public StatisticsDao(R2dbcEntityTemplate r2dbcEntityTemplate) { + this.r2dbcEntityTemplate = r2dbcEntityTemplate; + } + + // ========== 会员数据统计 ========== + + public Mono countTotalMembers() { + String sql = "SELECT COUNT(*) FROM member_user WHERE is_deleted = FALSE"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono countNewMembersByDate(LocalDate date) { + String sql = "SELECT COUNT(*) FROM member_user WHERE is_deleted = FALSE AND DATE(created_at) = $1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, date) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono countActiveMembersByDate(LocalDate date) { + String sql = "SELECT COUNT(DISTINCT m.id) FROM member_user m LEFT JOIN member_card_record r ON m.id = r.member_id WHERE m.is_deleted = FALSE AND r.deleted_at IS NULL AND DATE(r.created_at) = $1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, date) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono countMaleMembers() { + String sql = "SELECT COUNT(*) FROM member_user WHERE is_deleted = FALSE AND gender = 1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono countFemaleMembers() { + String sql = "SELECT COUNT(*) FROM member_user WHERE is_deleted = FALSE AND gender = 2"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono countCardPurchaseByDate(LocalDate date) { + String sql = "SELECT COUNT(DISTINCT r.member_id) FROM member_card_record r WHERE r.deleted_at IS NULL AND DATE(r.created_at) = $1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, date) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono calculateAverageAge() { + String sql = "SELECT AVG(EXTRACT(YEAR FROM AGE(CURRENT_DATE, birthday))) FROM member_user WHERE is_deleted = FALSE AND birthday IS NOT NULL"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .map(row -> row.get(0, Double.class)) + .one(); + } + + public Mono countActiveMembersByTimeRange(LocalDateTime startTime, LocalDateTime endTime) { + String sql = "SELECT COUNT(*) FROM member_user WHERE is_deleted = FALSE AND last_login_at >= $1 AND last_login_at < $2"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, startTime) + .bind(1, endTime) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + // ========== 预约数据统计 ========== + + public Mono countTotalBookingsByDate(LocalDate date) { + String sql = "SELECT COUNT(*) FROM group_course_booking WHERE deleted_at IS NULL AND DATE(created_at) = $1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, date) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono countCancelledBookingsByDate(LocalDate date) { + String sql = "SELECT COUNT(*) FROM group_course_booking WHERE deleted_at IS NULL AND status = '1' AND DATE(cancel_time) = $1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, date) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono countAttendedBookingsByDate(LocalDate date) { + String sql = "SELECT COUNT(*) FROM group_course_booking WHERE deleted_at IS NULL AND status = '2' AND DATE(created_at) = $1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, date) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono countTotalCoursesByDate(LocalDate date) { + String sql = "SELECT COUNT(*) FROM group_course WHERE deleted_at IS NULL AND DATE(start_time) = $1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, date) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono countFullCoursesByDate(LocalDate date) { + String sql = "SELECT COUNT(*) FROM group_course WHERE deleted_at IS NULL AND current_members = max_members AND DATE(start_time) = $1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, date) + .map(row -> row.get(0, Integer.class)) + .one(); + } + + public Mono findMostPopularCourseByDate(LocalDate date) { + String sql = "SELECT c.course_name, COUNT(b.id) as booking_count FROM group_course_booking b LEFT JOIN group_course c ON b.course_id = c.id WHERE b.deleted_at IS NULL AND c.deleted_at IS NULL AND DATE(b.created_at) = $1 GROUP BY c.id, c.course_name ORDER BY booking_count DESC LIMIT 1"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, date) + .map(row -> new Object[]{row.get(0, String.class), row.get(1, Integer.class)}) + .one(); + } + + // ========== 日期范围查询 ========== + + public Flux findMemberStatisticsByDateRange(LocalDate startDate, LocalDate endDate) { + String sql = "SELECT DATE(m.created_at) as date, COUNT(*) as new_members FROM member_user m WHERE m.is_deleted = FALSE AND DATE(m.created_at) BETWEEN $1 AND $2 GROUP BY DATE(m.created_at) ORDER BY date"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, startDate) + .bind(1, endDate) + .map(row -> new Object[]{row.get(0, LocalDate.class), row.get(1, Integer.class)}) + .all(); + } + + public Flux findBookingStatisticsByDateRange(LocalDate startDate, LocalDate endDate) { + String sql = "SELECT DATE(b.created_at) as date, COUNT(*) as total_bookings, SUM(CASE WHEN b.status = '1' THEN 1 ELSE 0 END) as cancelled_bookings, SUM(CASE WHEN b.status = '2' THEN 1 ELSE 0 END) as attended_bookings FROM group_course_booking b WHERE b.deleted_at IS NULL AND DATE(b.created_at) BETWEEN $1 AND $2 GROUP BY DATE(b.created_at) ORDER BY date"; + return r2dbcEntityTemplate.getDatabaseClient() + .sql(sql) + .bind(0, startDate) + .bind(1, endDate) + .map(row -> new Object[]{row.get(0, LocalDate.class), row.get(1, Integer.class), row.get(2, Integer.class), row.get(3, Integer.class)}) + .all(); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/BookingStatistics.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/BookingStatistics.java new file mode 100644 index 0000000..814e3cf --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/BookingStatistics.java @@ -0,0 +1,169 @@ +package cn.novalon.gym.manage.datacount.domain; + +import io.swagger.v3.oas.annotations.media.Schema; + +import java.time.LocalDate; + +@Schema(description = "预约数据统计") +public class BookingStatistics { + + @Schema(description = "统计日期", example = "2026-01-01") + private LocalDate date; + + @Schema(description = "预约总数", example = "100") + private Integer totalBookings; + + @Schema(description = "取消预约数", example = "10") + private Integer cancelledBookings; + + @Schema(description = "实际到场数", example = "85") + private Integer attendedBookings; + + @Schema(description = "预约成功率", example = "0.85") + private Double bookingSuccessRate; + + @Schema(description = "取消率", example = "0.10") + private Double cancellationRate; + + @Schema(description = "到场率", example = "0.85") + private Double attendanceRate; + + @Schema(description = "热门课程名称", example = "动感单车") + private String popularCourseName; + + @Schema(description = "热门课程预约数", example = "25") + private Integer popularCourseCount; + + @Schema(description = "团课总数", example = "20") + private Integer totalCourses; + + @Schema(description = "满员课程数", example = "5") + private Integer fullCourses; + + @Schema(description = "开始日期（用于汇总统计）") + private LocalDate startDate; + + @Schema(description = "结束日期（用于汇总统计）") + private LocalDate endDate; + + public BookingStatistics() { + } + + public BookingStatistics(LocalDate date) { + this.date = date; + this.totalBookings = 0; + this.cancelledBookings = 0; + this.attendedBookings = 0; + this.bookingSuccessRate = 0.0; + this.cancellationRate = 0.0; + this.attendanceRate = 0.0; + this.popularCourseName = ""; + this.popularCourseCount = 0; + this.totalCourses = 0; + this.fullCourses = 0; + } + + public LocalDate getDate() { + return date; + } + + public void setDate(LocalDate date) { + this.date = date; + } + + public Integer getTotalBookings() { + return totalBookings; + } + + public void setTotalBookings(Integer totalBookings) { + this.totalBookings = totalBookings; + } + + public Integer getCancelledBookings() { + return cancelledBookings; + } + + public void setCancelledBookings(Integer cancelledBookings) { + this.cancelledBookings = cancelledBookings; + } + + public Integer getAttendedBookings() { + return attendedBookings; + } + + public void setAttendedBookings(Integer attendedBookings) { + this.attendedBookings = attendedBookings; + } + + public Double getBookingSuccessRate() { + return bookingSuccessRate; + } + + public void setBookingSuccessRate(Double bookingSuccessRate) { + this.bookingSuccessRate = bookingSuccessRate; + } + + public Double getCancellationRate() { + return cancellationRate; + } + + public void setCancellationRate(Double cancellationRate) { + this.cancellationRate = cancellationRate; + } + + public Double getAttendanceRate() { + return attendanceRate; + } + + public void setAttendanceRate(Double attendanceRate) { + this.attendanceRate = attendanceRate; + } + + public String getPopularCourseName() { + return popularCourseName; + } + + public void setPopularCourseName(String popularCourseName) { + this.popularCourseName = popularCourseName; + } + + public Integer getPopularCourseCount() { + return popularCourseCount; + } + + public void setPopularCourseCount(Integer popularCourseCount) { + this.popularCourseCount = popularCourseCount; + } + + public Integer getTotalCourses() { + return totalCourses; + } + + public void setTotalCourses(Integer totalCourses) { + this.totalCourses = totalCourses; + } + + public Integer getFullCourses() { + return fullCourses; + } + + public void setFullCourses(Integer fullCourses) { + this.fullCourses = fullCourses; + } + + public LocalDate getStartDate() { + return startDate; + } + + public void setStartDate(LocalDate startDate) { + this.startDate = startDate; + } + + public LocalDate getEndDate() { + return endDate; + } + + public void setEndDate(LocalDate endDate) { + this.endDate = endDate; + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/MemberStatistics.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/MemberStatistics.java new file mode 100644 index 0000000..3a31390 --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/MemberStatistics.java @@ -0,0 +1,145 @@ +package cn.novalon.gym.manage.datacount.domain; + +import io.swagger.v3.oas.annotations.media.Schema; + +import java.time.LocalDate; + +@Schema(description = "会员数据统计") +public class MemberStatistics { + + @Schema(description = "统计日期", example = "2026-01-01") + private LocalDate date; + + @Schema(description = "新增会员数", example = "10") + private Integer newMembers; + + @Schema(description = "活跃会员数", example = "50") + private Integer activeMembers; + + @Schema(description = "留存会员数", example = "45") + private Integer retainedMembers; + + @Schema(description = "总会员数", example = "200") + private Integer totalMembers; + + @Schema(description = "男性会员数", example = "100") + private Integer maleMembers; + + @Schema(description = "女性会员数", example = "100") + private Integer femaleMembers; + + @Schema(description = "会员卡购买人数", example = "30") + private Integer cardPurchaseCount; + + @Schema(description = "平均年龄", example = "28") + private Double averageAge; + + @Schema(description = "开始日期（用于汇总统计）") + private LocalDate startDate; + + @Schema(description = "结束日期（用于汇总统计）") + private LocalDate endDate; + + public MemberStatistics() { + } + + public MemberStatistics(LocalDate date) { + this.date = date; + this.newMembers = 0; + this.activeMembers = 0; + this.retainedMembers = 0; + this.totalMembers = 0; + this.maleMembers = 0; + this.femaleMembers = 0; + this.cardPurchaseCount = 0; + this.averageAge = 0.0; + } + + public LocalDate getDate() { + return date; + } + + public void setDate(LocalDate date) { + this.date = date; + } + + public Integer getNewMembers() { + return newMembers; + } + + public void setNewMembers(Integer newMembers) { + this.newMembers = newMembers; + } + + public Integer getActiveMembers() { + return activeMembers; + } + + public void setActiveMembers(Integer activeMembers) { + this.activeMembers = activeMembers; + } + + public Integer getRetainedMembers() { + return retainedMembers; + } + + public void setRetainedMembers(Integer retainedMembers) { + this.retainedMembers = retainedMembers; + } + + public Integer getTotalMembers() { + return totalMembers; + } + + public void setTotalMembers(Integer totalMembers) { + this.totalMembers = totalMembers; + } + + public Integer getMaleMembers() { + return maleMembers; + } + + public void setMaleMembers(Integer maleMembers) { + this.maleMembers = maleMembers; + } + + public Integer getFemaleMembers() { + return femaleMembers; + } + + public void setFemaleMembers(Integer femaleMembers) { + this.femaleMembers = femaleMembers; + } + + public Integer getCardPurchaseCount() { + return cardPurchaseCount; + } + + public void setCardPurchaseCount(Integer cardPurchaseCount) { + this.cardPurchaseCount = cardPurchaseCount; + } + + public Double getAverageAge() { + return averageAge; + } + + public void setAverageAge(Double averageAge) { + this.averageAge = averageAge; + } + + public LocalDate getStartDate() { + return startDate; + } + + public void setStartDate(LocalDate startDate) { + this.startDate = startDate; + } + + public LocalDate getEndDate() { + return endDate; + } + + public void setEndDate(LocalDate endDate) { + this.endDate = endDate; + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/StatisticsExportDTO.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/StatisticsExportDTO.java new file mode 100644 index 0000000..ab38a15 --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/domain/StatisticsExportDTO.java @@ -0,0 +1,90 @@ +package cn.novalon.gym.manage.datacount.domain; + +import io.swagger.v3.oas.annotations.media.Schema; + +import java.time.LocalDate; +import java.util.List; + +@Schema(description = "统计数据导出DTO") +public class StatisticsExportDTO { + + @Schema(description = "导出文件名", example = "statistics_report_20260101") + private String fileName; + + @Schema(description = "导出格式", example = "EXCEL") + private String format; + + @Schema(description = "开始日期", example = "2026-01-01") + private LocalDate startDate; + + @Schema(description = "结束日期", example = "2026-01-31") + private LocalDate endDate; + + @Schema(description = "导出类型", example = "MEMBER") + private String exportType; + + @Schema(description = "会员统计数据") + private List memberStatisticsList; + + @Schema(description = "预约统计数据") + private List bookingStatisticsList; + + public StatisticsExportDTO() { + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFormat() { + return format; + } + + public void setFormat(String format) { + this.format = format; + } + + public LocalDate getStartDate() { + return startDate; + } + + public void setStartDate(LocalDate startDate) { + this.startDate = startDate; + } + + public LocalDate getEndDate() { + return endDate; + } + + public void setEndDate(LocalDate endDate) { + this.endDate = endDate; + } + + public String getExportType() { + return exportType; + } + + public void setExportType(String exportType) { + this.exportType = exportType; + } + + public List getMemberStatisticsList() { + return memberStatisticsList; + } + + public void setMemberStatisticsList(List memberStatisticsList) { + this.memberStatisticsList = memberStatisticsList; + } + + public List getBookingStatisticsList() { + return bookingStatisticsList; + } + + public void setBookingStatisticsList(List bookingStatisticsList) { + this.bookingStatisticsList = bookingStatisticsList; + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/handler/DataCountHandler.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/handler/DataCountHandler.java new file mode 100644 index 0000000..a29e798 --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/handler/DataCountHandler.java @@ -0,0 +1,204 @@ +package cn.novalon.gym.manage.datacount.handler; + +import cn.novalon.gym.manage.datacount.domain.BookingStatistics; +import cn.novalon.gym.manage.datacount.domain.MemberStatistics; +import cn.novalon.gym.manage.datacount.service.IDataCountService; +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.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.Map; + +@Component +@Tag(name = "数据统计", description = "数据统计相关操作") +public class DataCountHandler { + + private final IDataCountService dataCountService; + + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + public DataCountHandler(IDataCountService dataCountService) { + this.dataCountService = dataCountService; + } + + @Operation(summary = "获取会员数据统计（按日期）", description = "获取指定日期的会员数据统计") + public Mono getMemberStatisticsByDate(ServerRequest request) { + String dateStr = request.pathVariable("date"); + LocalDate date = LocalDate.parse(dateStr, DATE_FORMATTER); + + return dataCountService.getMemberStatisticsByDate(date) + .flatMap(stats -> ServerResponse.ok().bodyValue(stats)) + .switchIfEmpty(ServerResponse.notFound().build()) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + } + + @Operation(summary = "获取会员数据统计（按日期范围）", description = "获取指定日期范围内的会员数据统计") + public Mono getMemberStatisticsByDateRange(ServerRequest request) { + String startDateStr = request.queryParam("startDate").orElseThrow(() -> new IllegalArgumentException("startDate必填")); + String endDateStr = request.queryParam("endDate").orElseThrow(() -> new IllegalArgumentException("endDate必填")); + + LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER); + LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER); + + return dataCountService.getMemberStatisticsByDateRange(startDate, endDate) + .collectList() + .flatMap(list -> ServerResponse.ok().bodyValue(list)) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + } + + @Operation(summary = "获取会员数据统计汇总", description = "获取指定日期范围内的会员数据统计汇总") + public Mono getMemberStatisticsSummary(ServerRequest request) { + String startDateStr = request.queryParam("startDate").orElseThrow(() -> new IllegalArgumentException("startDate必填")); + String endDateStr = request.queryParam("endDate").orElseThrow(() -> new IllegalArgumentException("endDate必填")); + + LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER); + LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER); + + return dataCountService.getMemberStatisticsSummary(startDate, endDate) + .flatMap(summary -> ServerResponse.ok().bodyValue(summary)) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + } + + @Operation(summary = "获取预约数据统计（按日期）", description = "获取指定日期的预约数据统计") + public Mono getBookingStatisticsByDate(ServerRequest request) { + String dateStr = request.pathVariable("date"); + LocalDate date = LocalDate.parse(dateStr, DATE_FORMATTER); + + return dataCountService.getBookingStatisticsByDate(date) + .flatMap(stats -> ServerResponse.ok().bodyValue(stats)) + .switchIfEmpty(ServerResponse.notFound().build()) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + } + + @Operation(summary = "获取预约数据统计（按日期范围）", description = "获取指定日期范围内的预约数据统计") + public Mono getBookingStatisticsByDateRange(ServerRequest request) { + String startDateStr = request.queryParam("startDate").orElseThrow(() -> new IllegalArgumentException("startDate必填")); + String endDateStr = request.queryParam("endDate").orElseThrow(() -> new IllegalArgumentException("endDate必填")); + + LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER); + LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER); + + return dataCountService.getBookingStatisticsByDateRange(startDate, endDate) + .collectList() + .flatMap(list -> ServerResponse.ok().bodyValue(list)) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + } + + @Operation(summary = "获取预约数据统计汇总", description = "获取指定日期范围内的预约数据统计汇总") + public Mono getBookingStatisticsSummary(ServerRequest request) { + String startDateStr = request.queryParam("startDate").orElseThrow(() -> new IllegalArgumentException("startDate必填")); + String endDateStr = request.queryParam("endDate").orElseThrow(() -> new IllegalArgumentException("endDate必填")); + + LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER); + LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER); + + return dataCountService.getBookingStatisticsSummary(startDate, endDate) + .flatMap(summary -> ServerResponse.ok().bodyValue(summary)) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + } + + @Operation(summary = "导出会员数据统计", description = "导出指定日期范围内的会员数据统计为CSV文件") + public Mono exportMemberStatistics(ServerRequest request) { + String startDateStr = request.queryParam("startDate").orElseThrow(() -> new IllegalArgumentException("startDate必填")); + String endDateStr = request.queryParam("endDate").orElseThrow(() -> new IllegalArgumentException("endDate必填")); + + LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER); + LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER); + + String fileName = "member_statistics_" + startDateStr + "_" + endDateStr + ".csv"; + + return dataCountService.exportMemberStatistics(startDate, endDate) + .flatMap(data -> ServerResponse.ok() + .header("Content-Disposition", "attachment; filename=" + fileName) + .header("Content-Type", "text/csv; charset=UTF-8") + .bodyValue(data)) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + } + + @Operation(summary = "导出预约数据统计", description = "导出指定日期范围内的预约数据统计为CSV文件") + public Mono exportBookingStatistics(ServerRequest request) { + String startDateStr = request.queryParam("startDate").orElseThrow(() -> new IllegalArgumentException("startDate必填")); + String endDateStr = request.queryParam("endDate").orElseThrow(() -> new IllegalArgumentException("endDate必填")); + + LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER); + LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER); + + String fileName = "booking_statistics_" + startDateStr + "_" + endDateStr + ".csv"; + + return dataCountService.exportBookingStatistics(startDate, endDate) + .flatMap(data -> ServerResponse.ok() + .header("Content-Disposition", "attachment; filename=" + fileName) + .header("Content-Type", "text/csv; charset=UTF-8") + .bodyValue(data)) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + } + + @Operation(summary = "导出全部统计数据", description = "导出指定日期范围内的会员和预约数据统计为CSV文件") + public Mono exportAllStatistics(ServerRequest request) { + String startDateStr = request.queryParam("startDate").orElseThrow(() -> new IllegalArgumentException("startDate必填")); + String endDateStr = request.queryParam("endDate").orElseThrow(() -> new IllegalArgumentException("endDate必填")); + + LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER); + LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER); + + String fileName = "all_statistics_" + startDateStr + "_" + endDateStr + ".csv"; + + return dataCountService.exportAllStatistics(startDate, endDate) + .flatMap(data -> ServerResponse.ok() + .header("Content-Disposition", "attachment; filename=" + fileName) + .header("Content-Type", "text/csv; charset=UTF-8") + .bodyValue(data)) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/scheduler/StatisticsDailyScheduler.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/scheduler/StatisticsDailyScheduler.java new file mode 100644 index 0000000..73da48c --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/scheduler/StatisticsDailyScheduler.java @@ -0,0 +1,91 @@ +package cn.novalon.gym.manage.datacount.scheduler; + +import cn.novalon.gym.manage.datacount.service.IDataCountService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.time.LocalDate; + +/** + * 数据统计定时任务 + * + * 功能：每日凌晨1点自动计算前一天的数据统计并缓存到Redis + * + * @author 数据统计模块 + * @date 2026-06-06 + */ +@Component +public class StatisticsDailyScheduler { + + private static final Logger logger = LoggerFactory.getLogger(StatisticsDailyScheduler.class); + + private final IDataCountService dataCountService; + + public StatisticsDailyScheduler(IDataCountService dataCountService) { + this.dataCountService = dataCountService; + } + + /** + * 每日凌晨1点执行前一天的统计数据计算并缓存 + * cron表达式：秒 分 时 日 月 周 + */ + @Scheduled(cron = "0 0 1 * * ?") + public void calculateDailyStatistics() { + LocalDate yesterday = LocalDate.now().minusDays(1); + logger.info("定时任务开始计算 {} 的数据统计", yesterday); + + dataCountService.getMemberStatisticsByDate(yesterday) + .doOnSuccess(stats -> logger.info("会员统计计算完成: date={}, newMembers={}, totalMembers={}", + yesterday, stats.getNewMembers(), stats.getTotalMembers())) + .doOnError(error -> logger.error("会员统计计算失败: date={}", yesterday, error)) + .subscribe(); + + dataCountService.getBookingStatisticsByDate(yesterday) + .doOnSuccess(stats -> logger.info("预约统计计算完成: date={}, totalBookings={}, attendanceRate={}%", + yesterday, stats.getTotalBookings(), stats.getAttendanceRate())) + .doOnError(error -> logger.error("预约统计计算失败: date={}", yesterday, error)) + .subscribe(); + } + + /** + * 每周一凌晨2点执行上周的数据汇总统计 + */ + @Scheduled(cron = "0 0 2 * * 1") + public void calculateWeeklyStatistics() { + LocalDate lastWeekEnd = LocalDate.now().minusDays(1); + LocalDate lastWeekStart = lastWeekEnd.minusDays(6); + logger.info("定时任务开始计算上周汇总统计: {} ~ {}", lastWeekStart, lastWeekEnd); + + dataCountService.getMemberStatisticsSummary(lastWeekStart, lastWeekEnd) + .doOnSuccess(stats -> logger.info("上周会员汇总统计完成: newMembers={}", stats.getNewMembers())) + .doOnError(error -> logger.error("上周会员汇总统计失败", error)) + .subscribe(); + + dataCountService.getBookingStatisticsSummary(lastWeekStart, lastWeekEnd) + .doOnSuccess(stats -> logger.info("上周预约汇总统计完成: totalBookings={}", stats.getTotalBookings())) + .doOnError(error -> logger.error("上周预约汇总统计失败", error)) + .subscribe(); + } + + /** + * 每月1号凌晨3点执行上月的数据汇总统计 + */ + @Scheduled(cron = "0 0 3 1 * ?") + public void calculateMonthlyStatistics() { + LocalDate lastMonthEnd = LocalDate.now().minusDays(1); + LocalDate lastMonthStart = lastMonthEnd.withDayOfMonth(1); + logger.info("定时任务开始计算上月汇总统计: {} ~ {}", lastMonthStart, lastMonthEnd); + + dataCountService.getMemberStatisticsSummary(lastMonthStart, lastMonthEnd) + .doOnSuccess(stats -> logger.info("上月会员汇总统计完成: newMembers={}", stats.getNewMembers())) + .doOnError(error -> logger.error("上月会员汇总统计失败", error)) + .subscribe(); + + dataCountService.getBookingStatisticsSummary(lastMonthStart, lastMonthEnd) + .doOnSuccess(stats -> logger.info("上月预约汇总统计完成: totalBookings={}", stats.getTotalBookings())) + .doOnError(error -> logger.error("上月预约汇总统计失败", error)) + .subscribe(); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/service/IDataCountService.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/service/IDataCountService.java new file mode 100644 index 0000000..b70e647 --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/service/IDataCountService.java @@ -0,0 +1,30 @@ +package cn.novalon.gym.manage.datacount.service; + +import cn.novalon.gym.manage.datacount.domain.BookingStatistics; +import cn.novalon.gym.manage.datacount.domain.MemberStatistics; +import cn.novalon.gym.manage.datacount.domain.StatisticsExportDTO; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import java.time.LocalDate; + +public interface IDataCountService { + + Mono getMemberStatisticsByDate(LocalDate date); + + Flux getMemberStatisticsByDateRange(LocalDate startDate, LocalDate endDate); + + Mono getMemberStatisticsSummary(LocalDate startDate, LocalDate endDate); + + Mono getBookingStatisticsByDate(LocalDate date); + + Flux getBookingStatisticsByDateRange(LocalDate startDate, LocalDate endDate); + + Mono getBookingStatisticsSummary(LocalDate startDate, LocalDate endDate); + + Mono exportMemberStatistics(LocalDate startDate, LocalDate endDate); + + Mono exportBookingStatistics(LocalDate startDate, LocalDate endDate); + + Mono exportAllStatistics(LocalDate startDate, LocalDate endDate); +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/service/impl/DataCountServiceImpl.java b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/service/impl/DataCountServiceImpl.java new file mode 100644 index 0000000..9d12895 --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/java/cn/novalon/gym/manage/datacount/service/impl/DataCountServiceImpl.java @@ -0,0 +1,318 @@ +package cn.novalon.gym.manage.datacount.service.impl; + +import cn.novalon.gym.manage.common.util.RedisUtil; +import cn.novalon.gym.manage.datacount.dao.StatisticsDao; +import cn.novalon.gym.manage.datacount.domain.BookingStatistics; +import cn.novalon.gym.manage.datacount.domain.MemberStatistics; +import cn.novalon.gym.manage.datacount.service.IDataCountService; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import java.io.ByteArrayOutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Service +public class DataCountServiceImpl implements IDataCountService { + + private final StatisticsDao statisticsDao; + private final RedisUtil redisUtil; + private final ObjectMapper objectMapper; + + private static final String MEMBER_STATS_CACHE_PREFIX = "stats:member:"; + private static final String BOOKING_STATS_CACHE_PREFIX = "stats:booking:"; + private static final long CACHE_EXPIRE_SECONDS = 3600; + + public DataCountServiceImpl(StatisticsDao statisticsDao, RedisUtil redisUtil, ObjectMapper objectMapper) { + this.statisticsDao = statisticsDao; + this.redisUtil = redisUtil; + this.objectMapper = objectMapper; + } + + @Override + public Mono getMemberStatisticsByDate(LocalDate date) { + String cacheKey = MEMBER_STATS_CACHE_PREFIX + date.toString(); + return redisUtil.get(cacheKey) + .flatMap(cached -> { + if (cached != null) { + try { + MemberStatistics stats = objectMapper.readValue(cached.toString(), MemberStatistics.class); + log.debug("从缓存获取会员统计数据, date: {}", date); + return Mono.just(stats); + } catch (Exception e) { + log.warn("缓存数据解析失败, date: {}", date, e); + } + } + return Mono.empty(); + }) + .switchIfEmpty(fetchMemberStatisticsByDate(date) + .flatMap(stats -> { + try { + String json = objectMapper.writeValueAsString(stats); + return redisUtil.setWithExpire(cacheKey, json, CACHE_EXPIRE_SECONDS) + .then(Mono.just(stats)); + } catch (Exception e) { + log.warn("缓存会员统计数据失败, date: {}", date, e); + return Mono.just(stats); + } + })); + } + + private Mono fetchMemberStatisticsByDate(LocalDate date) { + return Mono.zip( + statisticsDao.countTotalMembers(), + statisticsDao.countNewMembersByDate(date), + statisticsDao.countActiveMembersByDate(date), + statisticsDao.countMaleMembers(), + statisticsDao.countFemaleMembers(), + statisticsDao.countCardPurchaseByDate(date), + statisticsDao.calculateAverageAge() + ).map(tuple -> { + MemberStatistics stats = new MemberStatistics(date); + stats.setTotalMembers(tuple.getT1()); + stats.setNewMembers(tuple.getT2()); + stats.setActiveMembers(tuple.getT3()); + stats.setMaleMembers(tuple.getT4()); + stats.setFemaleMembers(tuple.getT5()); + stats.setCardPurchaseCount(tuple.getT6()); + stats.setAverageAge(tuple.getT7() != null ? tuple.getT7() : 0.0); + return stats; + }); + } + + @Override + public Flux getMemberStatisticsByDateRange(LocalDate startDate, LocalDate endDate) { + return statisticsDao.findMemberStatisticsByDateRange(startDate, endDate) + .map(row -> { + LocalDate date = (LocalDate) row[0]; + MemberStatistics stats = new MemberStatistics(date); + stats.setNewMembers(((Number) row[1]).intValue()); + return stats; + }); + } + + @Override + public Mono getMemberStatisticsSummary(LocalDate startDate, LocalDate endDate) { + return getMemberStatisticsByDateRange(startDate, endDate) + .collectList() + .flatMap(list -> { + MemberStatistics summary = new MemberStatistics(); + summary.setStartDate(startDate); + summary.setEndDate(endDate); + summary.setNewMembers(list.stream().mapToInt(MemberStatistics::getNewMembers).sum()); + + return Mono.zip( + statisticsDao.countTotalMembers(), + statisticsDao.countMaleMembers(), + statisticsDao.countFemaleMembers(), + statisticsDao.calculateAverageAge() + ).map(tuple -> { + summary.setTotalMembers(tuple.getT1()); + summary.setMaleMembers(tuple.getT2()); + summary.setFemaleMembers(tuple.getT3()); + summary.setAverageAge(tuple.getT4() != null ? tuple.getT4() : 0.0); + return summary; + }); + }); + } + + @Override + public Mono getBookingStatisticsByDate(LocalDate date) { + String cacheKey = BOOKING_STATS_CACHE_PREFIX + date.toString(); + return redisUtil.get(cacheKey) + .flatMap(cached -> { + if (cached != null) { + try { + BookingStatistics stats = objectMapper.readValue(cached.toString(), BookingStatistics.class); + log.debug("从缓存获取预约统计数据, date: {}", date); + return Mono.just(stats); + } catch (Exception e) { + log.warn("缓存数据解析失败, date: {}", date, e); + } + } + return Mono.empty(); + }) + .switchIfEmpty(fetchBookingStatisticsByDate(date) + .flatMap(stats -> { + try { + String json = objectMapper.writeValueAsString(stats); + return redisUtil.setWithExpire(cacheKey, json, CACHE_EXPIRE_SECONDS) + .then(Mono.just(stats)); + } catch (Exception e) { + log.warn("缓存预约统计数据失败, date: {}", date, e); + return Mono.just(stats); + } + })); + } + + private Mono fetchBookingStatisticsByDate(LocalDate date) { + return Mono.zip( + statisticsDao.countTotalBookingsByDate(date), + statisticsDao.countCancelledBookingsByDate(date), + statisticsDao.countAttendedBookingsByDate(date), + statisticsDao.countTotalCoursesByDate(date), + statisticsDao.countFullCoursesByDate(date), + statisticsDao.findMostPopularCourseByDate(date) + ).map(tuple -> { + int totalBookings = tuple.getT1(); + int cancelledBookings = tuple.getT2(); + int attendedBookings = tuple.getT3(); + + BookingStatistics stats = new BookingStatistics(date); + stats.setTotalBookings(totalBookings); + stats.setCancelledBookings(cancelledBookings); + stats.setAttendedBookings(attendedBookings); + stats.setTotalCourses(tuple.getT4()); + stats.setFullCourses(tuple.getT5()); + + if (totalBookings > 0) { + stats.setCancellationRate(Math.round(cancelledBookings * 10000.0 / totalBookings) / 100.0); + stats.setAttendanceRate(Math.round(attendedBookings * 10000.0 / totalBookings) / 100.0); + } + + Object[] popularCourse = tuple.getT6(); + if (popularCourse != null && popularCourse.length >= 2) { + stats.setPopularCourseName((String) popularCourse[0]); + stats.setPopularCourseCount(((Number) popularCourse[1]).intValue()); + } + + return stats; + }); + } + + @Override + public Flux getBookingStatisticsByDateRange(LocalDate startDate, LocalDate endDate) { + return statisticsDao.findBookingStatisticsByDateRange(startDate, endDate) + .map(row -> { + LocalDate date = (LocalDate) row[0]; + int totalBookings = ((Number) row[1]).intValue(); + int cancelledBookings = ((Number) row[2]).intValue(); + int attendedBookings = ((Number) row[3]).intValue(); + + BookingStatistics stats = new BookingStatistics(date); + stats.setTotalBookings(totalBookings); + stats.setCancelledBookings(cancelledBookings); + stats.setAttendedBookings(attendedBookings); + + if (totalBookings > 0) { + stats.setCancellationRate(Math.round(cancelledBookings * 10000.0 / totalBookings) / 100.0); + stats.setAttendanceRate(Math.round(attendedBookings * 10000.0 / totalBookings) / 100.0); + } + + return stats; + }); + } + + @Override + public Mono getBookingStatisticsSummary(LocalDate startDate, LocalDate endDate) { + return getBookingStatisticsByDateRange(startDate, endDate) + .collectList() + .map(list -> { + BookingStatistics summary = new BookingStatistics(); + summary.setStartDate(startDate); + summary.setEndDate(endDate); + summary.setTotalBookings(list.stream().mapToInt(BookingStatistics::getTotalBookings).sum()); + summary.setCancelledBookings(list.stream().mapToInt(BookingStatistics::getCancelledBookings).sum()); + summary.setAttendedBookings(list.stream().mapToInt(BookingStatistics::getAttendedBookings).sum()); + + int total = summary.getTotalBookings(); + if (total > 0) { + summary.setCancellationRate(Math.round(summary.getCancelledBookings() * 10000.0 / total) / 100.0); + summary.setAttendanceRate(Math.round(summary.getAttendedBookings() * 10000.0 / total) / 100.0); + } + + return summary; + }); + } + + @Override + public Mono exportMemberStatistics(LocalDate startDate, LocalDate endDate) { + return getMemberStatisticsByDateRange(startDate, endDate) + .collectList() + .map(this::generateMemberStatisticsCSV); + } + + @Override + public Mono exportBookingStatistics(LocalDate startDate, LocalDate endDate) { + return getBookingStatisticsByDateRange(startDate, endDate) + .collectList() + .map(this::generateBookingStatisticsCSV); + } + + @Override + public Mono exportAllStatistics(LocalDate startDate, LocalDate endDate) { + return Mono.zip( + getMemberStatisticsByDateRange(startDate, endDate).collectList(), + getBookingStatisticsByDateRange(startDate, endDate).collectList() + ).map(tuple -> { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintWriter writer = new PrintWriter(new OutputStreamWriter(baos, StandardCharsets.UTF_8)); + + writer.println("=== 会员数据统计 ==="); + writer.println(generateMemberStatisticsCSVContent(tuple.getT1())); + writer.println(); + writer.println("=== 预约数据统计 ==="); + writer.println(generateBookingStatisticsCSVContent(tuple.getT2())); + + writer.flush(); + return baos.toByteArray(); + }); + } + + private byte[] generateMemberStatisticsCSV(List statsList) { + return generateMemberStatisticsCSVContent(statsList).getBytes(StandardCharsets.UTF_8); + } + + private String generateMemberStatisticsCSVContent(List statsList) { + StringBuilder sb = new StringBuilder(); + sb.append("统计日期,新增会员数,活跃会员数,总会员数,男性会员数,女性会员数,购卡人数,平均年龄\n"); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + for (MemberStatistics stats : statsList) { + sb.append(stats.getDate().format(formatter)).append(","); + sb.append(stats.getNewMembers()).append(","); + sb.append(stats.getActiveMembers()).append(","); + sb.append(stats.getTotalMembers()).append(","); + sb.append(stats.getMaleMembers()).append(","); + sb.append(stats.getFemaleMembers()).append(","); + sb.append(stats.getCardPurchaseCount()).append(","); + sb.append(String.format("%.1f", stats.getAverageAge())).append("\n"); + } + + return sb.toString(); + } + + private byte[] generateBookingStatisticsCSV(List statsList) { + return generateBookingStatisticsCSVContent(statsList).getBytes(StandardCharsets.UTF_8); + } + + private String generateBookingStatisticsCSVContent(List statsList) { + StringBuilder sb = new StringBuilder(); + sb.append("统计日期,预约总数,取消预约数,实际到场数,取消率(%),到场率(%),热门课程,热门课程预约数,团课总数,满员课程数\n"); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + for (BookingStatistics stats : statsList) { + sb.append(stats.getDate().format(formatter)).append(","); + sb.append(stats.getTotalBookings()).append(","); + sb.append(stats.getCancelledBookings()).append(","); + sb.append(stats.getAttendedBookings()).append(","); + sb.append(String.format("%.2f", stats.getCancellationRate())).append(","); + sb.append(String.format("%.2f", stats.getAttendanceRate())).append(","); + sb.append(stats.getPopularCourseName() != null ? stats.getPopularCourseName() : "").append(","); + sb.append(stats.getPopularCourseCount()).append(","); + sb.append(stats.getTotalCourses()).append(","); + sb.append(stats.getFullCourses()).append("\n"); + } + + return sb.toString(); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-dataCount/src/main/resources/application.yaml b/gym-manage-api/gym-dataCount/src/main/resources/application.yaml new file mode 100644 index 0000000..9d9181a --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/main/resources/application.yaml @@ -0,0 +1,3 @@ +spring: + application: + name: gym-dataCount diff --git a/gym-manage-api/gym-dataCount/src/test/java/cn/novalon/gym/manage/datacount/GymDataCountApplicationTests.java b/gym-manage-api/gym-dataCount/src/test/java/cn/novalon/gym/manage/datacount/GymDataCountApplicationTests.java new file mode 100644 index 0000000..6e5392e --- /dev/null +++ b/gym-manage-api/gym-dataCount/src/test/java/cn/novalon/gym/manage/datacount/GymDataCountApplicationTests.java @@ -0,0 +1,13 @@ +package cn.novalon.gym.manage.datacount; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class GymDataCountApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/gym-manage-api/log.text b/gym-manage-api/log.text index c2deea4..6ace75f 100644 --- a/gym-manage-api/log.text +++ b/gym-manage-api/log.text @@ -1,200 +1,19 @@ -2026-06-02T14:56:05.966+08:00 TRACE 22380 --- [gym-manage-api] [ctor-http-nio-7] o.s.w.s.adapter.HttpWebHandlerAdapter : [7ce54381-10] HTTP POST "/api/groupCourse/11/cancel", headers={masked} -2026-06-02T14:56:05.967+08:00 DEBUG 22380 --- [gym-manage-api] [ parallel-11] o.s.w.s.s.DefaultWebSessionManager : Created new WebSession. -2026-06-02T14:56:05.967+08:00 INFO 22380 --- [gym-manage-api] [ parallel-11] c.n.g.m.sys.audit.OperationLogWebFilter : WebFilter 拦截请求: POST /api/groupCourse/11/cancel -2026-06-02T14:56:05.967+08:00 INFO 22380 --- [gym-manage-api] [ parallel-11] c.n.g.m.sys.audit.OperationLogWebFilter : 未匹配到操作日志配置，跳过: POST /api/groupCourse/11/cancel -2026-06-02T14:56:05.967+08:00 INFO 22380 --- [gym-manage-api] [ parallel-11] c.n.g.m.sys.audit.OperationLogWebFilter : WebFilter 拦截请求: POST /api/groupCourse/11/cancel -2026-06-02T14:56:05.967+08:00 INFO 22380 --- [gym-manage-api] [ parallel-11] c.n.g.m.sys.audit.OperationLogWebFilter : 未匹配到操作日志配置，跳过: POST /api/groupCourse/11/cancel -2026-06-02T14:56:05.967+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.967+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.967+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/dictionaries" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/users" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/users/{id}/action/change-password" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/users/{id}/action/logical-delete" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/users/logical-delete" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/users/action/restore" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/users/{id}/action/restore" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/users/{id}/roles" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/menus" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/roles" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/roles/{id}/restore" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/roles/{id}/permissions" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/config" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/logs/login" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/logs/exception" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/logs/operation" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/auth/login" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/auth/register" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/auth/logout" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/dict/types" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/dict/data" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/notices" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/messages" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/files/upload" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/permissions" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.969+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member/auth/miniapp/login" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member/auth/mp/callback" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member/phone/bind" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/admin/member/{id}/phone" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member-cards" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member-card-records/purchase" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member-card-records/{recordId}/renew" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member-card-records/{recordId}/use" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member-card-records/{recordId}/refund" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member-card-records/process-expired" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/member-card-transactions" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/groupCourse/page" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "GET" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/groupCourse" does not match against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "PUT" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "DELETE" does not match against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Method "POST" matches against value "POST" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.server.RequestPredicates : Pattern "/api/groupCourse/{id}/cancel" matches against value "/api/groupCourse/11/cancel" -2026-06-02T14:56:05.970+08:00 TRACE 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.function.server.RouterFunctions : [7ce54381-10] Matched (POST && /api/groupCourse/{id}/cancel) -2026-06-02T14:56:05.970+08:00 DEBUG 22380 --- [gym-manage-api] [ parallel-11] o.s.w.r.f.s.s.RouterFunctionMapping : [7ce54381-10] Mapped to cn.novalon.gym.manage.app.config.SystemRouter$$Lambda/0x00000198019592d8@6903bec9 -2026-06-02T14:56:05.972+08:00 DEBUG 22380 --- [gym-manage-api] [ parallel-11] o.s.r2dbc.core.DefaultDatabaseClient : Executing SQL statement [SELECT group_course.course_name, group_course.coach_id, group_course.course_type, group_course.start_time, group_course.end_time, group_course.max_members, group_course.current_members, group_course.status, group_course.location, group_course.cover_image, group_course.description, group_course.point_card_amount, group_course.stored_value_amount, group_course.id, group_course.create_by, group_course.update_by, group_course.created_at, group_course.updated_at, group_course.deleted_at FROM group_course WHERE group_course.id = $1 AND (group_course.deleted_at IS NULL)] -2026-06-02T14:56:05.976+08:00 INFO 22380 --- [gym-manage-api] [actor-tcp-nio-5] c.n.g.m.g.c.GroupCourseConverter : 转换bean，entity-domain： -2026-06-02T14:56:05.976+08:00 ERROR 22380 --- [gym-manage-api] [actor-tcp-nio-5] c.n.g.m.g.s.impl.GroupCourseService : 团课取消失败 - id=11, error: 课程取消需提前24小时 -2026-06-02T14:56:05.976+08:00 TRACE 22380 --- [gym-manage-api] [actor-tcp-nio-5] org.springframework.web.HttpLogging : [7ce54381-10] Encoding [{success=false, message=课程取消需提前24小时}] -2026-06-02T14:56:05.976+08:00 TRACE 22380 --- [gym-manage-api] [actor-tcp-nio-5] o.s.w.s.adapter.HttpWebHandlerAdapter : [7ce54381-10] Completed 400 BAD_REQUEST, headers={masked} -2026-06-02T14:56:05.976+08:00 TRACE 22380 --- [gym-manage-api] [actor-tcp-nio-5] org.springframework.web.HttpLogging : [7ce54381-1, L:/[0:0:0:0:0:0:0:1]:8084 - R:/[0:0:0:0:0:0:0:1]:57674] Handling completed +2026-06-06T15:01:42.450+08:00 TRACE 20572 --- [gym-manage-api] [ctor-http-nio-3] o.s.w.s.adapter.HttpWebHandlerAdapter : [a300293b-3] HTTP GET "/api/stats/member/range?startDate=2026-06-01&endDate=2026-06-05", headers={masked} +2026-06-06T15:01:42.453+08:00 DEBUG 20572 --- [gym-manage-api] [ parallel-5] o.s.w.s.s.DefaultWebSessionManager : Created new WebSession. +2026-06-06T15:01:42.454+08:00 INFO 20572 --- [gym-manage-api] [ parallel-5] c.n.g.m.sys.audit.OperationLogWebFilter : WebFilter 拦截请求: GET /api/stats/member/range +2026-06-06T15:01:42.454+08:00 INFO 20572 --- [gym-manage-api] [ parallel-5] c.n.g.m.sys.audit.OperationLogWebFilter : 未匹配到操作日志配置，跳过: GET /api/stats/member/range +2026-06-06T15:01:42.454+08:00 INFO 20572 --- [gym-manage-api] [ parallel-5] c.n.g.m.sys.audit.OperationLogWebFilter : WebFilter 拦截请求: GET /api/stats/member/range +2026-06-06T15:01:42.455+08:00 INFO 20572 --- [gym-manage-api] [ parallel-5] c.n.g.m.sys.audit.OperationLogWebFilter : 未匹配到操作日志配置，跳过: GET /api/stats/member/range +2026-06-06T15:01:42.455+08:00 TRACE 20572 --- [gym-manage-api] [ parallel-5] o.s.w.r.f.server.RequestPredicates : Method "GET" matches against value "GET" +2026-06-06T15:01:42.455+08:00 TRACE 20572 --- [gym-manage-api] [ parallel-5] o.s.w.r.f.server.RequestPredicates : Pattern "/api/stats/member/date/{date}" does not match against value "/api/stats/member/range" +2026-06-06T15:01:42.455+08:00 TRACE 20572 --- [gym-manage-api] [ parallel-5] o.s.w.r.f.server.RequestPredicates : Method "GET" matches against value "GET" +2026-06-06T15:01:42.455+08:00 TRACE 20572 --- [gym-manage-api] [ parallel-5] o.s.w.r.f.server.RequestPredicates : Pattern "/api/stats/member/range" matches against value "/api/stats/member/range" +2026-06-06T15:01:42.455+08:00 TRACE 20572 --- [gym-manage-api] [ parallel-5] o.s.w.r.function.server.RouterFunctions : [a300293b-3] Matched (GET && /api/stats/member/range) +2026-06-06T15:01:42.455+08:00 DEBUG 20572 --- [gym-manage-api] [ parallel-5] o.s.w.r.f.s.s.RouterFunctionMapping : [a300293b-3] Mapped to cn.novalon.gym.manage.datacount.config.DataCountRouter$$Lambda/0x00000230b4931ec0@4746b319 +2026-06-06T15:01:42.455+08:00 DEBUG 20572 --- [gym-manage-api] [ parallel-5] o.s.r2dbc.core.DefaultDatabaseClient : Executing SQL statement [SELECT DATE(m.created_at) as date, COUNT(*) as new_members FROM member_user m WHERE m.is_deleted = FALSE AND DATE(m.created_at) BETWEEN $1 AND $2 GROUP BY DATE(m.created_at) ORDER BY date] +2026-06-06T15:01:42.460+08:00 TRACE 20572 --- [gym-manage-api] [actor-tcp-nio-2] org.springframework.web.HttpLogging : [a300293b-3] Encoding [{success=false, message=Cannot decode value of type java.sql.Date with OID 1082}] +2026-06-06T15:01:42.461+08:00 TRACE 20572 --- [gym-manage-api] [actor-tcp-nio-2] o.s.w.s.adapter.HttpWebHandlerAdapter : [a300293b-3] Completed 400 BAD_REQUEST, headers={masked} +2026-06-06T15:01:42.461+08:00 TRACE 20572 --- [gym-manage-api] [actor-tcp-nio-2] org.springframework.web.HttpLogging : [f8ae8809, L:/[0:0:0:0:0:0:0:1]:8084 ! R:/[0:0:0:0:0:0:0:1]:63191] Handling completed +2026-06-06T15:02:07.299+08:00 INFO 20572 --- [gym-manage-api] [ scheduling-1] c.n.g.m.g.s.i.GroupCourseBookingService : 开始处理已开始课程但未到场会员的预约记录 +2026-06-06T15:02:07.301+08:00 DEBUG 20572 --- [gym-manage-api] [ scheduling-1] o.s.r2dbc.core.DefaultDatabaseClient : Executing SQL statement [SELECT b.* FROM group_course_booking b JOIN group_course c ON b.course_id = c.id WHERE b.status = '0' AND b.deleted_at IS NULL AND c.deleted_at IS NULL AND c.status = '0' AND c.start_time < CURRENT_TIMESTAMP] +2026-06-06T15:02:07.305+08:00 INFO 20572 --- [gym-manage-api] [actor-tcp-nio-2] c.n.g.m.g.s.i.GroupCourseBookingService : 没有需要处理的缺席会员记录 diff --git a/gym-manage-api/manage-app/pom.xml b/gym-manage-api/manage-app/pom.xml index 11b6479..1aa0195 100644 --- a/gym-manage-api/manage-app/pom.xml +++ b/gym-manage-api/manage-app/pom.xml @@ -149,6 +149,12 @@ 1.0.0 compile + + cn.novalon.gym.manage + gym-dataCount + 1.0.0 + compile + diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V13__Insert_DataCount_Test_Data.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V13__Insert_DataCount_Test_Data.sql new file mode 100644 index 0000000..91da472 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V13__Insert_DataCount_Test_Data.sql @@ -0,0 +1,443 @@ +-- V13: 数据统计模块测试数据 +-- 测试场景： +-- 1. 会员数据统计（新增会员、活跃会员、性别分布、平均年龄、购卡人数） +-- 2. 预约数据统计（预约总数、取消预约、实际到场、热门课程、满员课程） +-- 3. 数据导出功能测试 +-- 日期范围：2026-06-01 至 2026-06-10 + +-- ============================================ +-- 1. 创建测试会员用户（分布在不同日期注册，不同性别，不同生日） +-- ============================================ + +-- 2026-06-01 注册的会员（5人：3男2女） +INSERT INTO member_user (member_no, nickname, phone, gender, birthday, is_deleted, created_at, updated_at, last_login_at) VALUES + ('MEM_STAT_001', '测试会员_男1', '13900001001', 1, '1995-03-15', false, '2026-06-01 09:00:00', '2026-06-01 09:00:00', '2026-06-05 20:00:00'), + ('MEM_STAT_002', '测试会员_男2', '13900001002', 1, '1990-07-20', false, '2026-06-01 10:30:00', '2026-06-01 10:30:00', '2026-06-06 18:00:00'), + ('MEM_STAT_003', '测试会员_男3', '13900001003', 1, '1988-11-08', false, '2026-06-01 14:00:00', '2026-06-01 14:00:00', '2026-06-04 19:30:00'), + ('MEM_STAT_004', '测试会员_女1', '13900001004', 2, '1998-01-25', false, '2026-06-01 16:00:00', '2026-06-01 16:00:00', '2026-06-06 08:00:00'), + ('MEM_STAT_005', '测试会员_女2', '13900001005', 2, '1992-05-10', false, '2026-06-01 18:00:00', '2026-06-01 18:00:00', '2026-06-03 21:00:00'); + +-- 2026-06-02 注册的会员（4人：2男2女） +INSERT INTO member_user (member_no, nickname, phone, gender, birthday, is_deleted, created_at, updated_at, last_login_at) VALUES + ('MEM_STAT_006', '测试会员_男4', '13900001006', 1, '1985-09-12', false, '2026-06-02 09:00:00', '2026-06-02 09:00:00', '2026-06-06 10:00:00'), + ('MEM_STAT_007', '测试会员_男5', '13900001007', 1, '1996-04-18', false, '2026-06-02 11:00:00', '2026-06-02 11:00:00', '2026-06-05 15:00:00'), + ('MEM_STAT_008', '测试会员_女3', '13900001008', 2, '1993-08-30', false, '2026-06-02 13:00:00', '2026-06-02 13:00:00', '2026-06-06 12:00:00'), + ('MEM_STAT_009', '测试会员_女4', '13900001009', 2, '1991-12-05', false, '2026-06-02 15:00:00', '2026-06-02 15:00:00', '2026-06-04 14:00:00'); + +-- 2026-06-03 注册的会员（3人：1男2女） +INSERT INTO member_user (member_no, nickname, phone, gender, birthday, is_deleted, created_at, updated_at, last_login_at) VALUES + ('MEM_STAT_010', '测试会员_男6', '13900001010', 1, '1989-06-22', false, '2026-06-03 10:00:00', '2026-06-03 10:00:00', '2026-06-06 09:00:00'), + ('MEM_STAT_011', '测试会员_女5', '13900001011', 2, '1997-02-14', false, '2026-06-03 14:00:00', '2026-06-03 14:00:00', '2026-06-05 16:00:00'), + ('MEM_STAT_012', '测试会员_女6', '13900001012', 2, '1994-10-28', false, '2026-06-03 16:00:00', '2026-06-03 16:00:00', '2026-06-06 11:00:00'); + +-- 2026-06-04 注册的会员（2人：1男1女） +INSERT INTO member_user (member_no, nickname, phone, gender, birthday, is_deleted, created_at, updated_at, last_login_at) VALUES + ('MEM_STAT_013', '测试会员_男7', '13900001013', 1, '1987-01-03', false, '2026-06-04 09:00:00', '2026-06-04 09:00:00', '2026-06-06 13:00:00'), + ('MEM_STAT_014', '测试会员_女7', '13900001014', 2, '1999-07-17', false, '2026-06-04 11:00:00', '2026-06-04 11:00:00', '2026-06-05 17:00:00'); + +-- 2026-06-05 注册的会员（3人：2男1女） +INSERT INTO member_user (member_no, nickname, phone, gender, birthday, is_deleted, created_at, updated_at, last_login_at) VALUES + ('MEM_STAT_015', '测试会员_男8', '13900001015', 1, '1990-03-09', false, '2026-06-05 10:00:00', '2026-06-05 10:00:00', '2026-06-06 14:00:00'), + ('MEM_STAT_016', '测试会员_男9', '13900001016', 1, '1986-11-21', false, '2026-06-05 13:00:00', '2026-06-05 13:00:00', '2026-06-06 15:00:00'), + ('MEM_STAT_017', '测试会员_女8', '13900001017', 2, '1995-09-06', false, '2026-06-05 15:00:00', '2026-06-05 15:00:00', '2026-06-05 18:00:00'); + +-- 2026-06-06 注册的会员（2人：1男1女） +INSERT INTO member_user (member_no, nickname, phone, gender, birthday, is_deleted, created_at, updated_at, last_login_at) VALUES + ('MEM_STAT_018', '测试会员_男10', '13900001018', 1, '1993-05-14', false, '2026-06-06 09:00:00', '2026-06-06 09:00:00', '2026-06-06 16:00:00'), + ('MEM_STAT_019', '测试会员_女9', '13900001019', 2, '1991-08-19', false, '2026-06-06 11:00:00', '2026-06-06 11:00:00', '2026-06-06 17:00:00'); + +-- 已删除的会员（1人，用于测试软删除过滤） +INSERT INTO member_user (member_no, nickname, phone, gender, birthday, is_deleted, created_at, updated_at, last_login_at) VALUES + ('MEM_STAT_DEL', '已删除会员', '13900001999', 1, '1980-01-01', true, '2026-06-01 08:00:00', '2026-06-01 08:00:00', '2026-06-01 08:00:00'); + +-- ============================================ +-- 2. 创建会员卡类型（如果不存在） +-- ============================================ + +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) +SELECT '月卡', 'TIME_CARD', 299.00, 30, NULL, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00' +WHERE NOT EXISTS (SELECT 1 FROM member_card WHERE member_card_name = '月卡'); + +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) +SELECT '季卡', 'TIME_CARD', 799.00, 90, NULL, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00' +WHERE NOT EXISTS (SELECT 1 FROM member_card WHERE member_card_name = '季卡'); + +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) +SELECT '次卡20次', 'COUNT_CARD', 599.00, NULL, 20, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00' +WHERE NOT EXISTS (SELECT 1 FROM member_card WHERE member_card_name = '次卡20次'); + +-- ============================================ +-- 3. 为所有测试会员创建会员卡记录 +-- ============================================ + +-- MEM_STAT_001 至 MEM_STAT_019 全部创建会员卡记录 +-- 使用月卡类型，有效期至 2026-12-31 +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) +SELECT + m.id, + (SELECT id FROM member_card WHERE member_card_name = '月卡'), + 'ACTIVE', + 0, + 0.00, + '2026-12-31 23:59:59', + m.created_at, + 0, + '{}', + m.created_at, + m.created_at +FROM member_user m +WHERE m.member_no LIKE 'MEM_STAT_%' AND m.member_no != 'MEM_STAT_DEL'; + +-- ============================================ +-- 4. 创建团课课程（2026-06-01 至 2026-06-10） +-- ============================================ + +-- 2026-06-01 的课程 +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 + ('晨间瑜伽', 101, 1, '2026-06-01 07:00:00', '2026-06-01 08:00:00', 15, 12, '0', '瑜伽教室A', '清晨唤醒瑜伽', 1, 30.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('燃脂单车', 102, 2, '2026-06-01 18:00:00', '2026-06-01 19:00:00', 25, 25, '0', '单车房', '高强度燃脂骑行', 1, 35.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('普拉提核心', 103, 1, '2026-06-01 19:30:00', '2026-06-01 20:30:00', 12, 8, '0', '普拉提教室', '核心力量训练', 1, 40.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'); + +-- 2026-06-02 的课程 +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 + ('流瑜伽', 101, 1, '2026-06-02 09:00:00', '2026-06-02 10:30:00', 15, 10, '0', '瑜伽教室A', '流畅体式连接', 1, 30.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('搏击操', 102, 2, '2026-06-02 18:30:00', '2026-06-02 19:30:00', 20, 18, '0', '综合训练区', '有氧搏击训练', 1, 35.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('冥想放松', 101, 1, '2026-06-02 20:00:00', '2026-06-02 21:00:00', 20, 5, '0', '冥想室', '深度放松冥想', 1, 25.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'); + +-- 2026-06-03 的课程 +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 + ('哈他瑜伽', 101, 1, '2026-06-03 10:00:00', '2026-06-03 11:30:00', 12, 12, '0', '瑜伽教室B', '基础哈他瑜伽', 1, 30.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('动感单车', 102, 2, '2026-06-03 19:00:00', '2026-06-03 20:00:00', 25, 20, '0', '单车房', '音乐节奏骑行', 1, 35.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('拉伸放松', 103, 1, '2026-06-03 20:30:00', '2026-06-03 21:30:00', 15, 6, '0', '综合训练区', '全身拉伸放松', 1, 25.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'); + +-- 2026-06-04 的课程 +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 + ('力量瑜伽', 101, 1, '2026-06-04 08:00:00', '2026-06-04 09:30:00', 15, 14, '0', '瑜伽教室A', '力量型瑜伽', 1, 35.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('HIIT训练', 102, 2, '2026-06-04 18:00:00', '2026-06-04 19:00:00', 20, 20, '0', '综合训练区', '高强度间歇训练', 1, 40.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('阴瑜伽', 101, 1, '2026-06-04 20:00:00', '2026-06-04 21:30:00', 12, 9, '0', '瑜伽教室B', '静态阴瑜伽', 1, 30.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'); + +-- 2026-06-05 的课程 +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 + ('晨间冥想', 101, 1, '2026-06-05 07:00:00', '2026-06-05 08:00:00', 20, 15, '0', '冥想室', '清晨冥想', 1, 25.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('尊巴舞', 103, 2, '2026-06-05 18:30:00', '2026-06-05 19:30:00', 25, 22, '0', '舞蹈室', '拉丁风格舞蹈', 1, 35.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('空中瑜伽', 101, 1, '2026-06-05 20:00:00', '2026-06-05 21:30:00', 10, 10, '0', '瑜伽教室A', '空中瑜伽体验', 1, 45.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'); + +-- 2026-06-06 的课程 +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 + ('拜日式瑜伽', 101, 1, '2026-06-06 07:30:00', '2026-06-06 08:30:00', 15, 11, '0', '瑜伽教室A', '传统拜日式', 1, 30.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('杠铃操', 102, 2, '2026-06-06 18:00:00', '2026-06-06 19:00:00', 20, 16, '0', '力量区', '全身杠铃训练', 1, 35.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'), + ('修复瑜伽', 101, 1, '2026-06-06 20:00:00', '2026-06-06 21:00:00', 12, 7, '0', '瑜伽教室B', '修复性瑜伽', 1, 30.00, 'admin', '2026-05-28 10:00:00', '2026-05-28 10:00:00'); + +-- ============================================ +-- 5. 团课预约记录（测试预约统计） +-- ============================================ + +-- 2026-06-01 的预约记录 +-- 晨间瑜伽：5人预约（4人出席，1人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) VALUES + ((SELECT id FROM group_course WHERE course_name = '晨间瑜伽' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_001'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_001')), '2026-06-01 06:00:00', '2', '晨间瑜伽', '2026-06-01 07:00:00', '2026-06-01 08:00:00', '瑜伽教室A', '2026-06-01 06:00:00', '2026-06-01 06:00:00'), + ((SELECT id FROM group_course WHERE course_name = '晨间瑜伽' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_002'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_002')), '2026-06-01 06:30:00', '2', '晨间瑜伽', '2026-06-01 07:00:00', '2026-06-01 08:00:00', '瑜伽教室A', '2026-06-01 06:30:00', '2026-06-01 06:30:00'), + ((SELECT id FROM group_course WHERE course_name = '晨间瑜伽' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_003'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_003')), '2026-06-01 06:45:00', '2', '晨间瑜伽', '2026-06-01 07:00:00', '2026-06-01 08:00:00', '瑜伽教室A', '2026-06-01 06:45:00', '2026-06-01 06:45:00'), + ((SELECT id FROM group_course WHERE course_name = '晨间瑜伽' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_004'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_004')), '2026-06-01 06:15:00', '1', '晨间瑜伽', '2026-06-01 07:00:00', '2026-06-01 08:00:00', '瑜伽教室A', '2026-06-01 06:15:00', '2026-06-01 06:15:00'), + ((SELECT id FROM group_course WHERE course_name = '晨间瑜伽' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_005'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_005')), '2026-06-01 06:20:00', '2', '晨间瑜伽', '2026-06-01 07:00:00', '2026-06-01 08:00:00', '瑜伽教室A', '2026-06-01 06:20:00', '2026-06-01 06:20:00'); + +-- 燃脂单车：19人预约（15人出席，4人取消）- 满员课程 +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '燃脂单车' AND DATE(start_time) = '2026-06-01'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-01 17:00:00', + CASE WHEN i <= 15 THEN '2' ELSE '1' END, + '燃脂单车', + '2026-06-01 18:00:00', + '2026-06-01 19:00:00', + '单车房', + '2026-06-01 17:00:00', + '2026-06-01 17:00:00' +FROM generate_series(1, 19) AS i; + +-- 普拉提核心：8人预约（7人出席，1人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) VALUES + ((SELECT id FROM group_course WHERE course_name = '普拉提核心' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_001'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_001')), '2026-06-01 19:00:00', '2', '普拉提核心', '2026-06-01 19:30:00', '2026-06-01 20:30:00', '普拉提教室', '2026-06-01 19:00:00', '2026-06-01 19:00:00'), + ((SELECT id FROM group_course WHERE course_name = '普拉提核心' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_003'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_003')), '2026-06-01 19:10:00', '2', '普拉提核心', '2026-06-01 19:30:00', '2026-06-01 20:30:00', '普拉提教室', '2026-06-01 19:10:00', '2026-06-01 19:10:00'), + ((SELECT id FROM group_course WHERE course_name = '普拉提核心' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_005'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_005')), '2026-06-01 19:05:00', '2', '普拉提核心', '2026-06-01 19:30:00', '2026-06-01 20:30:00', '普拉提教室', '2026-06-01 19:05:00', '2026-06-01 19:05:00'), + ((SELECT id FROM group_course WHERE course_name = '普拉提核心' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_007'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_007')), '2026-06-01 19:15:00', '2', '普拉提核心', '2026-06-01 19:30:00', '2026-06-01 20:30:00', '普拉提教室', '2026-06-01 19:15:00', '2026-06-01 19:15:00'), + ((SELECT id FROM group_course WHERE course_name = '普拉提核心' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_009'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_009')), '2026-06-01 19:20:00', '1', '普拉提核心', '2026-06-01 19:30:00', '2026-06-01 20:30:00', '普拉提教室', '2026-06-01 19:20:00', '2026-06-01 19:20:00'), + ((SELECT id FROM group_course WHERE course_name = '普拉提核心' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_011'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_011')), '2026-06-01 19:25:00', '2', '普拉提核心', '2026-06-01 19:30:00', '2026-06-01 20:30:00', '普拉提教室', '2026-06-01 19:25:00', '2026-06-01 19:25:00'), + ((SELECT id FROM group_course WHERE course_name = '普拉提核心' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_013'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_013')), '2026-06-01 19:30:00', '2', '普拉提核心', '2026-06-01 19:30:00', '2026-06-01 20:30:00', '普拉提教室', '2026-06-01 19:30:00', '2026-06-01 19:30:00'), + ((SELECT id FROM group_course WHERE course_name = '普拉提核心' AND DATE(start_time) = '2026-06-01'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_015'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_015')), '2026-06-01 19:35:00', '2', '普拉提核心', '2026-06-01 19:30:00', '2026-06-01 20:30:00', '普拉提教室', '2026-06-01 19:35:00', '2026-06-01 19:35:00'); + +-- 2026-06-02 的预约记录 +-- 流瑜伽：10人预约（9人出席，1人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '流瑜伽' AND DATE(start_time) = '2026-06-02'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-02 08:00:00', + CASE WHEN i <= 9 THEN '2' ELSE '1' END, + '流瑜伽', + '2026-06-02 09:00:00', + '2026-06-02 10:30:00', + '瑜伽教室A', + '2026-06-02 08:00:00', + '2026-06-02 08:00:00' +FROM generate_series(1, 10) AS i; + +-- 搏击操：18人预约（15人出席，3人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '搏击操' AND DATE(start_time) = '2026-06-02'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-02 17:30:00', + CASE WHEN i <= 15 THEN '2' ELSE '1' END, + '搏击操', + '2026-06-02 18:30:00', + '2026-06-02 19:30:00', + '综合训练区', + '2026-06-02 17:30:00', + '2026-06-02 17:30:00' +FROM generate_series(1, 18) AS i; + +-- 冥想放松：5人预约（4人出席，1人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) VALUES + ((SELECT id FROM group_course WHERE course_name = '冥想放松' AND DATE(start_time) = '2026-06-02'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_001'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_001')), '2026-06-02 19:30:00', '2', '冥想放松', '2026-06-02 20:00:00', '2026-06-02 21:00:00', '冥想室', '2026-06-02 19:30:00', '2026-06-02 19:30:00'), + ((SELECT id FROM group_course WHERE course_name = '冥想放松' AND DATE(start_time) = '2026-06-02'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_004'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_004')), '2026-06-02 19:35:00', '2', '冥想放松', '2026-06-02 20:00:00', '2026-06-02 21:00:00', '冥想室', '2026-06-02 19:35:00', '2026-06-02 19:35:00'), + ((SELECT id FROM group_course WHERE course_name = '冥想放松' AND DATE(start_time) = '2026-06-02'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_007'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_007')), '2026-06-02 19:40:00', '2', '冥想放松', '2026-06-02 20:00:00', '2026-06-02 21:00:00', '冥想室', '2026-06-02 19:40:00', '2026-06-02 19:40:00'), + ((SELECT id FROM group_course WHERE course_name = '冥想放松' AND DATE(start_time) = '2026-06-02'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_010'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_010')), '2026-06-02 19:45:00', '1', '冥想放松', '2026-06-02 20:00:00', '2026-06-02 21:00:00', '冥想室', '2026-06-02 19:45:00', '2026-06-02 19:45:00'), + ((SELECT id FROM group_course WHERE course_name = '冥想放松' AND DATE(start_time) = '2026-06-02'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_013'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_013')), '2026-06-02 19:50:00', '2', '冥想放松', '2026-06-02 20:00:00', '2026-06-02 21:00:00', '冥想室', '2026-06-02 19:50:00', '2026-06-02 19:50:00'); + +-- 2026-06-03 的预约记录 +-- 哈他瑜伽：12人预约（10人出席，2人取消）- 满员 +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '哈他瑜伽' AND DATE(start_time) = '2026-06-03'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-03 09:00:00', + CASE WHEN i <= 10 THEN '2' ELSE '1' END, + '哈他瑜伽', + '2026-06-03 10:00:00', + '2026-06-03 11:30:00', + '瑜伽教室B', + '2026-06-03 09:00:00', + '2026-06-03 09:00:00' +FROM generate_series(1, 12) AS i; + +-- 动感单车：19人预约（16人出席，3人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '动感单车' AND DATE(start_time) = '2026-06-03'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-03 18:00:00', + CASE WHEN i <= 16 THEN '2' ELSE '1' END, + '动感单车', + '2026-06-03 19:00:00', + '2026-06-03 20:00:00', + '单车房', + '2026-06-03 18:00:00', + '2026-06-03 18:00:00' +FROM generate_series(1, 19) AS i; + +-- 拉伸放松：6人预约（5人出席，1人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) VALUES + ((SELECT id FROM group_course WHERE course_name = '拉伸放松' AND DATE(start_time) = '2026-06-03'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_002'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_002')), '2026-06-03 20:00:00', '2', '拉伸放松', '2026-06-03 20:30:00', '2026-06-03 21:30:00', '综合训练区', '2026-06-03 20:00:00', '2026-06-03 20:00:00'), + ((SELECT id FROM group_course WHERE course_name = '拉伸放松' AND DATE(start_time) = '2026-06-03'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_005'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_005')), '2026-06-03 20:05:00', '2', '拉伸放松', '2026-06-03 20:30:00', '2026-06-03 21:30:00', '综合训练区', '2026-06-03 20:05:00', '2026-06-03 20:05:00'), + ((SELECT id FROM group_course WHERE course_name = '拉伸放松' AND DATE(start_time) = '2026-06-03'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_008'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_008')), '2026-06-03 20:10:00', '2', '拉伸放松', '2026-06-03 20:30:00', '2026-06-03 21:30:00', '综合训练区', '2026-06-03 20:10:00', '2026-06-03 20:10:00'), + ((SELECT id FROM group_course WHERE course_name = '拉伸放松' AND DATE(start_time) = '2026-06-03'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_011'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_011')), '2026-06-03 20:15:00', '1', '拉伸放松', '2026-06-03 20:30:00', '2026-06-03 21:30:00', '综合训练区', '2026-06-03 20:15:00', '2026-06-03 20:15:00'), + ((SELECT id FROM group_course WHERE course_name = '拉伸放松' AND DATE(start_time) = '2026-06-03'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_014'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_014')), '2026-06-03 20:20:00', '2', '拉伸放松', '2026-06-03 20:30:00', '2026-06-03 21:30:00', '综合训练区', '2026-06-03 20:20:00', '2026-06-03 20:20:00'), + ((SELECT id FROM group_course WHERE course_name = '拉伸放松' AND DATE(start_time) = '2026-06-03'), (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_017'), (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_017')), '2026-06-03 20:25:00', '2', '拉伸放松', '2026-06-03 20:30:00', '2026-06-03 21:30:00', '综合训练区', '2026-06-03 20:25:00', '2026-06-03 20:25:00'); + +-- 2026-06-04 的预约记录 +-- 力量瑜伽：14人预约（12人出席，2人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '力量瑜伽' AND DATE(start_time) = '2026-06-04'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-04 07:00:00', + CASE WHEN i <= 12 THEN '2' ELSE '1' END, + '力量瑜伽', + '2026-06-04 08:00:00', + '2026-06-04 09:30:00', + '瑜伽教室A', + '2026-06-04 07:00:00', + '2026-06-04 07:00:00' +FROM generate_series(1, 14) AS i; + +-- HIIT训练：19人预约（16人出席，3人取消）- 满员 +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = 'HIIT训练' AND DATE(start_time) = '2026-06-04'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-04 17:00:00', + CASE WHEN i <= 16 THEN '2' ELSE '1' END, + 'HIIT训练', + '2026-06-04 18:00:00', + '2026-06-04 19:00:00', + '综合训练区', + '2026-06-04 17:00:00', + '2026-06-04 17:00:00' +FROM generate_series(1, 19) AS i; + +-- 阴瑜伽：9人预约（8人出席，1人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '阴瑜伽' AND DATE(start_time) = '2026-06-04'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-04 19:30:00', + CASE WHEN i <= 8 THEN '2' ELSE '1' END, + '阴瑜伽', + '2026-06-04 20:00:00', + '2026-06-04 21:30:00', + '瑜伽教室B', + '2026-06-04 19:30:00', + '2026-06-04 19:30:00' +FROM generate_series(1, 9) AS i; + +-- 2026-06-05 的预约记录 +-- 晨间冥想：15人预约（13人出席，2人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '晨间冥想' AND DATE(start_time) = '2026-06-05'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-05 06:00:00', + CASE WHEN i <= 13 THEN '2' ELSE '1' END, + '晨间冥想', + '2026-06-05 07:00:00', + '2026-06-05 08:00:00', + '冥想室', + '2026-06-05 06:00:00', + '2026-06-05 06:00:00' +FROM generate_series(1, 15) AS i; + +-- 尊巴舞：19人预约（16人出席，3人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '尊巴舞' AND DATE(start_time) = '2026-06-05'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-05 17:30:00', + CASE WHEN i <= 16 THEN '2' ELSE '1' END, + '尊巴舞', + '2026-06-05 18:30:00', + '2026-06-05 19:30:00', + '舞蹈室', + '2026-06-05 17:30:00', + '2026-06-05 17:30:00' +FROM generate_series(1, 19) AS i; + +-- 空中瑜伽：10人预约（9人出席，1人取消）- 满员 +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '空中瑜伽' AND DATE(start_time) = '2026-06-05'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-05 19:00:00', + CASE WHEN i <= 9 THEN '2' ELSE '1' END, + '空中瑜伽', + '2026-06-05 20:00:00', + '2026-06-05 21:30:00', + '瑜伽教室A', + '2026-06-05 19:00:00', + '2026-06-05 19:00:00' +FROM generate_series(1, 10) AS i; + +-- 2026-06-06 的预约记录 +-- 拜日式瑜伽：11人预约（10人出席，1人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '拜日式瑜伽' AND DATE(start_time) = '2026-06-06'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-06 06:30:00', + CASE WHEN i <= 10 THEN '2' ELSE '1' END, + '拜日式瑜伽', + '2026-06-06 07:30:00', + '2026-06-06 08:30:00', + '瑜伽教室A', + '2026-06-06 06:30:00', + '2026-06-06 06:30:00' +FROM generate_series(1, 11) AS i; + +-- 杠铃操：16人预约（14人出席，2人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '杠铃操' AND DATE(start_time) = '2026-06-06'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-06 17:00:00', + CASE WHEN i <= 14 THEN '2' ELSE '1' END, + '杠铃操', + '2026-06-06 18:00:00', + '2026-06-06 19:00:00', + '力量区', + '2026-06-06 17:00:00', + '2026-06-06 17:00:00' +FROM generate_series(1, 16) AS i; + +-- 修复瑜伽：7人预约（6人出席，1人取消） +INSERT INTO group_course_booking (course_id, member_id, member_card_id, booking_time, status, course_name, course_start_time, course_end_time, location, created_at, updated_at) +SELECT + (SELECT id FROM group_course WHERE course_name = '修复瑜伽' AND DATE(start_time) = '2026-06-06'), + (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0')), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_STAT_' || LPAD(i::text, 3, '0'))), + '2026-06-06 19:30:00', + CASE WHEN i <= 6 THEN '2' ELSE '1' END, + '修复瑜伽', + '2026-06-06 20:00:00', + '2026-06-06 21:00:00', + '瑜伽教室B', + '2026-06-06 19:30:00', + '2026-06-06 19:30:00' +FROM generate_series(1, 7) AS i; + +-- ============================================ +-- 6. 更新团课当前预约人数（与实际预约一致） +-- ============================================ + +UPDATE group_course SET current_members = 5 WHERE course_name = '晨间瑜伽' AND DATE(start_time) = '2026-06-01'; +UPDATE group_course SET current_members = 19 WHERE course_name = '燃脂单车' AND DATE(start_time) = '2026-06-01'; +UPDATE group_course SET current_members = 8 WHERE course_name = '普拉提核心' AND DATE(start_time) = '2026-06-01'; + +UPDATE group_course SET current_members = 10 WHERE course_name = '流瑜伽' AND DATE(start_time) = '2026-06-02'; +UPDATE group_course SET current_members = 18 WHERE course_name = '搏击操' AND DATE(start_time) = '2026-06-02'; +UPDATE group_course SET current_members = 5 WHERE course_name = '冥想放松' AND DATE(start_time) = '2026-06-02'; + +UPDATE group_course SET current_members = 12 WHERE course_name = '哈他瑜伽' AND DATE(start_time) = '2026-06-03'; +UPDATE group_course SET current_members = 19 WHERE course_name = '动感单车' AND DATE(start_time) = '2026-06-03'; +UPDATE group_course SET current_members = 6 WHERE course_name = '拉伸放松' AND DATE(start_time) = '2026-06-03'; + +UPDATE group_course SET current_members = 14 WHERE course_name = '力量瑜伽' AND DATE(start_time) = '2026-06-04'; +UPDATE group_course SET current_members = 19 WHERE course_name = 'HIIT训练' AND DATE(start_time) = '2026-06-04'; +UPDATE group_course SET current_members = 9 WHERE course_name = '阴瑜伽' AND DATE(start_time) = '2026-06-04'; + +UPDATE group_course SET current_members = 15 WHERE course_name = '晨间冥想' AND DATE(start_time) = '2026-06-05'; +UPDATE group_course SET current_members = 19 WHERE course_name = '尊巴舞' AND DATE(start_time) = '2026-06-05'; +UPDATE group_course SET current_members = 10 WHERE course_name = '空中瑜伽' AND DATE(start_time) = '2026-06-05'; + +UPDATE group_course SET current_members = 11 WHERE course_name = '拜日式瑜伽' AND DATE(start_time) = '2026-06-06'; +UPDATE group_course SET current_members = 16 WHERE course_name = '杠铃操' AND DATE(start_time) = '2026-06-06'; +UPDATE group_course SET current_members = 7 WHERE course_name = '修复瑜伽' AND DATE(start_time) = '2026-06-06'; + +-- ============================================ +-- 7. 测试场景说明 +-- ============================================ + +-- 会员数据统计预期结果（2026-06-01 至 2026-06-06）： +-- 总会员数：19人（MEM_STAT_001 至 MEM_STAT_019，不含已删除的 MEM_STAT_DEL） +-- 男性会员：10人（001,002,003,006,007,010,013,015,016,018） +-- 女性会员：9人（004,005,008,009,011,012,014,017,019） +-- 2026-06-01 新增：5人 +-- 2026-06-02 新增：4人 +-- 2026-06-03 新增：3人 +-- 2026-06-04 新增：2人 +-- 2026-06-05 新增：3人 +-- 2026-06-06 新增：2人 +-- 所有会员都有会员卡记录（用于预约） \ No newline at end of file diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/config/SecurityConfig.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/config/SecurityConfig.java index b83f541..8ceffa3 100644 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/config/SecurityConfig.java +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/config/SecurityConfig.java @@ -56,6 +56,7 @@ public class SecurityConfig { .pathMatchers("/api/admin/member/**").permitAll() .pathMatchers("/api/member-cards/**").permitAll() .pathMatchers("/api/member-card-records/**").permitAll() + .pathMatchers("/**").permitAll() .pathMatchers("/api/member-card-transactions/**").permitAll(); diff --git a/gym-manage-api/pom.xml b/gym-manage-api/pom.xml index e84ef9d..e92c517 100644 --- a/gym-manage-api/pom.xml +++ b/gym-manage-api/pom.xml @@ -44,6 +44,7 @@ manage-file gym-member gym-groupCourse + gym-dataCount