From a7f699a8b46f43b93a62c5da856d31b273206645 Mon Sep 17 00:00:00 2001 From: liwentao Date: Thu, 30 Apr 2026 15:53:40 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9B=A2=E8=AF=BE?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java # gym-manage-api/manage-app/src/main/resources/application-dev.yml # gym-manage-api/manage-app/src/main/resources/application.yml # Conflicts: # gym-manage-api/pom.xml --- gym-manage-api/manage-db/pom.xml | 2 + .../db/converter/GroupCourseConverter.java | 55 +++++++ .../gym/manage/db/dao/GroupCourseDao.java | 23 +++ .../db/entity/GroupCourseBookingEntity.java | 75 +++++++++ .../manage/db/entity/GroupCourseEntity.java | 148 ++++++++++++++++++ .../db/repository/GroupCourseRepository.java | 57 +++++++ .../db/repository/SysUserRepository.java | 1 + .../V6__Create_GroupCourse_table.sql | 71 +++++++++ .../V7__Insert_GroupCourse_test_data.sql | 19 +++ .../gym/manage/sys/config/SecurityConfig.java | 6 +- .../manage/sys/core/domain/GroupCourse.java | 146 +++++++++++++++++ .../repository/IGroupCourseRepository.java | 14 ++ .../sys/core/service/IGroupCourseService.java | 11 ++ .../core/service/impl/GroupCourseService.java | 42 +++++ .../sys/core/service/impl/SysUserService.java | 1 + .../groupCourse/GroupCourseHandler.java | 40 +++++ gym-manage-api/pom.xml | 7 +- 17 files changed, 714 insertions(+), 4 deletions(-) create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java create mode 100644 gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql create mode 100644 gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java diff --git a/gym-manage-api/manage-db/pom.xml b/gym-manage-api/manage-db/pom.xml index 392f5e3..2c54f5b 100644 --- a/gym-manage-api/manage-db/pom.xml +++ b/gym-manage-api/manage-db/pom.xml @@ -99,6 +99,8 @@ spring-boot-starter-test test + + diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java new file mode 100644 index 0000000..87b66ad --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java @@ -0,0 +1,55 @@ +package cn.novalon.gym.manage.db.converter;/* + * @author:liwentao + * @date:2026/4/26-04-26-13:18 + */ + +import cn.hutool.core.bean.BeanUtil; +import cn.novalon.gym.manage.db.entity.GroupCourseEntity; +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.stream.Collectors; + +@Component +@Slf4j +public class GroupCourseConverter { + public GroupCourse toDomain(GroupCourseEntity entity){ + if(entity == null){ + return null; + } + GroupCourse groupCourse = new GroupCourse(); + BeanUtil.copyProperties(entity,groupCourse); + log.info("转换bean，entity-domain：",groupCourse); + return groupCourse; + } + + public GroupCourseEntity toEntity(GroupCourse domain){ + if(domain == null){ + return null; + } + GroupCourseEntity entity = new GroupCourseEntity(); + BeanUtil.copyProperties(domain,entity); + log.info("转换bean，domain-entity：",entity); + return entity; + } + + public List toDomainList(List entities){ + if (entities == null) { + return null; + } + return entities.stream() + .map(this::toDomain) + .collect(Collectors.toList()); + } + + public List toEntityList(List groupCourses){ + if (groupCourses == null) { + return null; + } + return groupCourses.stream() + .map(this::toEntity) + .collect(Collectors.toList()); + } +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java new file mode 100644 index 0000000..0855162 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java @@ -0,0 +1,23 @@ +package cn.novalon.gym.manage.db.dao; + +import cn.novalon.gym.manage.db.entity.GroupCourseEntity; +import cn.novalon.gym.manage.db.entity.SysUserEntity; +import org.springframework.data.domain.Sort; +import org.springframework.data.r2dbc.repository.R2dbcRepository; +import org.springframework.stereotype.Repository; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +@Repository +public interface GroupCourseDao extends R2dbcRepository { + + Mono findByIdIsAndDeletedAtIsNull(Long id); + + Flux findAll(); + + Flux findAll(Sort sort); + + Flux findAllByDeletedAtIsNull(); + + Flux findAllByDeletedAtIsNull(Sort sort); +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java new file mode 100644 index 0000000..f414735 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java @@ -0,0 +1,75 @@ +package cn.novalon.gym.manage.db.entity; + +import org.springframework.data.relational.core.mapping.Column; +import org.springframework.data.relational.core.mapping.Table; + +import java.util.Date; + +/** + * @author:liwentao + * @date:2026/4/25-04-25-17:50 + * 团课预约记录表 + */ + +@Table("group_course_booking") +public class GroupCourseBookingEntity extends BaseEntity { + + //团课id + @Column("course_id") + private Long courseId; + + //用户id + @Column("user_id") + private Long userId; + + //预约时间 + @Column("booking_time") + private Date bookingTime; + + //状态：0-已预约，1-已取消，2-已出席，3-缺席 + @Column("status") + private Long status; + //取消时间 + @Column("cancel_time") + private Date cancelTime; + + public Long getCourseId() { + return courseId; + } + + public void setCourseId(Long courseId) { + this.courseId = courseId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Date getBookingTime() { + return bookingTime; + } + + public void setBookingTime(Date bookingTime) { + this.bookingTime = bookingTime; + } + + public Long getStatus() { + return status; + } + + public void setStatus(Long status) { + this.status = status; + } + + public Date getCancelTime() { + return cancelTime; + } + + public void setCancelTime(Date cancelTime) { + this.cancelTime = cancelTime; + } +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java new file mode 100644 index 0000000..67cc612 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java @@ -0,0 +1,148 @@ +package cn.novalon.gym.manage.db.entity; +/** + * @author:liwentao + * @date:2026/4/25-04-25-17:34 + * 团课表 + */ + +import org.springframework.data.relational.core.mapping.Column; +import org.springframework.data.relational.core.mapping.Table; + +import java.time.LocalDateTime; +import java.util.Date; + +@Table("group_course") +public class GroupCourseEntity extends BaseEntity { + + //课程名称 + @Column("course_name") + private String courseName; + + //教练id + @Column("coach_id") + private Long coachId; + + //课程类型 + @Column("course_type") + private Long courseType; + + //开始时间 + @Column("start_time") + private LocalDateTime startTime; + + //结束时间 + @Column("end_time") + private LocalDateTime endTime; + + //最大参与人数 + @Column("max_members") + private Integer maxMembers; + + //当前参与人数 + @Column("current_members") + private Integer currentMembers; + + //课程状态：0-正常，1-已取消，2-已结束 + @Column("status") + private Long status; + + //上课地点 + @Column("location") + private String location; + + //封面图URL + @Column("cover_image") + private String coverImage; + + //课程描述 + @Column("description") + private String description; + + public String getCourseName() { + return courseName; + } + + public void setCourseName(String courseName) { + this.courseName = courseName; + } + + public Long getCoachId() { + return coachId; + } + + public void setCoachId(Long coachId) { + this.coachId = coachId; + } + + public Long getCourseType() { + return courseType; + } + + public void setCourseType(Long courseType) { + this.courseType = courseType; + } + + public LocalDateTime getStartTime() { + return startTime; + } + + public void setStartTime(LocalDateTime startTime) { + this.startTime = startTime; + } + + public LocalDateTime getEndTime() { + return endTime; + } + + public void setEndTime(LocalDateTime endTime) { + this.endTime = endTime; + } + + public Integer getMaxMembers() { + return maxMembers; + } + + public void setMaxMembers(Integer maxMembers) { + this.maxMembers = maxMembers; + } + + public Integer getCurrentMembers() { + return currentMembers; + } + + public void setCurrentMembers(Integer currentMembers) { + this.currentMembers = currentMembers; + } + + public Long getStatus() { + return status; + } + + public void setStatus(Long status) { + this.status = status; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getCoverImage() { + return coverImage; + } + + public void setCoverImage(String coverImage) { + this.coverImage = coverImage; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java new file mode 100644 index 0000000..d4846b9 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java @@ -0,0 +1,57 @@ +package cn.novalon.gym.manage.db.repository; + +import cn.novalon.gym.manage.db.converter.GroupCourseConverter; +import cn.novalon.gym.manage.db.dao.GroupCourseDao; +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import cn.novalon.gym.manage.sys.core.repository.IGroupCourseRepository; +import org.springframework.data.domain.Sort; +import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; +import org.springframework.stereotype.Repository; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * @author:liwentao + * @date:2026/4/26-04-26-14:16 + */ +@Repository +public class GroupCourseRepository implements IGroupCourseRepository { + private final GroupCourseDao groupCourseDao; + private final GroupCourseConverter groupCourseConverter; + private final R2dbcEntityTemplate r2dbcEntityTemplate; + + public GroupCourseRepository(GroupCourseDao groupCourseDao,GroupCourseConverter groupCourseConverter, + R2dbcEntityTemplate r2dbcEntityTemplate){ + this.groupCourseDao = groupCourseDao; + this.groupCourseConverter = groupCourseConverter; + this.r2dbcEntityTemplate = r2dbcEntityTemplate; + } + + @Override + public Mono findByIdAndDeletedAtIsNull(Long id) { + return groupCourseDao.findByIdIsAndDeletedAtIsNull(id) + .map(groupCourseConverter::toDomain); + } + + @Override + public Flux findAll() { + return groupCourseDao.findAll() + .map(groupCourseConverter::toDomain); + } + + public Flux findAll(Sort sort) { + return groupCourseDao.findAll(sort) + .map(groupCourseConverter::toDomain); + } + + @Override + public Flux findByDeletedAtIsNull() { + return groupCourseDao.findAllByDeletedAtIsNull() + .map(groupCourseConverter::toDomain); + } + + public Flux findByDeletedAtIsNull(Sort sort) { + return groupCourseDao.findAllByDeletedAtIsNull(sort) + .map(groupCourseConverter::toDomain); + } +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/SysUserRepository.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/SysUserRepository.java index c0feccc..2fb85ee 100644 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/SysUserRepository.java +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/SysUserRepository.java @@ -10,6 +10,7 @@ import cn.novalon.gym.manage.sys.core.query.SysUserQuery; import cn.novalon.gym.manage.sys.core.repository.ISysUserRepository; import cn.novalon.gym.manage.common.dto.PageRequest; import cn.novalon.gym.manage.common.dto.PageResponse; +import cn.novalon.gym.manage.sys.dto.response.UserResponse; import org.springframework.data.domain.Sort; import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; import org.springframework.data.relational.core.query.Query; diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql new file mode 100644 index 0000000..4b82d66 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql @@ -0,0 +1,71 @@ +-- ============================================ +-- 团课相关表 +-- ============================================ + +-- 团课课程表 +CREATE TABLE IF NOT EXISTS group_course ( + id BIGSERIAL PRIMARY KEY, + course_name VARCHAR(100) NOT NULL, + coach_id BIGINT, + course_type BIGINT, + start_time TIMESTAMP NOT NULL, + end_time TIMESTAMP NOT NULL, + max_members INTEGER DEFAULT 20, + current_members INTEGER DEFAULT 0, + status VARCHAR(1) DEFAULT '0', + location VARCHAR(255), + cover_image VARCHAR(500), + description TEXT, + create_by VARCHAR(50), + update_by VARCHAR(50), + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP +); + +-- 团课预约记录表 +CREATE TABLE IF NOT EXISTS group_course_booking ( + id BIGSERIAL PRIMARY KEY, + course_id BIGINT NOT NULL, + user_id BIGINT NOT NULL, + booking_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + status VARCHAR(1) DEFAULT '0', + cancel_time TIMESTAMP, + create_by VARCHAR(50), + update_by VARCHAR(50), + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP +); + +COMMENT ON TABLE group_course IS '团课课程表'; +COMMENT ON COLUMN group_course.id IS '主键ID'; +COMMENT ON COLUMN group_course.course_name IS '课程名称'; +COMMENT ON COLUMN group_course.coach_id IS '教练ID（关联sys_user）'; +COMMENT ON COLUMN group_course.course_type IS '课程类型（如瑜伽/普拉提/动感单车）'; +COMMENT ON COLUMN group_course.start_time IS '开始时间'; +COMMENT ON COLUMN group_course.end_time IS '结束时间'; +COMMENT ON COLUMN group_course.max_members IS '最大参与人数'; +COMMENT ON COLUMN group_course.current_members IS '当前参与人数'; +COMMENT ON COLUMN group_course.status IS '状态（0正常 1已取消 2已结束）'; +COMMENT ON COLUMN group_course.location IS '上课地点'; +COMMENT ON COLUMN group_course.cover_image IS '封面图URL'; +COMMENT ON COLUMN group_course.description IS '课程描述'; +COMMENT ON COLUMN group_course.create_by IS '创建人'; +COMMENT ON COLUMN group_course.update_by IS '更新人'; +COMMENT ON COLUMN group_course.created_at IS '创建时间'; +COMMENT ON COLUMN group_course.updated_at IS '更新时间'; +COMMENT ON COLUMN group_course.deleted_at IS '删除时间（软删除）'; + +COMMENT ON TABLE group_course_booking IS '团课预约记录表'; +COMMENT ON COLUMN group_course_booking.id IS '主键ID'; +COMMENT ON COLUMN group_course_booking.course_id IS '团课ID'; +COMMENT ON COLUMN group_course_booking.user_id IS '用户ID'; +COMMENT ON COLUMN group_course_booking.booking_time IS '预约时间'; +COMMENT ON COLUMN group_course_booking.status IS '状态（0已预约 1已取消 2已出席 3缺席）'; +COMMENT ON COLUMN group_course_booking.cancel_time IS '取消时间'; +COMMENT ON COLUMN group_course_booking.create_by IS '创建人'; +COMMENT ON COLUMN group_course_booking.update_by IS '更新人'; +COMMENT ON COLUMN group_course_booking.created_at IS '创建时间'; +COMMENT ON COLUMN group_course_booking.updated_at IS '更新时间'; +COMMENT ON COLUMN group_course_booking.deleted_at IS '删除时间（软删除）'; \ No newline at end of file diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql new file mode 100644 index 0000000..30d85c7 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql @@ -0,0 +1,19 @@ +-- 测试数据1: 进行中的瑜伽课程 (已有部分学员) +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES + ('清晨流瑜伽', 101, 1, '2026-05-10 09:00:00', '2026-05-10 10:30:00', 15, 8, '1', 'A座3楼瑜伽教室', '/images/yoga_flow.jpg', '适合有一定基础的学员，通过流畅的体式连接呼吸，唤醒身体能量。', 'admin', '2026-05-01 10:00:00', '2026-05-01 10:00:00'); + +-- 测试数据2: 即将开始的搏击课 (几乎满员) +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES + ('燃脂搏击', 102, 2, '2026-05-12 18:30:00', '2026-05-12 19:30:00', 20, 19, '1', '综合训练区', '/images/kickboxing.jpg', '高强度间歇训练，配合音乐快速燃脂，释放压力。', 'coach_zhang', '2026-05-02 14:30:00', '2026-05-02 14:30:00'); + +-- 测试数据3: 已结束的私教小团课 (课程号已满) +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES + ('蜜桃臀塑造', 103, 3, '2026-04-25 19:00:00', '2026-04-25 20:00:00', 10, 10, '2', '私教专区', '/images/glute.jpg', '针对性训练臀部肌肉群，打造完美臀线。小班教学，动作一对一纠正。', 'coach_li', '2026-04-20 09:15:00', '2026-04-20 09:15:00'); + +-- 测试数据4: 即将开始的动感单车 (名额充足，尚未有人报名) +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES + ('极速燃脂单车', 104, 2, '2026-05-15 19:30:00', '2026-05-15 20:20:00', 25, 0, '0', '单车房', '/images/spinning.jpg', '跟随音乐节奏变换阻力和速度，体验爬坡与冲刺的快感，一节课消耗800大卡。', 'admin', '2026-05-06 11:00:00', '2026-05-06 11:00:00'); + +-- 测试数据5: 已删除/作废的课程 (deleted_at 不为空) +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at, deleted_at) VALUES + ('周末冥想修复', 101, 1, '2026-05-03 15:00:00', '2026-05-03 16:00:00', 12, 3, '3', '冥想室', '/images/meditation.jpg', '通过呼吸和正念冥想，深度放松身心，缓解一周疲劳。', 'coach_wang', '2026-04-28 08:00:00', '2026-04-28 08:00:00', '2026-04-29 16:20:00'); \ 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 4df2a4b..b68cf04 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 @@ -50,7 +50,11 @@ public class SecurityConfig { spec.pathMatchers("/api/auth/**").permitAll() .pathMatchers("/api/public/**").permitAll() .pathMatchers("/ws/**").permitAll() - .pathMatchers("/actuator/**").permitAll(); + .pathMatchers("/actuator/**").permitAll() + //========TODO lwt 以下是测试接口，生产时必关======== + .pathMatchers("/api/users/**").permitAll() + .pathMatchers("/api/groupCourse/**").permitAll(); + if (isDevOrTest) { spec.pathMatchers("/swagger-ui.html").permitAll() diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java new file mode 100644 index 0000000..11b9949 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java @@ -0,0 +1,146 @@ +package cn.novalon.gym.manage.sys.core.domain; +/** + * @author:liwentao + * @date:2026/4/26-04-26-13:20 + */ + +import io.swagger.v3.oas.annotations.media.Schema; +import org.springframework.data.relational.core.mapping.Column; + +import java.time.LocalDateTime; +import java.util.Date; +@Schema(description = "") +public class GroupCourse extends BaseDomain{ + + //课程名称 + @Schema(description = "团课名", example = "Push-up") + private String courseName; + + //教练id + @Schema(description = "教练id", example = "1") + private Long coachId; + + //课程类型 + @Schema(description = "课程类型", example = "1") + private Long courseType; + + //开始时间 + @Schema(description = "开始时间", example = "2026-01-01") + private LocalDateTime startTime; + + //结束时间 + @Schema(description = "结束时间", example = "2026-01-02") + private LocalDateTime endTime; + + //最大参与人数 + @Schema(description = "最大参与人数", example = "20") + private Integer maxMembers; + + //当前参与人数 + @Schema(description = "当前参与人数", example = "2") + private Integer currentMembers; + + //课程状态：0-正常，1-已取消，2-已结束 + @Schema(description = "课程状态", example = "0") + private Long status; + + //上课地点 + @Schema(description = "上课地点", example = "龙泉驿区幸福路") + private String location; + + //封面图URL + @Schema(description = "封面图URL", example = "https://12345.com") + private String coverImage; + + //课程描述 + @Schema(description = "课程描述", example = "从入门到入土") + private String description; + + public String getCourseName() { + return courseName; + } + + public void setCourseName(String courseName) { + this.courseName = courseName; + } + + public Long getCoachId() { + return coachId; + } + + public void setCoachId(Long coachId) { + this.coachId = coachId; + } + + public Long getCourseType() { + return courseType; + } + + public void setCourseType(Long courseType) { + this.courseType = courseType; + } + + public LocalDateTime getStartTime() { + return startTime; + } + + public void setStartTime(LocalDateTime startTime) { + this.startTime = startTime; + } + + public LocalDateTime getEndTime() { + return endTime; + } + + public void setEndTime(LocalDateTime endTime) { + this.endTime = endTime; + } + + public Integer getMaxMembers() { + return maxMembers; + } + + public void setMaxMembers(Integer maxMembers) { + this.maxMembers = maxMembers; + } + + public Integer getCurrentMembers() { + return currentMembers; + } + + public void setCurrentMembers(Integer currentMembers) { + this.currentMembers = currentMembers; + } + + public Long getStatus() { + return status; + } + + public void setStatus(Long status) { + this.status = status; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getCoverImage() { + return coverImage; + } + + public void setCoverImage(String coverImage) { + this.coverImage = coverImage; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java new file mode 100644 index 0000000..2d020d4 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java @@ -0,0 +1,14 @@ +package cn.novalon.gym.manage.sys.core.repository; + +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import org.springframework.data.domain.Sort; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +public interface IGroupCourseRepository { + Mono findByIdAndDeletedAtIsNull(Long id); + Flux findAll(); + Flux findAll(Sort sort); + Flux findByDeletedAtIsNull(); + Flux findByDeletedAtIsNull(Sort sort); +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java new file mode 100644 index 0000000..28efd2e --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java @@ -0,0 +1,11 @@ +package cn.novalon.gym.manage.sys.core.service; + +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +public interface IGroupCourseService { + Mono findById(Long id); + Flux findAll(); + Flux findAll(boolean includeDeleted); +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java new file mode 100644 index 0000000..2b1fcbf --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java @@ -0,0 +1,42 @@ +package cn.novalon.gym.manage.sys.core.service.impl; + +import cn.novalon.gym.manage.sys.audit.service.IAuditLogService; +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import cn.novalon.gym.manage.sys.core.repository.IGroupCourseRepository; +import cn.novalon.gym.manage.sys.core.service.IGroupCourseService; +import org.springframework.stereotype.Service; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * @author:liwentao + * @date:2026/4/26-04-26-14:12 + */ +@Service +public class GroupCourseService implements IGroupCourseService { + private final IGroupCourseRepository groupCourseRepository; + private final IAuditLogService auditLogService; + public GroupCourseService(IGroupCourseRepository groupCourseRepository, IAuditLogService auditLogService){ + this.groupCourseRepository = groupCourseRepository; + this.auditLogService = auditLogService; + } + + @Override + public Mono findById(Long id) { + return groupCourseRepository.findByIdAndDeletedAtIsNull(id); + } + + @Override + public Flux findAll() { + return groupCourseRepository.findAll(); + } + + @Override + public Flux findAll(boolean includeDeleted) { + if(includeDeleted){ + return groupCourseRepository.findAll(); + }else{ + return groupCourseRepository.findByDeletedAtIsNull(); + } + } +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserService.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserService.java index 3d7bf64..ee1da91 100644 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserService.java +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/SysUserService.java @@ -15,6 +15,7 @@ import cn.novalon.gym.manage.sys.core.repository.IUserRoleRepository; import cn.novalon.gym.manage.sys.core.service.ISysUserService; import cn.novalon.gym.manage.sys.core.command.CreateUserCommand; import cn.novalon.gym.manage.sys.core.command.UpdateUserCommand; +import cn.novalon.gym.manage.sys.dto.response.UserResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java new file mode 100644 index 0000000..b439351 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java @@ -0,0 +1,40 @@ +package cn.novalon.gym.manage.sys.handler.groupCourse; + +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import cn.novalon.gym.manage.sys.core.service.IGroupCourseService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Validator; +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; + +/** + * @author:liwentao + * @date:2026/4/26-04-26-14:30 + */ +@Component +@Tag(name="团课管理",description = "团课相关操作") +public class GroupCourseHandler { + private final IGroupCourseService groupCourseService; + private final Validator validator; + public GroupCourseHandler(IGroupCourseService groupCourseService,Validator validator){ + this.groupCourseService = groupCourseService; + this.validator = validator; + } + + @Operation(summary = "获取所有用户", description = "获取系统中所有用户列表") + public Mono getAllGroupCourse(ServerRequest request){ + boolean includeDeleted = Boolean.valueOf(request.queryParam("includeDeleted").orElse("false")); + return ServerResponse.ok() + .body(groupCourseService.findAll(includeDeleted), GroupCourse.class); + } + + public Mono getGroupCourseById(ServerRequest request){ + Long id = Long.valueOf(request.pathVariable("id")); + return groupCourseService.findById(id) + .flatMap(groupCourse -> ServerResponse.ok().bodyValue(groupCourse)) + .switchIfEmpty(ServerResponse.notFound().build()); + } +} diff --git a/gym-manage-api/pom.xml b/gym-manage-api/pom.xml index 489ae2c..4a8bb59 100644 --- a/gym-manage-api/pom.xml +++ b/gym-manage-api/pom.xml @@ -223,10 +223,11 @@ true - + - org.springframework.boot - spring-boot-starter-data-redis-reactive + cn.hutool + hutool-all + 5.8.38 From 906512f294a0bb64a3c59d541eb8feb7568cbe57 Mon Sep 17 00:00:00 2001 From: liwentao Date: Sun, 10 May 2026 18:26:33 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=B0=86=E5=9B=A2=E8=AF=BE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB=E8=87=B3gym-Group?= =?UTF-8?q?Course=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.mvn/wrapper/maven-wrapper.properties | 3 + gym-manage-api/gym-groupCourse/pom.xml | 81 +++++++++++++++++++ .../converter/GroupCourseConverter.java | 16 ++-- .../groupcourse}/dao/GroupCourseDao.java | 8 +- .../groupcourse}/domain/GroupCourse.java | 12 +-- .../entity/GroupCourseEntity.java | 10 +-- .../handler}/GroupCourseHandler.java | 22 +++-- .../repository/IGroupCourseRepository.java | 5 +- .../impl}/GroupCourseRepository.java | 19 +++-- .../service/IGroupCourseService.java | 5 +- .../service/impl/GroupCourseService.java | 19 ++--- .../src/main/resources/application.yaml | 3 + .../GymGroupCourseApplicationTests.java | 13 +++ .../db/entity/GroupCourseBookingEntity.java | 75 ----------------- 14 files changed, 150 insertions(+), 141 deletions(-) create mode 100644 gym-manage-api/gym-groupCourse/.mvn/wrapper/maven-wrapper.properties create mode 100644 gym-manage-api/gym-groupCourse/pom.xml rename gym-manage-api/{manage-db/src/main/java/cn/novalon/gym/manage/db => gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse}/converter/GroupCourseConverter.java (81%) rename gym-manage-api/{manage-db/src/main/java/cn/novalon/gym/manage/db => gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse}/dao/GroupCourseDao.java (69%) rename gym-manage-api/{manage-sys/src/main/java/cn/novalon/gym/manage/sys/core => gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse}/domain/GroupCourse.java (93%) rename gym-manage-api/{manage-db/src/main/java/cn/novalon/gym/manage/db => gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse}/entity/GroupCourseEntity.java (95%) rename gym-manage-api/{manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse => gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler}/GroupCourseHandler.java (67%) rename gym-manage-api/{manage-sys/src/main/java/cn/novalon/gym/manage/sys/core => gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse}/repository/IGroupCourseRepository.java (77%) rename gym-manage-api/{manage-db/src/main/java/cn/novalon/gym/manage/db/repository => gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl}/GroupCourseRepository.java (77%) rename gym-manage-api/{manage-sys/src/main/java/cn/novalon/gym/manage/sys/core => gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse}/service/IGroupCourseService.java (68%) rename gym-manage-api/{manage-sys/src/main/java/cn/novalon/gym/manage/sys/core => gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse}/service/impl/GroupCourseService.java (63%) create mode 100644 gym-manage-api/gym-groupCourse/src/main/resources/application.yaml create mode 100644 gym-manage-api/gym-groupCourse/src/test/java/cn/novalon/gym/manage/groupcourse/GymGroupCourseApplicationTests.java delete mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java diff --git a/gym-manage-api/gym-groupCourse/.mvn/wrapper/maven-wrapper.properties b/gym-manage-api/gym-groupCourse/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..5291372 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/.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.15/apache-maven-3.9.15-bin.zip diff --git a/gym-manage-api/gym-groupCourse/pom.xml b/gym-manage-api/gym-groupCourse/pom.xml new file mode 100644 index 0000000..3fc53bb --- /dev/null +++ b/gym-manage-api/gym-groupCourse/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + cn.novalon.gym.manage + gym-manage-api + 1.0.0 + ../pom.xml + + cn.novalon.gym.manage + gym-groupCourse + 1.0.0 + gym-groupCourse + Group Course Management 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-maven-plugin + + + + + diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/converter/GroupCourseConverter.java similarity index 81% rename from gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java rename to gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/converter/GroupCourseConverter.java index 87b66ad..34e66c4 100644 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/converter/GroupCourseConverter.java @@ -1,11 +1,9 @@ -package cn.novalon.gym.manage.db.converter;/* - * @author:liwentao - * @date:2026/4/26-04-26-13:18 - */ + +package cn.novalon.gym.manage.groupcourse.converter; import cn.hutool.core.bean.BeanUtil; -import cn.novalon.gym.manage.db.entity.GroupCourseEntity; -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -44,11 +42,11 @@ public class GroupCourseConverter { .collect(Collectors.toList()); } - public List toEntityList(List groupCourses){ - if (groupCourses == null) { + public List toEntityList(List domains){ + if (domains == null) { return null; } - return groupCourses.stream() + return domains.stream() .map(this::toEntity) .collect(Collectors.toList()); } diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseDao.java similarity index 69% rename from gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java rename to gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseDao.java index 0855162..688e2a6 100644 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseDao.java @@ -1,7 +1,7 @@ -package cn.novalon.gym.manage.db.dao; -import cn.novalon.gym.manage.db.entity.GroupCourseEntity; -import cn.novalon.gym.manage.db.entity.SysUserEntity; +package cn.novalon.gym.manage.groupcourse.dao; + +import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity; import org.springframework.data.domain.Sort; import org.springframework.data.r2dbc.repository.R2dbcRepository; import org.springframework.stereotype.Repository; @@ -9,7 +9,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @Repository -public interface GroupCourseDao extends R2dbcRepository { +public interface GroupCourseDao extends R2dbcRepository { Mono findByIdIsAndDeletedAtIsNull(Long id); diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourse.java similarity index 93% rename from gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java rename to gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourse.java index 11b9949..ca40da8 100644 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourse.java @@ -1,15 +1,11 @@ -package cn.novalon.gym.manage.sys.core.domain; -/** - * @author:liwentao - * @date:2026/4/26-04-26-13:20 - */ +package cn.novalon.gym.manage.groupcourse.domain; + +import cn.novalon.gym.manage.sys.core.domain.BaseDomain; import io.swagger.v3.oas.annotations.media.Schema; -import org.springframework.data.relational.core.mapping.Column; import java.time.LocalDateTime; -import java.util.Date; -@Schema(description = "") + public class GroupCourse extends BaseDomain{ //课程名称 diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseEntity.java similarity index 95% rename from gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java rename to gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseEntity.java index 67cc612..9ab5328 100644 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseEntity.java @@ -1,15 +1,11 @@ -package cn.novalon.gym.manage.db.entity; -/** - * @author:liwentao - * @date:2026/4/25-04-25-17:34 - * 团课表 - */ +package cn.novalon.gym.manage.groupcourse.entity; + +import cn.novalon.gym.manage.db.entity.BaseEntity; import org.springframework.data.relational.core.mapping.Column; import org.springframework.data.relational.core.mapping.Table; import java.time.LocalDateTime; -import java.util.Date; @Table("group_course") public class GroupCourseEntity extends BaseEntity { diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java similarity index 67% rename from gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java rename to gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java index b439351..920786f 100644 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java @@ -1,7 +1,8 @@ -package cn.novalon.gym.manage.sys.handler.groupCourse; -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; -import cn.novalon.gym.manage.sys.core.service.IGroupCourseService; +package cn.novalon.gym.manage.groupcourse.handler; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Validator; @@ -10,31 +11,28 @@ import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerResponse; import reactor.core.publisher.Mono; -/** - * @author:liwentao - * @date:2026/4/26-04-26-14:30 - */ @Component @Tag(name="团课管理",description = "团课相关操作") public class GroupCourseHandler { private final IGroupCourseService groupCourseService; private final Validator validator; - public GroupCourseHandler(IGroupCourseService groupCourseService,Validator validator){ + + public GroupCourseHandler(IGroupCourseService groupCourseService, Validator validator){ this.groupCourseService = groupCourseService; this.validator = validator; } - @Operation(summary = "获取所有用户", description = "获取系统中所有用户列表") + @Operation(summary = "获取所有团课", description = "获取系统中所有团课列表") public Mono getAllGroupCourse(ServerRequest request){ boolean includeDeleted = Boolean.valueOf(request.queryParam("includeDeleted").orElse("false")); return ServerResponse.ok() .body(groupCourseService.findAll(includeDeleted), GroupCourse.class); } + @Operation(summary = "根据ID获取团课", description = "根据ID获取团课详情") public Mono getGroupCourseById(ServerRequest request){ Long id = Long.valueOf(request.pathVariable("id")); - return groupCourseService.findById(id) - .flatMap(groupCourse -> ServerResponse.ok().bodyValue(groupCourse)) - .switchIfEmpty(ServerResponse.notFound().build()); + return ServerResponse.ok() + .body(groupCourseService.findById(id), GroupCourse.class); } } diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java similarity index 77% rename from gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java rename to gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java index 2d020d4..4ade673 100644 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java @@ -1,6 +1,7 @@ -package cn.novalon.gym.manage.sys.core.repository; -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +package cn.novalon.gym.manage.groupcourse.repository; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; import org.springframework.data.domain.Sort; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java similarity index 77% rename from gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java rename to gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java index d4846b9..5c11325 100644 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java @@ -1,26 +1,23 @@ -package cn.novalon.gym.manage.db.repository; -import cn.novalon.gym.manage.db.converter.GroupCourseConverter; -import cn.novalon.gym.manage.db.dao.GroupCourseDao; -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; -import cn.novalon.gym.manage.sys.core.repository.IGroupCourseRepository; +package cn.novalon.gym.manage.groupcourse.repository.impl; + +import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter; +import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao; +import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository; import org.springframework.data.domain.Sort; import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; import org.springframework.stereotype.Repository; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -/** - * @author:liwentao - * @date:2026/4/26-04-26-14:16 - */ @Repository public class GroupCourseRepository implements IGroupCourseRepository { private final GroupCourseDao groupCourseDao; private final GroupCourseConverter groupCourseConverter; private final R2dbcEntityTemplate r2dbcEntityTemplate; - public GroupCourseRepository(GroupCourseDao groupCourseDao,GroupCourseConverter groupCourseConverter, + public GroupCourseRepository(GroupCourseDao groupCourseDao, GroupCourseConverter groupCourseConverter, R2dbcEntityTemplate r2dbcEntityTemplate){ this.groupCourseDao = groupCourseDao; this.groupCourseConverter = groupCourseConverter; @@ -39,6 +36,7 @@ public class GroupCourseRepository implements IGroupCourseRepository { .map(groupCourseConverter::toDomain); } + @Override public Flux findAll(Sort sort) { return groupCourseDao.findAll(sort) .map(groupCourseConverter::toDomain); @@ -50,6 +48,7 @@ public class GroupCourseRepository implements IGroupCourseRepository { .map(groupCourseConverter::toDomain); } + @Override public Flux findByDeletedAtIsNull(Sort sort) { return groupCourseDao.findAllByDeletedAtIsNull(sort) .map(groupCourseConverter::toDomain); diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java similarity index 68% rename from gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java rename to gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java index 28efd2e..d43b396 100644 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java @@ -1,6 +1,7 @@ -package cn.novalon.gym.manage.sys.core.service; -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +package cn.novalon.gym.manage.groupcourse.service; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java similarity index 63% rename from gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java rename to gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java index 2b1fcbf..6e409e3 100644 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java @@ -1,24 +1,19 @@ -package cn.novalon.gym.manage.sys.core.service.impl; -import cn.novalon.gym.manage.sys.audit.service.IAuditLogService; -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; -import cn.novalon.gym.manage.sys.core.repository.IGroupCourseRepository; -import cn.novalon.gym.manage.sys.core.service.IGroupCourseService; +package cn.novalon.gym.manage.groupcourse.service.impl; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository; +import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -/** - * @author:liwentao - * @date:2026/4/26-04-26-14:12 - */ @Service public class GroupCourseService implements IGroupCourseService { private final IGroupCourseRepository groupCourseRepository; - private final IAuditLogService auditLogService; - public GroupCourseService(IGroupCourseRepository groupCourseRepository, IAuditLogService auditLogService){ + + public GroupCourseService(IGroupCourseRepository groupCourseRepository){ this.groupCourseRepository = groupCourseRepository; - this.auditLogService = auditLogService; } @Override diff --git a/gym-manage-api/gym-groupCourse/src/main/resources/application.yaml b/gym-manage-api/gym-groupCourse/src/main/resources/application.yaml new file mode 100644 index 0000000..2d60330 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/resources/application.yaml @@ -0,0 +1,3 @@ +spring: + application: + name: gym-groupCourse diff --git a/gym-manage-api/gym-groupCourse/src/test/java/cn/novalon/gym/manage/groupcourse/GymGroupCourseApplicationTests.java b/gym-manage-api/gym-groupCourse/src/test/java/cn/novalon/gym/manage/groupcourse/GymGroupCourseApplicationTests.java new file mode 100644 index 0000000..b0d48f8 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/test/java/cn/novalon/gym/manage/groupcourse/GymGroupCourseApplicationTests.java @@ -0,0 +1,13 @@ +package cn.novalon.gym.manage.groupcourse; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class GymGroupCourseApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java deleted file mode 100644 index f414735..0000000 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java +++ /dev/null @@ -1,75 +0,0 @@ -package cn.novalon.gym.manage.db.entity; - -import org.springframework.data.relational.core.mapping.Column; -import org.springframework.data.relational.core.mapping.Table; - -import java.util.Date; - -/** - * @author:liwentao - * @date:2026/4/25-04-25-17:50 - * 团课预约记录表 - */ - -@Table("group_course_booking") -public class GroupCourseBookingEntity extends BaseEntity { - - //团课id - @Column("course_id") - private Long courseId; - - //用户id - @Column("user_id") - private Long userId; - - //预约时间 - @Column("booking_time") - private Date bookingTime; - - //状态：0-已预约，1-已取消，2-已出席，3-缺席 - @Column("status") - private Long status; - //取消时间 - @Column("cancel_time") - private Date cancelTime; - - public Long getCourseId() { - return courseId; - } - - public void setCourseId(Long courseId) { - this.courseId = courseId; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public Date getBookingTime() { - return bookingTime; - } - - public void setBookingTime(Date bookingTime) { - this.bookingTime = bookingTime; - } - - public Long getStatus() { - return status; - } - - public void setStatus(Long status) { - this.status = status; - } - - public Date getCancelTime() { - return cancelTime; - } - - public void setCancelTime(Date cancelTime) { - this.cancelTime = cancelTime; - } -} From 0d2ed2aba5173894978742c9c1232900d993a814 Mon Sep 17 00:00:00 2001 From: liwentao Date: Fri, 15 May 2026 15:51:46 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/novalon/gym/manage/sys/config/SecurityConfig.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 b68cf04..a824830 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 @@ -50,10 +50,7 @@ public class SecurityConfig { spec.pathMatchers("/api/auth/**").permitAll() .pathMatchers("/api/public/**").permitAll() .pathMatchers("/ws/**").permitAll() - .pathMatchers("/actuator/**").permitAll() - //========TODO lwt 以下是测试接口，生产时必关======== - .pathMatchers("/api/users/**").permitAll() - .pathMatchers("/api/groupCourse/**").permitAll(); + .pathMatchers("/actuator/**").permitAll(); if (isDevOrTest) { From a8c7a4061e270ee7bd2bcffdf4bed2cddbfed38c Mon Sep 17 00:00:00 2001 From: liwentao Date: Fri, 15 May 2026 17:32:03 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Redis=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=E6=B3=A8=EF=BC=9A/api/groupCourse/cache/g?= =?UTF-8?q?et=E6=8E=A5=E5=8F=A3=E4=B8=BA=E6=B5=8B=E8=AF=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gym-manage-api/gym-groupCourse/pom.xml | 7 ++ .../handler/GroupCourseHandler.java | 92 ++++++++++++++- .../repository/IGroupCourseRepository.java | 5 + .../impl/GroupCourseRepository.java | 75 ++++++++++++ .../service/IGroupCourseService.java | 4 + .../groupcourse/service/RedisService.java | 76 +++++++++++++ .../service/impl/GroupCourseService.java | 107 +++++++++++++++++- .../gym/manage/app/config/RedisConfig.java | 43 +++++++ .../src/main/resources/application.yml | 13 +++ .../gym/manage/sys/config/SecurityConfig.java | 3 +- 10 files changed, 420 insertions(+), 5 deletions(-) create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java create mode 100644 gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java diff --git a/gym-manage-api/gym-groupCourse/pom.xml b/gym-manage-api/gym-groupCourse/pom.xml index 3fc53bb..a7bfc02 100644 --- a/gym-manage-api/gym-groupCourse/pom.xml +++ b/gym-manage-api/gym-groupCourse/pom.xml @@ -67,6 +67,13 @@ 2.2.43 compile + + + + + org.springframework.boot + spring-boot-starter-data-redis + diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java index 920786f..db6c601 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java @@ -1,8 +1,11 @@ package cn.novalon.gym.manage.groupcourse.handler; +import cn.novalon.gym.manage.common.dto.PageRequest; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService; +import cn.novalon.gym.manage.groupcourse.service.RedisService; +import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Validator; @@ -11,15 +14,25 @@ import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerResponse; import reactor.core.publisher.Mono; +import java.util.HashMap; +import java.util.Map; + @Component @Tag(name="团课管理",description = "团课相关操作") public class GroupCourseHandler { private final IGroupCourseService groupCourseService; private final Validator validator; + private final RedisService redisService; + private final ObjectMapper objectMapper; - public GroupCourseHandler(IGroupCourseService groupCourseService, Validator validator){ + public GroupCourseHandler(IGroupCourseService groupCourseService, + Validator validator, + RedisService redisService, + ObjectMapper objectMapper){ this.groupCourseService = groupCourseService; this.validator = validator; + this.redisService = redisService; + this.objectMapper = objectMapper; } @Operation(summary = "获取所有团课", description = "获取系统中所有团课列表") @@ -29,10 +42,87 @@ public class GroupCourseHandler { .body(groupCourseService.findAll(includeDeleted), GroupCourse.class); } + @Operation(summary = "分页获取团课", description = "根据分页参数获取团课列表") + public Mono getGroupCoursesByPage(ServerRequest request) { + return request.bodyToMono(PageRequest.class) + .flatMap(pageRequest -> { + boolean includeDeleted = request.queryParam("includeDeleted") + .map(Boolean::parseBoolean) + .orElse(false); + + if (pageRequest.getPage() < 0) { + pageRequest.setPage(0); + } + if (pageRequest.getSize() <= 0 || pageRequest.getSize() > 100) { + pageRequest.setSize(10); + } + if (pageRequest.getSort() == null || pageRequest.getSort().isEmpty()) { + pageRequest.setSort("id"); + } + if (pageRequest.getOrder() == null || pageRequest.getOrder().isEmpty()) { + pageRequest.setOrder("asc"); + } + + return groupCourseService.findByPage(pageRequest, includeDeleted) + .flatMap(response -> ServerResponse.ok().bodyValue(response)); + }); + } + @Operation(summary = "根据ID获取团课", description = "根据ID获取团课详情") public Mono getGroupCourseById(ServerRequest request){ Long id = Long.valueOf(request.pathVariable("id")); return ServerResponse.ok() .body(groupCourseService.findById(id), GroupCourse.class); } + + @Operation(summary = "测试-根据Key获取Redis缓存", description = "测试接口：根据传入的key值获取Redis中缓存的数据") + public Mono getCacheByKey(ServerRequest request) { + return request.bodyToMono(Map.class) + .flatMap(body -> { + String key = (String) body.get("key"); + + if (key == null || key.isEmpty()) { + Map error = new HashMap<>(); + error.put("success", false); + error.put("message", "key参数不能为空"); + return ServerResponse.badRequest().bodyValue(error); + } + + Object cachedValue = redisService.get(key); + + Map result = new HashMap<>(); + if (cachedValue != null) { + result.put("success", true); + result.put("key", key); + result.put("value", cachedValue); + result.put("message", "缓存命中"); + + try { + if (cachedValue instanceof String) { + Object jsonObject = objectMapper.readValue((String) cachedValue, Object.class); + result.put("parsedValue", jsonObject); + result.put("valueType", "JSON字符串"); + } else { + result.put("valueType", cachedValue.getClass().getSimpleName()); + } + } catch (Exception e) { + result.put("parsedValue", null); + result.put("valueType", "无法解析"); + } + } else { + result.put("success", false); + result.put("key", key); + result.put("value", null); + result.put("message", "缓存未命中"); + } + + return ServerResponse.ok().bodyValue(result); + }) + .onErrorResume(error -> { + Map errorResponse = new HashMap<>(); + errorResponse.put("success", false); + errorResponse.put("message", "请求处理失败: " + error.getMessage()); + return ServerResponse.status(500).bodyValue(errorResponse); + }); + } } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java index 4ade673..1a2d402 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java @@ -1,6 +1,8 @@ package cn.novalon.gym.manage.groupcourse.repository; +import cn.novalon.gym.manage.common.dto.PageRequest; +import cn.novalon.gym.manage.common.dto.PageResponse; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; import org.springframework.data.domain.Sort; import reactor.core.publisher.Flux; @@ -12,4 +14,7 @@ public interface IGroupCourseRepository { Flux findAll(Sort sort); Flux findByDeletedAtIsNull(); Flux findByDeletedAtIsNull(Sort sort); + + Mono> findByPage(PageRequest pageRequest); + Mono> findByPageAndNotDeleted(PageRequest pageRequest); } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java index 5c11325..aa249d1 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java @@ -1,16 +1,22 @@ package cn.novalon.gym.manage.groupcourse.repository.impl; +import cn.novalon.gym.manage.common.dto.PageRequest; +import cn.novalon.gym.manage.common.dto.PageResponse; import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter; import cn.novalon.gym.manage.groupcourse.dao.GroupCourseDao; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity; import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository; import org.springframework.data.domain.Sort; import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; +import org.springframework.data.relational.core.query.Query; import org.springframework.stereotype.Repository; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.util.List; + @Repository public class GroupCourseRepository implements IGroupCourseRepository { private final GroupCourseDao groupCourseDao; @@ -53,4 +59,73 @@ public class GroupCourseRepository implements IGroupCourseRepository { return groupCourseDao.findAllByDeletedAtIsNull(sort) .map(groupCourseConverter::toDomain); } + + @Override + public Mono> findByPage(PageRequest pageRequest) { + int page = pageRequest.getPage(); + int size = pageRequest.getSize(); + String sort = pageRequest.getSort(); + String order = pageRequest.getOrder(); + + Sort sortObj = Sort.unsorted(); + if (sort != null && !sort.isEmpty()) { + sortObj = Sort.by(Sort.Direction.fromString(order), sort); + } + + org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj); + + Query query = Query.empty(); + + return r2dbcEntityTemplate.select(GroupCourseEntity.class) + .matching(query.with(pageable)) + .all() + .collectList() + .zipWith(r2dbcEntityTemplate.count(query, GroupCourseEntity.class)) + .map(tuple -> { + long total = tuple.getT2(); + int totalPages = (int) Math.ceil((double) total / size); + List courseList = tuple.getT1().stream() + .map(groupCourseConverter::toDomain) + .toList(); + return new PageResponse<>(courseList, totalPages, total, page, size); + }); + } + + @Override + public Mono> findByPageAndNotDeleted(PageRequest pageRequest) { + int page = pageRequest.getPage(); + int size = pageRequest.getSize(); + String sort = pageRequest.getSort(); + String order = pageRequest.getOrder(); + + Sort sortObj = Sort.unsorted(); + if (sort != null && !sort.isEmpty()) { + sortObj = Sort.by(Sort.Direction.fromString(order), sort); + } + + org.springframework.data.domain.PageRequest pageable = org.springframework.data.domain.PageRequest.of(page, size, sortObj); + + return groupCourseDao.findAllByDeletedAtIsNull(sortObj) + .collectList() + .zipWith(groupCourseDao.findAllByDeletedAtIsNull().count()) + .map(tuple -> { + List allEntities = tuple.getT1(); + long total = tuple.getT2(); + + int fromIndex = page * size; + int toIndex = Math.min(fromIndex + size, allEntities.size()); + + List courseList; + if (fromIndex < allEntities.size()) { + courseList = allEntities.subList(fromIndex, toIndex).stream() + .map(groupCourseConverter::toDomain) + .toList(); + } else { + courseList = List.of(); + } + + int totalPages = (int) Math.ceil((double) total / size); + return new PageResponse<>(courseList, totalPages, total, page, size); + }); + } } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java index d43b396..7fa0b70 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java @@ -1,6 +1,8 @@ package cn.novalon.gym.manage.groupcourse.service; +import cn.novalon.gym.manage.common.dto.PageRequest; +import cn.novalon.gym.manage.common.dto.PageResponse; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -9,4 +11,6 @@ public interface IGroupCourseService { Mono findById(Long id); Flux findAll(); Flux findAll(boolean includeDeleted); + + Mono> findByPage(PageRequest pageRequest, boolean includeDeleted); } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java new file mode 100644 index 0000000..aa92e38 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java @@ -0,0 +1,76 @@ +package cn.novalon.gym.manage.groupcourse.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.Set; +import java.util.concurrent.TimeUnit; + +/** + * @author:liwentao + * @date:2026/5/15-05-15-16:05 + */ +@Service +public class RedisService { + + @Autowired + private RedisTemplate redisTemplate; + + // 设置值 + public void set(String key, Object value) { + redisTemplate.opsForValue().set(key, value); + } + + // 设置值并指定过期时间（秒） + public void setWithExpire(String key, Object value, long timeout) { + redisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS); + } + + // 获取值 + public Object get(String key) { + return redisTemplate.opsForValue().get(key); + } + + // 删除key + public Boolean delete(String key) { + return redisTemplate.delete(key); + } + + // 判断key是否存在 + public Boolean hasKey(String key) { + return redisTemplate.hasKey(key); + } + + // 设置过期时间 + public Boolean expire(String key, long timeout) { + return redisTemplate.expire(key, timeout, TimeUnit.SECONDS); + } + + // Hash操作 + public void putHash(String key, String hashKey, Object value) { + redisTemplate.opsForHash().put(key, hashKey, value); + } + + public Object getHash(String key, String hashKey) { + return redisTemplate.opsForHash().get(key, hashKey); + } + + // List操作 + public void leftPush(String key, Object value) { + redisTemplate.opsForList().leftPush(key, value); + } + + public Object rightPop(String key) { + return redisTemplate.opsForList().rightPop(key); + } + + // Set操作 + public void addToSet(String key, Object... values) { + redisTemplate.opsForSet().add(key, values); + } + + public Set getSet(String key) { + return redisTemplate.opsForSet().members(key); + } +} diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java index 6e409e3..70a43cc 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java @@ -1,24 +1,79 @@ package cn.novalon.gym.manage.groupcourse.service.impl; +import cn.novalon.gym.manage.common.dto.PageRequest; +import cn.novalon.gym.manage.common.dto.PageResponse; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository; import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService; +import cn.novalon.gym.manage.groupcourse.service.RedisService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.time.Duration; +import java.util.List; + @Service public class GroupCourseService implements IGroupCourseService { - private final IGroupCourseRepository groupCourseRepository; + private static final Logger logger = LoggerFactory.getLogger(GroupCourseService.class); - public GroupCourseService(IGroupCourseRepository groupCourseRepository){ + private final IGroupCourseRepository groupCourseRepository; + private final RedisService redisService; + private final ObjectMapper objectMapper; + + private static final String CACHE_KEY_PREFIX = "group_course:page:"; + private static final String CACHE_KEY_ID_PREFIX = "group_course:id:"; + private static final long CACHE_EXPIRE_SECONDS = 300; + + public GroupCourseService(IGroupCourseRepository groupCourseRepository, + RedisService redisService, + ObjectMapper objectMapper){ this.groupCourseRepository = groupCourseRepository; + this.redisService = redisService; + this.objectMapper = objectMapper; } @Override public Mono findById(Long id) { - return groupCourseRepository.findByIdAndDeletedAtIsNull(id); + String cacheKey = CACHE_KEY_ID_PREFIX + id; + + Object cachedData = redisService.get(cacheKey); + if (cachedData != null) { + try { + String json; + if (cachedData instanceof String) { + json = (String) cachedData; + } else { + json = objectMapper.writeValueAsString(cachedData); + } + + GroupCourse groupCourse = objectMapper.readValue(json, GroupCourse.class); + logger.info("缓存命中 - findById: id={}", id); + return Mono.just(groupCourse); + } catch (JsonProcessingException e) { + logger.warn("缓存解析失败，删除缓存 - id: {}, error: {}", id, e.getMessage()); + redisService.delete(cacheKey); + } + } + + logger.debug("缓存未命中，查询数据库 - findById: id={}", id); + return groupCourseRepository.findByIdAndDeletedAtIsNull(id) + .doOnSuccess(groupCourse -> { + if (groupCourse != null) { + try { + String jsonData = objectMapper.writeValueAsString(groupCourse); + redisService.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS); + logger.debug("缓存已设置 - findById: id={}", id); + } catch (JsonProcessingException e) { + logger.error("缓存设置失败 - id: {}, error: {}", id, e.getMessage()); + } + } + }); } @Override @@ -34,4 +89,50 @@ public class GroupCourseService implements IGroupCourseService { return groupCourseRepository.findByDeletedAtIsNull(); } } + + @Override + public Mono> findByPage(PageRequest pageRequest, boolean includeDeleted) { + int page = pageRequest.getPage(); + int size = pageRequest.getSize(); + + String cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted; + + Object cachedData = redisService.get(cacheKey); + if (cachedData != null) { + try { + String json; + if (cachedData instanceof String) { + json = (String) cachedData; + } else { + json = objectMapper.writeValueAsString(cachedData); + } + + PageResponse pageResponse = objectMapper.readValue(json, + objectMapper.getTypeFactory().constructParametricType(PageResponse.class, GroupCourse.class)); + logger.info("缓存命中 - findByPage: key={}", cacheKey); + return Mono.just(pageResponse); + } catch (JsonProcessingException e) { + logger.warn("缓存解析失败，删除缓存 - key: {}, error: {}", cacheKey, e.getMessage()); + redisService.delete(cacheKey); + } + } + + logger.debug("缓存未命中，查询数据库 - findByPage: key={}", cacheKey); + Mono> resultMono; + if (includeDeleted) { + resultMono = groupCourseRepository.findByPage(pageRequest); + } else { + resultMono = groupCourseRepository.findByPageAndNotDeleted(pageRequest); + } + + return resultMono.doOnSuccess(pageResponse -> { + try { + String jsonData = objectMapper.writeValueAsString(pageResponse); + redisService.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS); + logger.debug("缓存已设置 - findByPage: key={}", cacheKey); + } catch (JsonProcessingException e) { + logger.error("缓存设置失败 - key: {}, error: {}", cacheKey, e.getMessage()); + } + }); + } } diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java new file mode 100644 index 0000000..12d804e --- /dev/null +++ b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java @@ -0,0 +1,43 @@ +package cn.novalon.gym.manage.app.config; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +/** + * @author:liwentao + * @date:2026/5/15-05-15-16:01 + */ +@Configuration +public class RedisConfig { + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory factory) { + RedisTemplate template = new RedisTemplate<>(); + template.setConnectionFactory(factory); + + // 创建ObjectMapper并配置 + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.activateDefaultTyping(om.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL); + + // 使用GenericJackson2JsonRedisSerializer替代已弃用的方式 + GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer = new GenericJackson2JsonRedisSerializer(om); + + // 使用StringRedisSerializer来序列化和反序列化redis的key值 + StringRedisSerializer stringSerializer = new StringRedisSerializer(); + template.setKeySerializer(stringSerializer); + template.setValueSerializer(genericJackson2JsonRedisSerializer); + template.setHashKeySerializer(stringSerializer); + template.setHashValueSerializer(genericJackson2JsonRedisSerializer); + + template.afterPropertiesSet(); + return template; + } +} \ No newline at end of file diff --git a/gym-manage-api/manage-app/src/main/resources/application.yml b/gym-manage-api/manage-app/src/main/resources/application.yml index 708973f..39acf0e 100644 --- a/gym-manage-api/manage-app/src/main/resources/application.yml +++ b/gym-manage-api/manage-app/src/main/resources/application.yml @@ -38,11 +38,24 @@ spring: user: name: disabled password: disabled + data: + redis: + host: ${REDIS_HOST:localhost} + port: ${REDIS_PORT:6379} + password: ${REDIS_PASSWORD:novalon123} + timeout: 5000 + lettuce: + pool: + max-active: 8 # 最大连接数 + max-idle: 8 # 最大空闲连接 + min-idle: 0 # 最小空闲连接 + max-wait: -1ms # 连接等待时间 profiles: active: dev config: import: classpath:member-config.yml + management: endpoints: web: 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 a824830..83ea7df 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 @@ -50,7 +50,8 @@ public class SecurityConfig { spec.pathMatchers("/api/auth/**").permitAll() .pathMatchers("/api/public/**").permitAll() .pathMatchers("/ws/**").permitAll() - .pathMatchers("/actuator/**").permitAll(); + .pathMatchers("/actuator/**").permitAll() + .pathMatchers("/api/groupCourse/**").permitAll(); if (isDevOrTest) { From 03991319fd5b5cee8ae07bb78b6058b61a7fc637 Mon Sep 17 00:00:00 2001 From: liwentao Date: Mon, 1 Jun 2026 19:28:06 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A8=A1=E5=9D=972-2.1?= =?UTF-8?q?=E5=9B=A2=E8=AF=BE=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../converter/GroupCourseConverter.java | 74 +++++ .../dao/GroupCourseBookingDao.java | 63 ++++ .../domain/GroupCourseBooking.java | 135 +++++++++ .../entity/GroupCourseBookingEntity.java | 137 +++++++++ .../event/BookingReminderEvent.java | 57 ++++ .../event/BookingReminderEventListener.java | 98 ++++++ .../event/BookingReminderEventPublisher.java | 74 +++++ .../handler/GroupCourseBookingHandler.java | 120 ++++++++ .../handler/GroupCourseHandler.java | 80 ++--- .../IGroupCourseBookingRepository.java | 59 ++++ .../impl/GroupCourseBookingRepository.java | 85 ++++++ .../service/IGroupCourseBookingService.java | 57 ++++ .../groupcourse/service/RedisService.java | 76 ----- .../impl/GroupCourseBookingService.java | 284 ++++++++++++++++++ .../service/impl/GroupCourseRedisService.java | 183 +++++++++++ .../service/impl/GroupCourseService.java | 144 +++++---- .../impl/MemberCardRecordServiceImpl.java | 2 +- .../service/impl/MemberCardServiceImpl.java | 2 +- .../service/impl/MemberServiceImpl.java | 11 +- .../impl/RefundApplicationServiceImpl.java | 2 +- .../service/impl/WechatApiServiceImpl.java | 2 +- .../service/impl/WechatAuthServiceImpl.java | 4 +- .../impl/WechatOfficialServiceImpl.java | 2 +- gym-manage-api/manage-app/pom.xml | 6 + .../gym/manage/app/ManageApplication.java | 3 +- .../gym/manage/app/config/RedisConfig.java | 43 --- .../gym/manage/app/config/SystemRouter.java | 22 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../gym/manage/common/config/RedisConfig.java | 2 +- .../gym/manage/common/util/RedisUtil.java | 2 +- .../V6__Create_GroupCourse_table.sql | 6 +- .../V7__Insert_GroupCourse_test_data.sql | 31 +- .../V8__Create_Member_And_MemberCard.sql | 281 +++++++++++++++++ ...dd_GroupCourse_Booking_Snapshot_Fields.sql | 15 + .../gym/manage/sys/config/SecurityConfig.java | 7 +- gym-manage-api/pom.xml | 8 +- 37 files changed, 1911 insertions(+), 270 deletions(-) create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourseBooking.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseBookingEntity.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEvent.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventListener.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventPublisher.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseBookingService.java delete mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseRedisService.java delete mode 100644 gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java create mode 100644 gym-manage-api/manage-db/src/main/resources/db/migration/V8__Create_Member_And_MemberCard.sql create mode 100644 gym-manage-api/manage-db/src/main/resources/db/migration/V9__Add_GroupCourse_Booking_Snapshot_Fields.sql diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/converter/GroupCourseConverter.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/converter/GroupCourseConverter.java index 34e66c4..e8bcf07 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/converter/GroupCourseConverter.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/converter/GroupCourseConverter.java @@ -3,6 +3,8 @@ package cn.novalon.gym.manage.groupcourse.converter; import cn.hutool.core.bean.BeanUtil; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking; +import cn.novalon.gym.manage.groupcourse.entity.GroupCourseBookingEntity; import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -10,9 +12,19 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.stream.Collectors; +/** + * 团课相关转换器 + * + * @author 张翔 + * @date 2026-06-01 + */ @Component @Slf4j public class GroupCourseConverter { + + /** + * 将团课实体转换为领域模型 + */ public GroupCourse toDomain(GroupCourseEntity entity){ if(entity == null){ return null; @@ -23,6 +35,9 @@ public class GroupCourseConverter { return groupCourse; } + /** + * 将团课领域模型转换为实体 + */ public GroupCourseEntity toEntity(GroupCourse domain){ if(domain == null){ return null; @@ -33,6 +48,9 @@ public class GroupCourseConverter { return entity; } + /** + * 将团课实体列表转换为领域模型列表 + */ public List toDomainList(List entities){ if (entities == null) { return null; @@ -42,6 +60,9 @@ public class GroupCourseConverter { .collect(Collectors.toList()); } + /** + * 将团课领域模型列表转换为实体列表 + */ public List toEntityList(List domains){ if (domains == null) { return null; @@ -50,4 +71,57 @@ public class GroupCourseConverter { .map(this::toEntity) .collect(Collectors.toList()); } + + /** + * 将团课预约实体转换为领域模型 + */ + public GroupCourseBooking toBookingDomain(GroupCourseBookingEntity entity){ + if(entity == null){ + return null; + } + GroupCourseBooking booking = new GroupCourseBooking(); + BeanUtil.copyProperties(entity, booking); + log.debug("转换预约记录实体到领域模型：bookingId={}", entity.getId()); + return booking; + } + + /** + * 将团课预约领域模型转换为实体 + */ + public GroupCourseBookingEntity toBookingEntity(GroupCourseBooking domain){ + if(domain == null){ + return null; + } + GroupCourseBookingEntity entity = new GroupCourseBookingEntity(); + BeanUtil.copyProperties(domain, entity); + if (domain.getId() != null) { + entity.markNotNew(); + } + log.debug("转换预约记录领域模型到实体：bookingId={}", domain.getId()); + return entity; + } + + /** + * 将团课预约实体列表转换为领域模型列表 + */ + public List toBookingDomainList(List entities){ + if (entities == null) { + return null; + } + return entities.stream() + .map(this::toBookingDomain) + .collect(Collectors.toList()); + } + + /** + * 将团课预约领域模型列表转换为实体列表 + */ + public List toBookingEntityList(List domains){ + if (domains == null) { + return null; + } + return domains.stream() + .map(this::toBookingEntity) + .collect(Collectors.toList()); + } } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java new file mode 100644 index 0000000..f61f0c9 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java @@ -0,0 +1,63 @@ +package cn.novalon.gym.manage.groupcourse.dao; + +import cn.novalon.gym.manage.groupcourse.entity.GroupCourseBookingEntity; +import org.springframework.data.domain.Sort; +import org.springframework.data.r2dbc.repository.R2dbcRepository; +import org.springframework.stereotype.Repository; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * 团课预约记录DAO接口 + * + * @author 张翔 + * @date 2026-06-01 + */ +@Repository +public interface GroupCourseBookingDao extends R2dbcRepository { + + /** + * 根据ID查询未删除的预约记录 + */ + Mono findByIdIsAndDeletedAtIsNull(Long id); + + /** + * 根据会员ID查询所有预约记录 + */ + Flux findByMemberIdAndDeletedAtIsNull(Long memberId); + + /** + * 根据会员ID查询所有预约记录（带排序） + */ + Flux findByMemberIdAndDeletedAtIsNull(Long memberId, Sort sort); + + /** + * 根据团课ID查询所有预约记录 + */ + Flux findByCourseIdAndDeletedAtIsNull(Long courseId); + + /** + * 根据团课ID和会员ID查询预约记录 + */ + Mono findByCourseIdAndMemberIdAndDeletedAtIsNull(Long courseId, Long memberId); + + /** + * 根据团课ID和状态查询预约记录 + */ + Flux findByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status); + + /** + * 查询会员在指定课程的有效预约（状态为已预约且未取消） + */ + Mono findByCourseIdAndMemberIdAndStatusAndDeletedAtIsNull(Long courseId, Long memberId, String status); + + /** + * 根据会员卡ID查询预约记录 + */ + Flux findByMemberCardIdAndDeletedAtIsNull(Long memberCardId); + + /** + * 统计团课已预约人数 + */ + Mono countByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status); +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourseBooking.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourseBooking.java new file mode 100644 index 0000000..e26423f --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourseBooking.java @@ -0,0 +1,135 @@ +package cn.novalon.gym.manage.groupcourse.domain; + +import cn.novalon.gym.manage.sys.core.domain.BaseDomain; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.time.LocalDateTime; + +/** + * 团课预约记录领域模型 + * + * @author 张翔 + * @date 2026-06-01 + */ +public class GroupCourseBooking extends BaseDomain { + + //团课ID + @Schema(description = "团课ID", example = "1") + private Long courseId; + + //团课名称（关联查询） + @Schema(description = "团课名称", example = "瑜伽入门") + private String courseName; + + //会员ID + @Schema(description = "会员ID", example = "1") + private Long memberId; + + //会员卡ID + @Schema(description = "会员卡ID", example = "1") + private Long memberCardId; + + //预约时间 + @Schema(description = "预约时间", example = "2026-06-01 10:00:00") + private LocalDateTime bookingTime; + + //状态：0-已预约，1-已取消，2-已出席，3-缺席 + @Schema(description = "状态：0-已预约，1-已取消，2-已出席，3-缺席", example = "0") + private String status; + + //取消时间 + @Schema(description = "取消时间", example = "2026-06-01 11:00:00") + private LocalDateTime cancelTime; + + //课程开始时间 + @Schema(description = "课程开始时间", example = "2026-06-02 09:00:00") + private LocalDateTime courseStartTime; + + //课程结束时间 + @Schema(description = "课程结束时间", example = "2026-06-02 10:00:00") + private LocalDateTime courseEndTime; + + //上课地点 + @Schema(description = "上课地点", example = "健身房A区") + private String location; + + public Long getCourseId() { + return courseId; + } + + public void setCourseId(Long courseId) { + this.courseId = courseId; + } + + public String getCourseName() { + return courseName; + } + + public void setCourseName(String courseName) { + this.courseName = courseName; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Long getMemberCardId() { + return memberCardId; + } + + public void setMemberCardId(Long memberCardId) { + this.memberCardId = memberCardId; + } + + public LocalDateTime getBookingTime() { + return bookingTime; + } + + public void setBookingTime(LocalDateTime bookingTime) { + this.bookingTime = bookingTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public LocalDateTime getCancelTime() { + return cancelTime; + } + + public void setCancelTime(LocalDateTime cancelTime) { + this.cancelTime = cancelTime; + } + + public LocalDateTime getCourseStartTime() { + return courseStartTime; + } + + public void setCourseStartTime(LocalDateTime courseStartTime) { + this.courseStartTime = courseStartTime; + } + + public LocalDateTime getCourseEndTime() { + return courseEndTime; + } + + public void setCourseEndTime(LocalDateTime courseEndTime) { + this.courseEndTime = courseEndTime; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseBookingEntity.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseBookingEntity.java new file mode 100644 index 0000000..dbea5aa --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseBookingEntity.java @@ -0,0 +1,137 @@ +package cn.novalon.gym.manage.groupcourse.entity; + +import cn.novalon.gym.manage.db.entity.BaseEntity; +import org.springframework.data.relational.core.mapping.Column; +import org.springframework.data.relational.core.mapping.Table; + +import java.time.LocalDateTime; + +/** + * 团课预约记录实体类 - 对应 group_course_booking 表 + * + * @author 张翔 + * @date 2026-06-01 + */ +@Table("group_course_booking") +public class GroupCourseBookingEntity extends BaseEntity { + + //团课ID + @Column("course_id") + private Long courseId; + + //会员ID + @Column("member_id") + private Long memberId; + + //会员卡ID + @Column("member_card_id") + private Long memberCardId; + + //预约时间 + @Column("booking_time") + private LocalDateTime bookingTime; + + //状态：0-已预约，1-已取消，2-已出席，3-缺席 + @Column("status") + private String status; + + //取消时间 + @Column("cancel_time") + private LocalDateTime cancelTime; + + //课程名称（冗余字段，保存预约时的课程快照） + @Column("course_name") + private String courseName; + + //课程开始时间（冗余字段，保存预约时的课程快照） + @Column("course_start_time") + private LocalDateTime courseStartTime; + + //课程结束时间（冗余字段，保存预约时的课程快照） + @Column("course_end_time") + private LocalDateTime courseEndTime; + + //上课地点（冗余字段，保存预约时的课程快照） + @Column("location") + private String location; + + public Long getCourseId() { + return courseId; + } + + public void setCourseId(Long courseId) { + this.courseId = courseId; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Long getMemberCardId() { + return memberCardId; + } + + public void setMemberCardId(Long memberCardId) { + this.memberCardId = memberCardId; + } + + public LocalDateTime getBookingTime() { + return bookingTime; + } + + public void setBookingTime(LocalDateTime bookingTime) { + this.bookingTime = bookingTime; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public LocalDateTime getCancelTime() { + return cancelTime; + } + + public void setCancelTime(LocalDateTime cancelTime) { + this.cancelTime = cancelTime; + } + + public String getCourseName() { + return courseName; + } + + public void setCourseName(String courseName) { + this.courseName = courseName; + } + + public LocalDateTime getCourseStartTime() { + return courseStartTime; + } + + public void setCourseStartTime(LocalDateTime courseStartTime) { + this.courseStartTime = courseStartTime; + } + + public LocalDateTime getCourseEndTime() { + return courseEndTime; + } + + public void setCourseEndTime(LocalDateTime courseEndTime) { + this.courseEndTime = courseEndTime; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEvent.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEvent.java new file mode 100644 index 0000000..0933035 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEvent.java @@ -0,0 +1,57 @@ +package cn.novalon.gym.manage.groupcourse.event; + +import org.springframework.context.ApplicationEvent; + +/** + * 预约提醒事件 + * + * @author 张翔 + * @date 2026-06-01 + */ +public class BookingReminderEvent extends ApplicationEvent { + + /** + * 消息类型枚举 + */ + public enum ReminderType { + BOOKING_SUCCESS, // 预约成功 + COURSE_REMINDER, // 课程即将开始提醒 + BOOKING_CANCEL // 预约取消 + } + + private final Long bookingId; + private final Long memberId; + private final String courseName; + private final String courseTime; + private final ReminderType type; + + public BookingReminderEvent(Object source, Long bookingId, Long memberId, + String courseName, String courseTime, ReminderType type) { + super(source); + this.bookingId = bookingId; + this.memberId = memberId; + this.courseName = courseName; + this.courseTime = courseTime; + this.type = type; + } + + public Long getBookingId() { + return bookingId; + } + + public Long getMemberId() { + return memberId; + } + + public String getCourseName() { + return courseName; + } + + public String getCourseTime() { + return courseTime; + } + + public ReminderType getType() { + return type; + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventListener.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventListener.java new file mode 100644 index 0000000..9ffa621 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventListener.java @@ -0,0 +1,98 @@ +package cn.novalon.gym.manage.groupcourse.event; + +import cn.novalon.gym.manage.groupcourse.event.BookingReminderEvent.ReminderType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +/** + * 预约提醒事件监听器 + * + * 监听预约相关事件，处理提醒业务 + * + * @author 张翔 + * @date 2026-06-01 + */ +@Component +public class BookingReminderEventListener { + + private static final Logger logger = LoggerFactory.getLogger(BookingReminderEventListener.class); + + /** + * 处理预约提醒事件 + * + * @param event 预约提醒事件 + */ + @EventListener + public void handleBookingReminderEvent(BookingReminderEvent event) { + logger.info("收到预约提醒事件：type={}, bookingId={}, memberId={}", + event.getType(), event.getBookingId(), event.getMemberId()); + + try { + processReminderEvent(event); + } catch (Exception e) { + logger.error("处理预约提醒事件失败：bookingId={}, error={}", + event.getBookingId(), e.getMessage(), e); + } + } + + /** + * 处理提醒事件 + * + * 根据事件类型执行不同的提醒逻辑 + */ + private void processReminderEvent(BookingReminderEvent event) { + switch (event.getType()) { + case BOOKING_SUCCESS: + handleBookingSuccess(event); + break; + case COURSE_REMINDER: + handleCourseReminder(event); + break; + case BOOKING_CANCEL: + handleBookingCancel(event); + break; + default: + logger.warn("未知的提醒事件类型：{}", event.getType()); + } + + logger.info("预约提醒事件处理完成：bookingId={}", event.getBookingId()); + } + + /** + * 处理预约成功事件 + */ + private void handleBookingSuccess(BookingReminderEvent event) { + logger.info("处理预约成功提醒：会员ID={}, 课程={}, 时间={}", + event.getMemberId(), event.getCourseName(), event.getCourseTime()); + + // 实际业务中会调用通知服务发送短信、APP推送等 + // sendNotification(event.getMemberId(), "预约成功", + // "您已成功预约课程：" + event.getCourseName() + "，时间：" + event.getCourseTime()); + } + + /** + * 处理课程即将开始提醒事件 + */ + private void handleCourseReminder(BookingReminderEvent event) { + logger.info("处理课程提醒：会员ID={}, 课程={}, 时间={}", + event.getMemberId(), event.getCourseName(), event.getCourseTime()); + + // 实际业务中会调用通知服务发送课程开始前提醒 + // sendNotification(event.getMemberId(), "课程提醒", + // "您预约的课程" + event.getCourseName() + "即将开始，时间：" + event.getCourseTime()); + } + + /** + * 处理预约取消事件 + */ + private void handleBookingCancel(BookingReminderEvent event) { + logger.info("处理预约取消提醒：会员ID={}, 课程={}", + event.getMemberId(), event.getCourseName()); + + // 实际业务中会调用通知服务发送预约取消通知 + // sendNotification(event.getMemberId(), "预约取消", + // "您已取消课程：" + event.getCourseName() + "的预约"); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventPublisher.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventPublisher.java new file mode 100644 index 0000000..5c50bd6 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/event/BookingReminderEventPublisher.java @@ -0,0 +1,74 @@ +package cn.novalon.gym.manage.groupcourse.event; + +import cn.novalon.gym.manage.groupcourse.event.BookingReminderEvent.ReminderType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.stereotype.Component; + +/** + * 预约提醒事件发布器 + * + * 使用Spring事件机制发布预约相关事件 + * + * @author 张翔 + * @date 2026-06-01 + */ +@Component +public class BookingReminderEventPublisher { + + private static final Logger logger = LoggerFactory.getLogger(BookingReminderEventPublisher.class); + + private final ApplicationEventPublisher eventPublisher; + + public BookingReminderEventPublisher(ApplicationEventPublisher eventPublisher) { + this.eventPublisher = eventPublisher; + } + + /** + * 发布预约成功事件 + * + * @param bookingId 预约ID + * @param memberId 会员ID + * @param courseName 课程名称 + * @param courseTime 课程时间 + */ + public void publishBookingSuccessEvent(Long bookingId, Long memberId, String courseName, String courseTime) { + BookingReminderEvent event = new BookingReminderEvent( + this, bookingId, memberId, courseName, courseTime, ReminderType.BOOKING_SUCCESS); + + logger.info("发布预约成功事件：bookingId={}, memberId={}", bookingId, memberId); + eventPublisher.publishEvent(event); + } + + /** + * 发布课程即将开始提醒事件 + * + * @param bookingId 预约ID + * @param memberId 会员ID + * @param courseName 课程名称 + * @param courseTime 课程时间 + */ + public void publishCourseReminderEvent(Long bookingId, Long memberId, String courseName, String courseTime) { + BookingReminderEvent event = new BookingReminderEvent( + this, bookingId, memberId, courseName, courseTime, ReminderType.COURSE_REMINDER); + + logger.info("发布课程提醒事件：bookingId={}, memberId={}", bookingId, memberId); + eventPublisher.publishEvent(event); + } + + /** + * 发布预约取消事件 + * + * @param bookingId 预约ID + * @param memberId 会员ID + * @param courseName 课程名称 + */ + public void publishBookingCancelEvent(Long bookingId, Long memberId, String courseName) { + BookingReminderEvent event = new BookingReminderEvent( + this, bookingId, memberId, courseName, null, ReminderType.BOOKING_CANCEL); + + logger.info("发布预约取消事件：bookingId={}, memberId={}", bookingId, memberId); + eventPublisher.publishEvent(event); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java new file mode 100644 index 0000000..3c83e9a --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java @@ -0,0 +1,120 @@ +package cn.novalon.gym.manage.groupcourse.handler; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking; +import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.function.server.ServerRequest; +import org.springframework.web.reactive.function.server.ServerResponse; +import reactor.core.publisher.Mono; + +import java.util.HashMap; +import java.util.Map; + +/** + * 团课预约Handler + * + * @author 张翔 + * @date 2026-06-01 + */ +@Component +@Tag(name = "团课预约", description = "团课预约相关操作") +public class GroupCourseBookingHandler { + + private final IGroupCourseBookingService bookingService; + + public GroupCourseBookingHandler(IGroupCourseBookingService bookingService) { + this.bookingService = bookingService; + } + + /** + * 预约团课 + */ + @Operation(summary = "预约团课", description = "会员预约指定团课") + public Mono bookCourse(ServerRequest request) { + return request.bodyToMono(Map.class) + .flatMap(body -> { + Long courseId = ((Number) body.get("courseId")).longValue(); + Long memberId = ((Number) body.get("memberId")).longValue(); + Long memberCardId = ((Number) body.get("memberCardId")).longValue(); + + return bookingService.bookCourse(courseId, memberId, memberCardId) + .flatMap(booking -> { + Map response = new HashMap<>(); + response.put("success", true); + response.put("message", "预约成功"); + response.put("data", booking); + return ServerResponse.ok().bodyValue(response); + }) + .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 cancelBooking(ServerRequest request) { + Long bookingId = Long.valueOf(request.pathVariable("bookingId")); + + return request.bodyToMono(Map.class) + .flatMap(body -> { + Long memberId = ((Number) body.get("memberId")).longValue(); + + return bookingService.cancelBooking(bookingId, memberId) + .flatMap(booking -> { + Map response = new HashMap<>(); + response.put("success", true); + response.put("message", "取消成功"); + response.put("data", booking); + return ServerResponse.ok().bodyValue(response); + }) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + }); + } + + /** + * 查询会员预约记录 + */ + @Operation(summary = "查询会员预约记录", description = "根据会员ID查询所有预约记录") + public Mono getBookingsByMemberId(ServerRequest request) { + Long memberId = Long.valueOf(request.pathVariable("memberId")); + + return ServerResponse.ok() + .body(bookingService.getBookingsByMemberId(memberId), GroupCourseBooking.class); + } + + /** + * 查询预约详情 + */ + @Operation(summary = "查询预约详情", description = "根据预约ID查询预约详情") + public Mono getBookingById(ServerRequest request) { + Long bookingId = Long.valueOf(request.pathVariable("bookingId")); + + return bookingService.getBookingById(bookingId) + .flatMap(booking -> ServerResponse.ok().bodyValue(booking)) + .switchIfEmpty(ServerResponse.notFound().build()); + } + + /** + * 查询课程预约记录 + */ + @Operation(summary = "查询课程预约记录", description = "根据团课ID查询所有预约记录") + public Mono getBookingsByCourseId(ServerRequest request) { + Long courseId = Long.valueOf(request.pathVariable("courseId")); + + return ServerResponse.ok() + .body(bookingService.getBookingsByCourseId(courseId), GroupCourseBooking.class); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java index db6c601..3886e98 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java @@ -2,9 +2,9 @@ package cn.novalon.gym.manage.groupcourse.handler; import cn.novalon.gym.manage.common.dto.PageRequest; +import cn.novalon.gym.manage.common.util.RedisUtil; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService; -import cn.novalon.gym.manage.groupcourse.service.RedisService; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,16 +22,16 @@ import java.util.Map; public class GroupCourseHandler { private final IGroupCourseService groupCourseService; private final Validator validator; - private final RedisService redisService; + private final RedisUtil redisUtil; private final ObjectMapper objectMapper; public GroupCourseHandler(IGroupCourseService groupCourseService, Validator validator, - RedisService redisService, + RedisUtil redisUtil, ObjectMapper objectMapper){ this.groupCourseService = groupCourseService; this.validator = validator; - this.redisService = redisService; + this.redisUtil = redisUtil; this.objectMapper = objectMapper; } @@ -88,41 +88,43 @@ public class GroupCourseHandler { return ServerResponse.badRequest().bodyValue(error); } - Object cachedValue = redisService.get(key); - - Map result = new HashMap<>(); - if (cachedValue != null) { - result.put("success", true); - result.put("key", key); - result.put("value", cachedValue); - result.put("message", "缓存命中"); - - try { - if (cachedValue instanceof String) { - Object jsonObject = objectMapper.readValue((String) cachedValue, Object.class); - result.put("parsedValue", jsonObject); - result.put("valueType", "JSON字符串"); - } else { - result.put("valueType", cachedValue.getClass().getSimpleName()); - } - } catch (Exception e) { - result.put("parsedValue", null); - result.put("valueType", "无法解析"); - } - } else { - result.put("success", false); - result.put("key", key); - result.put("value", null); - result.put("message", "缓存未命中"); - } - - return ServerResponse.ok().bodyValue(result); - }) - .onErrorResume(error -> { - Map errorResponse = new HashMap<>(); - errorResponse.put("success", false); - errorResponse.put("message", "请求处理失败: " + error.getMessage()); - return ServerResponse.status(500).bodyValue(errorResponse); + return redisUtil.get(key) + .map(cachedValue -> { + Map result = new HashMap<>(); + if (cachedValue != null) { + result.put("success", true); + result.put("key", key); + result.put("value", cachedValue); + result.put("message", "缓存命中"); + + try { + if (cachedValue instanceof String) { + Object jsonObject = objectMapper.readValue((String) cachedValue, Object.class); + result.put("parsedValue", jsonObject); + result.put("valueType", "JSON字符串"); + } else { + result.put("valueType", cachedValue.getClass().getSimpleName()); + } + } catch (Exception e) { + result.put("parsedValue", null); + result.put("valueType", "无法解析"); + } + } else { + result.put("success", false); + result.put("key", key); + result.put("value", null); + result.put("message", "缓存未命中"); + } + + return result; + }) + .flatMap(result -> ServerResponse.ok().bodyValue(result)) + .onErrorResume(error -> { + Map errorResponse = new HashMap<>(); + errorResponse.put("success", false); + errorResponse.put("message", "请求处理失败: " + error.getMessage()); + return ServerResponse.status(500).bodyValue(errorResponse); + }); }); } } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java new file mode 100644 index 0000000..8ccc8ae --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java @@ -0,0 +1,59 @@ +package cn.novalon.gym.manage.groupcourse.repository; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * 团课预约记录Repository接口 + * + * @author 张翔 + * @date 2026-06-01 + */ +public interface IGroupCourseBookingRepository { + + /** + * 根据ID查询预约记录 + */ + Mono findById(Long id); + + /** + * 根据会员ID查询预约记录列表 + */ + Flux findByMemberId(Long memberId); + + /** + * 根据团课ID查询预约记录列表 + */ + Flux findByCourseId(Long courseId); + + /** + * 查询会员是否已预约某课程 + */ + Mono findByCourseIdAndMemberId(Long courseId, Long memberId); + + /** + * 查询会员在指定课程的有效预约 + */ + Mono findValidBooking(Long courseId, Long memberId); + + /** + * 统计课程有效预约人数 + */ + Mono countValidBookings(Long courseId); + + /** + * 保存预约记录 + */ + Mono save(GroupCourseBooking booking); + + /** + * 更新预约记录 + */ + Mono update(GroupCourseBooking booking); + + /** + * 根据会员卡ID查询预约记录 + */ + Flux findByMemberCardId(Long memberCardId); +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java new file mode 100644 index 0000000..8c4c347 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java @@ -0,0 +1,85 @@ +package cn.novalon.gym.manage.groupcourse.repository.impl; + +import cn.novalon.gym.manage.groupcourse.converter.GroupCourseConverter; +import cn.novalon.gym.manage.groupcourse.dao.GroupCourseBookingDao; +import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking; +import cn.novalon.gym.manage.groupcourse.entity.GroupCourseBookingEntity; +import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Repository; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * 团课预约记录Repository实现类 + * + * @author 张翔 + * @date 2026-06-01 + */ +@Repository +public class GroupCourseBookingRepository implements IGroupCourseBookingRepository { + + private final GroupCourseBookingDao groupCourseBookingDao; + private final GroupCourseConverter groupCourseConverter; + + public GroupCourseBookingRepository(GroupCourseBookingDao groupCourseBookingDao, + GroupCourseConverter groupCourseConverter) { + this.groupCourseBookingDao = groupCourseBookingDao; + this.groupCourseConverter = groupCourseConverter; + } + + @Override + public Mono findById(Long id) { + return groupCourseBookingDao.findByIdIsAndDeletedAtIsNull(id) + .map(groupCourseConverter::toBookingDomain); + } + + @Override + public Flux findByMemberId(Long memberId) { + return groupCourseBookingDao.findByMemberIdAndDeletedAtIsNull(memberId, Sort.by(Sort.Direction.DESC, "bookingTime")) + .map(groupCourseConverter::toBookingDomain); + } + + @Override + public Flux findByCourseId(Long courseId) { + return groupCourseBookingDao.findByCourseIdAndDeletedAtIsNull(courseId) + .map(groupCourseConverter::toBookingDomain); + } + + @Override + public Mono findByCourseIdAndMemberId(Long courseId, Long memberId) { + return groupCourseBookingDao.findByCourseIdAndMemberIdAndDeletedAtIsNull(courseId, memberId) + .map(groupCourseConverter::toBookingDomain); + } + + @Override + public Mono findValidBooking(Long courseId, Long memberId) { + return groupCourseBookingDao.findByCourseIdAndMemberIdAndStatusAndDeletedAtIsNull(courseId, memberId, "0") + .map(groupCourseConverter::toBookingDomain); + } + + @Override + public Mono countValidBookings(Long courseId) { + return groupCourseBookingDao.countByCourseIdAndStatusAndDeletedAtIsNull(courseId, "0"); + } + + @Override + public Mono save(GroupCourseBooking booking) { + GroupCourseBookingEntity entity = groupCourseConverter.toBookingEntity(booking); + return groupCourseBookingDao.save(entity) + .map(groupCourseConverter::toBookingDomain); + } + + @Override + public Mono update(GroupCourseBooking booking) { + GroupCourseBookingEntity entity = groupCourseConverter.toBookingEntity(booking); + return groupCourseBookingDao.save(entity) + .map(groupCourseConverter::toBookingDomain); + } + + @Override + public Flux findByMemberCardId(Long memberCardId) { + return groupCourseBookingDao.findByMemberCardIdAndDeletedAtIsNull(memberCardId) + .map(groupCourseConverter::toBookingDomain); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseBookingService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseBookingService.java new file mode 100644 index 0000000..915d660 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseBookingService.java @@ -0,0 +1,57 @@ +package cn.novalon.gym.manage.groupcourse.service; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * 团课预约服务接口 + * + * @author 张翔 + * @date 2026-06-01 + */ +public interface IGroupCourseBookingService { + + /** + * 预约团课 + * + * @param courseId 团课ID + * @param memberId 会员ID + * @param memberCardId 会员卡ID + * @return 预约记录 + */ + Mono bookCourse(Long courseId, Long memberId, Long memberCardId); + + /** + * 取消预约 + * + * @param bookingId 预约ID + * @param memberId 会员ID + * @return 取消后的预约记录 + */ + Mono cancelBooking(Long bookingId, Long memberId); + + /** + * 根据会员ID查询预约记录列表 + * + * @param memberId 会员ID + * @return 预约记录列表 + */ + Flux getBookingsByMemberId(Long memberId); + + /** + * 根据预约ID查询预约详情 + * + * @param bookingId 预约ID + * @return 预约记录 + */ + Mono getBookingById(Long bookingId); + + /** + * 根据团课ID查询预约记录列表 + * + * @param courseId 团课ID + * @return 预约记录列表 + */ + Flux getBookingsByCourseId(Long courseId); +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java deleted file mode 100644 index aa92e38..0000000 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.novalon.gym.manage.groupcourse.service; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.util.Set; -import java.util.concurrent.TimeUnit; - -/** - * @author:liwentao - * @date:2026/5/15-05-15-16:05 - */ -@Service -public class RedisService { - - @Autowired - private RedisTemplate redisTemplate; - - // 设置值 - public void set(String key, Object value) { - redisTemplate.opsForValue().set(key, value); - } - - // 设置值并指定过期时间（秒） - public void setWithExpire(String key, Object value, long timeout) { - redisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS); - } - - // 获取值 - public Object get(String key) { - return redisTemplate.opsForValue().get(key); - } - - // 删除key - public Boolean delete(String key) { - return redisTemplate.delete(key); - } - - // 判断key是否存在 - public Boolean hasKey(String key) { - return redisTemplate.hasKey(key); - } - - // 设置过期时间 - public Boolean expire(String key, long timeout) { - return redisTemplate.expire(key, timeout, TimeUnit.SECONDS); - } - - // Hash操作 - public void putHash(String key, String hashKey, Object value) { - redisTemplate.opsForHash().put(key, hashKey, value); - } - - public Object getHash(String key, String hashKey) { - return redisTemplate.opsForHash().get(key, hashKey); - } - - // List操作 - public void leftPush(String key, Object value) { - redisTemplate.opsForList().leftPush(key, value); - } - - public Object rightPop(String key) { - return redisTemplate.opsForList().rightPop(key); - } - - // Set操作 - public void addToSet(String key, Object... values) { - redisTemplate.opsForSet().add(key, values); - } - - public Set getSet(String key) { - return redisTemplate.opsForSet().members(key); - } -} diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java new file mode 100644 index 0000000..2e664fd --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java @@ -0,0 +1,284 @@ +package cn.novalon.gym.manage.groupcourse.service.impl; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking; +import cn.novalon.gym.manage.groupcourse.event.BookingReminderEventPublisher; +import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository; +import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository; +import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; +import java.util.UUID; + +/** + * 团课预约服务实现类 + * + * 业务规则： + * - 预约需在课程开始前至少30分钟 + * - 取消预约需在课程开始前至少2小时 + * - 每节课最多20人 + * - 预约成功后发送提醒 + * - 预约成功后扣减权益 + * + * 技术要点： + * - 使用Redis缓存团课信息 + * - 使用分布式锁防止预约冲突 + * - 使用响应式编程实现高并发预约 + * + * @author 张翔 + * @date 2026-06-01 + */ +@Service +public class GroupCourseBookingService implements IGroupCourseBookingService { + + private static final Logger logger = LoggerFactory.getLogger(GroupCourseBookingService.class); + + private final IGroupCourseBookingRepository bookingRepository; + private final IGroupCourseRepository courseRepository; + private final GroupCourseRedisService redisService; + private final BookingReminderEventPublisher bookingReminderEventPublisher; + + // 预约提前时间限制（分钟） + private static final long BOOKING_MIN_ADVANCE_MINUTES = 30; + // 取消预约提前时间限制（小时） + private static final long CANCEL_MIN_ADVANCE_HOURS = 2; + + public GroupCourseBookingService(IGroupCourseBookingRepository bookingRepository, + IGroupCourseRepository courseRepository, + GroupCourseRedisService redisService, + BookingReminderEventPublisher bookingReminderEventPublisher) { + this.bookingRepository = bookingRepository; + this.courseRepository = courseRepository; + this.redisService = redisService; + this.bookingReminderEventPublisher = bookingReminderEventPublisher; + } + + @Override + public Mono bookCourse(Long courseId, Long memberId, Long memberCardId) { + logger.info("开始预约团课：courseId={}, memberId={}, memberCardId={}", courseId, memberId, memberCardId); + + // 生成唯一请求ID用于分布式锁 + String requestId = UUID.randomUUID().toString(); + + // 1. 获取分布式锁 + return redisService.acquireLock(courseId, requestId) + .flatMap(lockAcquired -> { + if (!lockAcquired) { + return Mono.error(new RuntimeException("系统繁忙，请稍后重试")); + } + + // 2. 尝试从缓存获取课程信息，如果缓存不存在则从数据库获取 + return getCourseWithCache(courseId) + .flatMap(course -> { + // 3. 验证课程状态 + if (!"0".equals(String.valueOf(course.getStatus()))) { + return releaseLockAndError(courseId, requestId, "课程状态不可预约"); + } + + // 4. 验证预约时间 + LocalDateTime now = LocalDateTime.now(); + LocalDateTime startTime = course.getStartTime(); + long minutesUntilStart = ChronoUnit.MINUTES.between(now, startTime); + if (minutesUntilStart < BOOKING_MIN_ADVANCE_MINUTES) { + return releaseLockAndError(courseId, requestId, + "需在课程开始前" + BOOKING_MIN_ADVANCE_MINUTES + "分钟预约"); + } + + // 5. 验证是否已预约 + return bookingRepository.findValidBooking(courseId, memberId) + .flatMap(existingBooking -> { + return releaseLockAndError(courseId, requestId, "您已预约该课程"); + }) + .switchIfEmpty( + // 6. 使用Redis原子操作验证课程人数是否已满 + validateAndIncrementBookingCount(courseId, course.getMaxMembers()) + .flatMap(countValid -> { + if (countValid > course.getMaxMembers()) { + return releaseLockAndError(courseId, requestId, "课程已满"); + } + + // 7. 创建预约记录 + GroupCourseBooking booking = new GroupCourseBooking(); + booking.setCourseId(courseId); + booking.setMemberId(memberId); + booking.setMemberCardId(memberCardId); + booking.setBookingTime(LocalDateTime.now()); + booking.setStatus("0"); // 0-已预约 + + // 添加课程信息到预约记录 + booking.setCourseName(course.getCourseName()); + booking.setCourseStartTime(course.getStartTime()); + booking.setCourseEndTime(course.getEndTime()); + booking.setLocation(course.getLocation()); + + // 8. 保存预约记录 + return bookingRepository.save(booking) + .flatMap(savedBooking -> { + // 9. 释放锁 + return redisService.releaseLock(courseId, requestId) + .then(Mono.just(savedBooking)); + }) + .doOnSuccess(savedBooking -> { + logger.info("预约成功：bookingId={}, courseId={}, memberId={}", + savedBooking.getId(), courseId, memberId); + // 发布预约成功事件 + bookingReminderEventPublisher.publishBookingSuccessEvent( + savedBooking.getId(), + savedBooking.getMemberId(), + savedBooking.getCourseName(), + savedBooking.getCourseStartTime().toString() + ); + }) + .doOnError(error -> { + // 回滚Redis计数 + redisService.decrementBookingCount(courseId).subscribe(); + logger.error("预约失败：courseId={}, memberId={}, error={}", + courseId, memberId, error.getMessage()); + }); + }) + ); + }) + .onErrorResume(error -> { + // 发生错误时释放锁 + redisService.releaseLock(courseId, requestId).subscribe(); + return Mono.error(error); + }); + }); + } + + /** + * 从缓存或数据库获取课程信息 + */ + private Mono getCourseWithCache(Long courseId) { + return redisService.getCachedCourse(courseId) + .switchIfEmpty( + // 缓存未命中，从数据库查询 + courseRepository.findByIdAndDeletedAtIsNull(courseId) + .switchIfEmpty(Mono.error(new RuntimeException("团课不存在"))) + .flatMap(course -> { + // 将课程信息存入缓存 + return redisService.cacheCourse(course).then(Mono.just(course)); + }) + ); + } + + /** + * 验证并增加预约人数（使用Redis原子操作） + */ + private Mono validateAndIncrementBookingCount(Long courseId, Integer maxMembers) { + return redisService.incrementBookingCount(courseId) + .map(count -> { + // 同时查询数据库中的预约数进行双重验证 + // 这里简化处理，实际生产环境应该结合数据库查询 + return count.intValue(); + }); + } + + /** + * 释放锁并返回错误 + */ + private Mono releaseLockAndError(Long courseId, String requestId, String errorMessage) { + return redisService.releaseLock(courseId, requestId) + .then(Mono.error(new RuntimeException(errorMessage))); + } + + @Override + public Mono cancelBooking(Long bookingId, Long memberId) { + logger.info("开始取消预约：bookingId={}, memberId={}", bookingId, memberId); + + // 生成唯一请求ID用于分布式锁 + String requestId = UUID.randomUUID().toString(); + + // 获取锁防止并发取消 + return redisService.acquireLock(bookingId, requestId) + .flatMap(lockAcquired -> { + if (!lockAcquired) { + return Mono.error(new RuntimeException("系统繁忙，请稍后重试")); + } + + // 1. 查询预约记录 + return bookingRepository.findById(bookingId) + .switchIfEmpty(Mono.error(new RuntimeException("预约记录不存在"))) + .flatMap(booking -> { + // 2. 验证预约归属 + if (!booking.getMemberId().equals(memberId)) { + return releaseLockAndError(bookingId, requestId, "无权取消他人预约"); + } + + // 3. 验证预约状态 + if (!"0".equals(booking.getStatus())) { + return releaseLockAndError(bookingId, requestId, "预约状态不允许取消"); + } + + // 4. 验证取消时间 + LocalDateTime now = LocalDateTime.now(); + LocalDateTime startTime = booking.getCourseStartTime(); + long hoursUntilStart = ChronoUnit.HOURS.between(now, startTime); + if (hoursUntilStart < CANCEL_MIN_ADVANCE_HOURS) { + return releaseLockAndError(bookingId, requestId, + "需在课程开始前" + CANCEL_MIN_ADVANCE_HOURS + "小时取消"); + } + + // 5. 更新预约状态 + booking.setStatus("1"); // 1-已取消 + booking.setCancelTime(LocalDateTime.now()); + + // 6. 保存更新 + return bookingRepository.update(booking) + .flatMap(updatedBooking -> { + // 7. 减少Redis中的预约人数计数 + return redisService.decrementBookingCount(booking.getCourseId()) + .then(Mono.just(updatedBooking)); + }) + .flatMap(updatedBooking -> { + // 8. 释放锁 + return redisService.releaseLock(bookingId, requestId) + .then(Mono.just(updatedBooking)); + }) + .doOnSuccess(updatedBooking -> { + logger.info("取消预约成功：bookingId={}, memberId={}", bookingId, memberId); + // 发布预约取消事件 + bookingReminderEventPublisher.publishBookingCancelEvent( + updatedBooking.getId(), + updatedBooking.getMemberId(), + updatedBooking.getCourseName() + ); + }) + .doOnError(error -> { + logger.error("取消预约失败：bookingId={}, memberId={}, error={}", + bookingId, memberId, error.getMessage()); + }); + }) + .onErrorResume(error -> { + redisService.releaseLock(bookingId, requestId).subscribe(); + return Mono.error(error); + }); + }); + } + + @Override + public Flux getBookingsByMemberId(Long memberId) { + logger.debug("查询会员预约记录：memberId={}", memberId); + return bookingRepository.findByMemberId(memberId) + .doOnComplete(() -> logger.debug("查询完成：memberId={}", memberId)); + } + + @Override + public Mono getBookingById(Long bookingId) { + logger.debug("查询预约详情：bookingId={}", bookingId); + return bookingRepository.findById(bookingId); + } + + @Override + public Flux getBookingsByCourseId(Long courseId) { + logger.debug("查询课程预约记录：courseId={}", courseId); + return bookingRepository.findByCourseId(courseId) + .doOnComplete(() -> logger.debug("查询完成：courseId={}", courseId)); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseRedisService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseRedisService.java new file mode 100644 index 0000000..59c3f25 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseRedisService.java @@ -0,0 +1,183 @@ +package cn.novalon.gym.manage.groupcourse.service.impl; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.redis.core.ReactiveRedisTemplate; +import org.springframework.stereotype.Service; +import reactor.core.publisher.Mono; + +import java.time.Duration; + +/** + * 团课Redis缓存服务 + * + * 负责团课信息的缓存管理和分布式锁实现 + * + * @author 张翔 + * @date 2026-06-01 + */ +@Service +public class GroupCourseRedisService { + + private static final Logger logger = LoggerFactory.getLogger(GroupCourseRedisService.class); + + // 团课信息缓存Key前缀 + private static final String GROUP_COURSE_CACHE_PREFIX = "group_course:"; + // 团课预约锁Key前缀 + private static final String BOOKING_LOCK_PREFIX = "booking_lock:"; + // 缓存过期时间（5分钟） + private static final Duration CACHE_EXPIRE_TIME = Duration.ofMinutes(5); + // 锁过期时间（30秒） + private static final Duration LOCK_EXPIRE_TIME = Duration.ofSeconds(30); + + private final ReactiveRedisTemplate reactiveRedisTemplate; + private final ObjectMapper objectMapper; + + public GroupCourseRedisService(ReactiveRedisTemplate reactiveRedisTemplate, + ObjectMapper objectMapper) { + this.reactiveRedisTemplate = reactiveRedisTemplate; + this.objectMapper = objectMapper; + } + + /** + * 获取团课缓存Key + */ + private String getCourseCacheKey(Long courseId) { + return GROUP_COURSE_CACHE_PREFIX + courseId; + } + + /** + * 获取预约锁Key + */ + private String getBookingLockKey(Long courseId) { + return BOOKING_LOCK_PREFIX + courseId; + } + + /** + * 缓存团课信息 + */ + public Mono cacheCourse(GroupCourse course) { + String key = getCourseCacheKey(course.getId()); + try { + String value = objectMapper.writeValueAsString(course); + return reactiveRedisTemplate.opsForValue() + .set(key, value, CACHE_EXPIRE_TIME) + .doOnSuccess(result -> logger.debug("团课信息已缓存：courseId={}", course.getId())) + .then(); + } catch (JsonProcessingException e) { + logger.error("序列化团课信息失败：courseId={}", course.getId(), e); + return Mono.error(e); + } + } + + /** + * 获取缓存的团课信息 + */ + public Mono getCachedCourse(Long courseId) { + String key = getCourseCacheKey(courseId); + return reactiveRedisTemplate.opsForValue() + .get(key) + .cast(String.class) + .flatMap(value -> { + try { + GroupCourse course = objectMapper.readValue(value, GroupCourse.class); + logger.debug("从缓存获取团课信息：courseId={}", courseId); + return Mono.just(course); + } catch (JsonProcessingException e) { + logger.error("反序列化团课信息失败：courseId={}", courseId, e); + return Mono.empty(); + } + }) + .switchIfEmpty(Mono.fromRunnable(() -> logger.debug("缓存中未找到团课信息：courseId={}", courseId))); + } + + /** + * 删除团课缓存 + */ + public Mono invalidateCourseCache(Long courseId) { + String key = getCourseCacheKey(courseId); + return reactiveRedisTemplate.delete(key) + .doOnSuccess(result -> logger.debug("团课缓存已删除：courseId={}", courseId)) + .then(); + } + + /** + * 获取分布式锁 + * + * @param courseId 课程ID + * @param requestId 请求ID（用于锁的唯一性校验） + * @return 是否获取成功 + */ + public Mono acquireLock(Long courseId, String requestId) { + String key = getBookingLockKey(courseId); + return reactiveRedisTemplate.opsForValue() + .setIfAbsent(key, requestId, LOCK_EXPIRE_TIME) + .doOnSuccess(acquired -> { + if (acquired) { + logger.debug("获取预约锁成功：courseId={}, requestId={}", courseId, requestId); + } else { + logger.debug("获取预约锁失败：courseId={}", courseId); + } + }); + } + + /** + * 释放分布式锁 + * + * @param courseId 课程ID + * @param requestId 请求ID（用于锁的唯一性校验） + * @return 是否释放成功 + */ + public Mono releaseLock(Long courseId, String requestId) { + String key = getBookingLockKey(courseId); + return reactiveRedisTemplate.opsForValue() + .get(key) + .cast(String.class) + .flatMap(storedRequestId -> { + if (requestId.equals(storedRequestId)) { + return reactiveRedisTemplate.delete(key) + .map(deleted -> deleted > 0) + .doOnSuccess(result -> logger.debug("释放预约锁成功：courseId={}, requestId={}", courseId, requestId)); + } else { + logger.warn("锁归属校验失败：courseId={}, expectedRequestId={}, actualRequestId={}", + courseId, requestId, storedRequestId); + return Mono.just(false); + } + }) + .defaultIfEmpty(false); + } + + /** + * 获取课程预约人数（缓存） + */ + public Mono getBookingCount(Long courseId) { + String key = "booking_count:" + courseId; + return reactiveRedisTemplate.opsForValue() + .get(key) + .map(obj -> (Integer) obj) + .defaultIfEmpty(0); + } + + /** + * 增加课程预约人数 + */ + public Mono incrementBookingCount(Long courseId) { + String key = "booking_count:" + courseId; + return reactiveRedisTemplate.opsForValue() + .increment(key) + .doOnSuccess(count -> logger.debug("预约人数增加：courseId={}, count={}", courseId, count)); + } + + /** + * 减少课程预约人数 + */ + public Mono decrementBookingCount(Long courseId) { + String key = "booking_count:" + courseId; + return reactiveRedisTemplate.opsForValue() + .decrement(key) + .doOnSuccess(count -> logger.debug("预约人数减少：courseId={}, count={}", courseId, count)); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java index 70a43cc..98b5ea9 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java @@ -3,10 +3,10 @@ package cn.novalon.gym.manage.groupcourse.service.impl; import cn.novalon.gym.manage.common.dto.PageRequest; import cn.novalon.gym.manage.common.dto.PageResponse; +import cn.novalon.gym.manage.common.util.RedisUtil; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository; import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService; -import cn.novalon.gym.manage.groupcourse.service.RedisService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; @@ -15,15 +15,12 @@ import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import java.time.Duration; -import java.util.List; - @Service public class GroupCourseService implements IGroupCourseService { private static final Logger logger = LoggerFactory.getLogger(GroupCourseService.class); private final IGroupCourseRepository groupCourseRepository; - private final RedisService redisService; + private final RedisUtil redisUtil; private final ObjectMapper objectMapper; private static final String CACHE_KEY_PREFIX = "group_course:page:"; @@ -31,10 +28,10 @@ public class GroupCourseService implements IGroupCourseService { private static final long CACHE_EXPIRE_SECONDS = 300; public GroupCourseService(IGroupCourseRepository groupCourseRepository, - RedisService redisService, + RedisUtil redisUtil, ObjectMapper objectMapper){ this.groupCourseRepository = groupCourseRepository; - this.redisService = redisService; + this.redisUtil = redisUtil; this.objectMapper = objectMapper; } @@ -42,38 +39,35 @@ public class GroupCourseService implements IGroupCourseService { public Mono findById(Long id) { String cacheKey = CACHE_KEY_ID_PREFIX + id; - Object cachedData = redisService.get(cacheKey); - if (cachedData != null) { - try { - String json; - if (cachedData instanceof String) { - json = (String) cachedData; - } else { - json = objectMapper.writeValueAsString(cachedData); - } - - GroupCourse groupCourse = objectMapper.readValue(json, GroupCourse.class); - logger.info("缓存命中 - findById: id={}", id); - return Mono.just(groupCourse); - } catch (JsonProcessingException e) { - logger.warn("缓存解析失败，删除缓存 - id: {}, error: {}", id, e.getMessage()); - redisService.delete(cacheKey); - } - } - - logger.debug("缓存未命中，查询数据库 - findById: id={}", id); - return groupCourseRepository.findByIdAndDeletedAtIsNull(id) - .doOnSuccess(groupCourse -> { - if (groupCourse != null) { + return redisUtil.get(cacheKey, String.class) + .flatMap(cachedJson -> { + if (cachedJson != null) { try { - String jsonData = objectMapper.writeValueAsString(groupCourse); - redisService.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS); - logger.debug("缓存已设置 - findById: id={}", id); + GroupCourse groupCourse = objectMapper.readValue(cachedJson, GroupCourse.class); + logger.info("缓存命中 - findById: id={}", id); + return Mono.just(groupCourse); } catch (JsonProcessingException e) { - logger.error("缓存设置失败 - id: {}, error: {}", id, e.getMessage()); + logger.warn("缓存解析失败，删除缓存 - id: {}, error: {}", id, e.getMessage()); + return redisUtil.delete(cacheKey).then(Mono.empty()); } } - }); + return Mono.empty(); + }) + .switchIfEmpty( + groupCourseRepository.findByIdAndDeletedAtIsNull(id) + .flatMap(groupCourse -> { + try { + String jsonData = objectMapper.writeValueAsString(groupCourse); + return redisUtil.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS) + .thenReturn(groupCourse) + .doOnSuccess(gc -> logger.debug("缓存已设置 - findById: id={}", id)); + } catch (JsonProcessingException e) { + logger.error("缓存设置失败 - id: {}, error: {}", id, e.getMessage()); + return Mono.just(groupCourse); + } + }) + .doOnSubscribe(sub -> logger.debug("缓存未命中，查询数据库 - findById: id={}", id)) + ); } @Override @@ -94,45 +88,49 @@ public class GroupCourseService implements IGroupCourseService { public Mono> findByPage(PageRequest pageRequest, boolean includeDeleted) { int page = pageRequest.getPage(); int size = pageRequest.getSize(); + String sort = pageRequest.getSort(); + String order = pageRequest.getOrder(); + String keyword = pageRequest.getKeyword() != null ? pageRequest.getKeyword() : ""; - String cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted; + String cacheKey = CACHE_KEY_PREFIX + page + ":" + size + ":" + includeDeleted + ":" + sort + ":" + order + ":" + keyword; - Object cachedData = redisService.get(cacheKey); - if (cachedData != null) { - try { - String json; - if (cachedData instanceof String) { - json = (String) cachedData; - } else { - json = objectMapper.writeValueAsString(cachedData); - } - - PageResponse pageResponse = objectMapper.readValue(json, - objectMapper.getTypeFactory().constructParametricType(PageResponse.class, GroupCourse.class)); - logger.info("缓存命中 - findByPage: key={}", cacheKey); - return Mono.just(pageResponse); - } catch (JsonProcessingException e) { - logger.warn("缓存解析失败，删除缓存 - key: {}, error: {}", cacheKey, e.getMessage()); - redisService.delete(cacheKey); - } - } - - logger.debug("缓存未命中，查询数据库 - findByPage: key={}", cacheKey); - Mono> resultMono; - if (includeDeleted) { - resultMono = groupCourseRepository.findByPage(pageRequest); - } else { - resultMono = groupCourseRepository.findByPageAndNotDeleted(pageRequest); - } - - return resultMono.doOnSuccess(pageResponse -> { - try { - String jsonData = objectMapper.writeValueAsString(pageResponse); - redisService.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS); - logger.debug("缓存已设置 - findByPage: key={}", cacheKey); - } catch (JsonProcessingException e) { - logger.error("缓存设置失败 - key: {}, error: {}", cacheKey, e.getMessage()); - } - }); + return redisUtil.get(cacheKey, String.class) + .flatMap(cachedJson -> { + if (cachedJson != null) { + try { + PageResponse pageResponse = objectMapper.readValue(cachedJson, + objectMapper.getTypeFactory().constructParametricType(PageResponse.class, GroupCourse.class)); + logger.info("缓存命中 - findByPage: key={}", cacheKey); + return Mono.just(pageResponse); + } catch (JsonProcessingException e) { + logger.warn("缓存解析失败，删除缓存 - key: {}, error: {}", cacheKey, e.getMessage()); + return redisUtil.delete(cacheKey).then(Mono.empty()); + } + } + return Mono.empty(); + }) + .switchIfEmpty( + Mono.defer(() -> { + logger.debug("缓存未命中，查询数据库 - findByPage: key={}", cacheKey); + Mono> resultMono; + if (includeDeleted) { + resultMono = groupCourseRepository.findByPage(pageRequest); + } else { + resultMono = groupCourseRepository.findByPageAndNotDeleted(pageRequest); + } + + return resultMono.flatMap(pageResponse -> { + try { + String jsonData = objectMapper.writeValueAsString(pageResponse); + return redisUtil.setWithExpire(cacheKey, jsonData, CACHE_EXPIRE_SECONDS) + .thenReturn(pageResponse) + .doOnSuccess(pr -> logger.debug("缓存已设置 - findByPage: key={}", cacheKey)); + } catch (JsonProcessingException e) { + logger.error("缓存设置失败 - key: {}, error: {}", cacheKey, e.getMessage()); + return Mono.just(pageResponse); + } + }); + }) + ); } } diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardRecordServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardRecordServiceImpl.java index 0cbbd76..ae20bd4 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardRecordServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardRecordServiceImpl.java @@ -3,7 +3,7 @@ package cn.novalon.gym.manage.member.service.impl; import cn.novalon.gym.manage.member.entity.MemberCardRecord; import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository; import cn.novalon.gym.manage.member.service.IMemberCardRecordService; -import cn.novalon.gym.manage.member.util.RedisUtil; +import cn.novalon.gym.manage.common.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardServiceImpl.java index 87e345b..070a938 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberCardServiceImpl.java @@ -15,7 +15,7 @@ import cn.novalon.gym.manage.member.repository.MemberCardRecordRepository; import cn.novalon.gym.manage.member.repository.MemberCardRepository; import cn.novalon.gym.manage.member.service.IMemberCardService; import cn.novalon.gym.manage.member.service.IMemberCardTransactionService; -import cn.novalon.gym.manage.member.util.RedisUtil; +import cn.novalon.gym.manage.common.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberServiceImpl.java index cecdaed..e40ff5f 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/MemberServiceImpl.java @@ -17,30 +17,21 @@ import cn.novalon.gym.manage.member.service.MemberService; import cn.novalon.gym.manage.member.util.AesUtil; import cn.novalon.gym.manage.member.util.BeanConvertUtil; import cn.novalon.gym.manage.member.util.EsSyncUtils; -import cn.novalon.gym.manage.member.util.RedisUtil; +import cn.novalon.gym.manage.common.util.RedisUtil; import cn.novalon.gym.manage.member.vo.MemberCardInfoVO; import cn.novalon.gym.manage.member.vo.MemberDetailVO; import cn.novalon.gym.manage.member.vo.MemberInfoVO; -import co.elastic.clients.elasticsearch.ElasticsearchClient; -import co.elastic.clients.elasticsearch.core.IndexResponse; -import co.elastic.clients.json.jackson.JacksonJsonpMapper; -import co.elastic.clients.transport.rest_client.RestClientTransport; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.http.HttpHost; -import org.elasticsearch.client.RestClient; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import java.time.LocalDateTime; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/RefundApplicationServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/RefundApplicationServiceImpl.java index 0e9da72..e505ef7 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/RefundApplicationServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/RefundApplicationServiceImpl.java @@ -5,7 +5,7 @@ import cn.novalon.gym.manage.member.entity.RefundApplication; import cn.novalon.gym.manage.member.enums.RefundStatus; import cn.novalon.gym.manage.member.repository.RefundApplicationRepository; import cn.novalon.gym.manage.member.service.IRefundApplicationService; -import cn.novalon.gym.manage.member.util.RedisUtil; +import cn.novalon.gym.manage.common.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatApiServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatApiServiceImpl.java index aac7753..99238ec 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatApiServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatApiServiceImpl.java @@ -4,7 +4,7 @@ import cn.novalon.gym.manage.common.exception.ErrorCode; import cn.novalon.gym.manage.common.exception.SystemException; import cn.novalon.gym.manage.member.config.WechatProperties; import cn.novalon.gym.manage.member.service.WechatApiService; -import cn.novalon.gym.manage.member.util.RedisUtil; +import cn.novalon.gym.manage.common.util.RedisUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.MediaType; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatAuthServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatAuthServiceImpl.java index a462a14..af116b4 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatAuthServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatAuthServiceImpl.java @@ -4,8 +4,6 @@ import cn.novalon.gym.manage.common.exception.ConflictException; import cn.novalon.gym.manage.common.exception.ErrorCode; import cn.novalon.gym.manage.common.exception.NotFoundException; import cn.novalon.gym.manage.common.exception.SystemException; -import cn.novalon.gym.manage.common.util.HtmlEscapeUtil; -import cn.novalon.gym.manage.member.config.WechatProperties; import cn.novalon.gym.manage.member.dto.WechatLoginDto; import cn.novalon.gym.manage.member.entity.Member; import cn.novalon.gym.manage.member.es.entity.MemberES; @@ -16,7 +14,7 @@ import cn.novalon.gym.manage.member.service.WechatAuthService; import cn.novalon.gym.manage.member.util.AesUtil; import cn.novalon.gym.manage.member.util.EsSyncUtils; import cn.novalon.gym.manage.member.util.MemberNoGenerator; -import cn.novalon.gym.manage.member.util.RedisUtil; +import cn.novalon.gym.manage.common.util.RedisUtil; import cn.novalon.gym.manage.member.util.WechatPhoneUtil; import cn.novalon.gym.manage.member.vo.WechatLoginVO; import cn.novalon.gym.manage.sys.security.JwtTokenProvider; diff --git a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatOfficialServiceImpl.java b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatOfficialServiceImpl.java index 22a2d56..41aca11 100644 --- a/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatOfficialServiceImpl.java +++ b/gym-manage-api/gym-member/src/main/java/cn/novalon/gym/manage/member/service/impl/WechatOfficialServiceImpl.java @@ -8,7 +8,7 @@ import cn.novalon.gym.manage.member.es.repository.MemberESRepository; import cn.novalon.gym.manage.member.repository.IMemberRepository; import cn.novalon.gym.manage.member.service.WechatOfficialService; import cn.novalon.gym.manage.member.util.EsSyncUtils; -import cn.novalon.gym.manage.member.util.RedisUtil; +import cn.novalon.gym.manage.common.util.RedisUtil; import cn.novalon.gym.manage.member.vo.WechatUserInfoVO; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/gym-manage-api/manage-app/pom.xml b/gym-manage-api/manage-app/pom.xml index 2644308..11b6479 100644 --- a/gym-manage-api/manage-app/pom.xml +++ b/gym-manage-api/manage-app/pom.xml @@ -143,6 +143,12 @@ org.springframework.boot spring-boot-starter-data-redis + + cn.novalon.gym.manage + gym-groupCourse + 1.0.0 + compile + diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/ManageApplication.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/ManageApplication.java index a87aaef..beef525 100644 --- a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/ManageApplication.java +++ b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/ManageApplication.java @@ -23,7 +23,8 @@ import java.util.List; "cn.novalon.gym.manage.db.dao", "cn.novalon.gym.manage.sys.audit.repository" , "cn.novalon.gym.manage.gymmembercard.dao", - "cn.novalon.gym.manage.member.repository" + "cn.novalon.gym.manage.member.repository", + "cn.novalon.gym.manage.groupcourse.dao" }) @EnableReactiveElasticsearchRepositories(basePackages = "cn.novalon.gym.manage.member.es.repository") public class ManageApplication { diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java deleted file mode 100644 index 12d804e..0000000 --- a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.novalon.gym.manage.app.config; - -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -/** - * @author:liwentao - * @date:2026/5/15-05-15-16:01 - */ -@Configuration -public class RedisConfig { - - @Bean - public RedisTemplate redisTemplate(RedisConnectionFactory factory) { - RedisTemplate template = new RedisTemplate<>(); - template.setConnectionFactory(factory); - - // 创建ObjectMapper并配置 - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.activateDefaultTyping(om.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL); - - // 使用GenericJackson2JsonRedisSerializer替代已弃用的方式 - GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer = new GenericJackson2JsonRedisSerializer(om); - - // 使用StringRedisSerializer来序列化和反序列化redis的key值 - StringRedisSerializer stringSerializer = new StringRedisSerializer(); - template.setKeySerializer(stringSerializer); - template.setValueSerializer(genericJackson2JsonRedisSerializer); - template.setHashKeySerializer(stringSerializer); - template.setHashValueSerializer(genericJackson2JsonRedisSerializer); - - template.afterPropertiesSet(); - return template; - } -} \ No newline at end of file diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java index 996c1d1..52acb21 100644 --- a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java +++ b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java @@ -2,6 +2,8 @@ package cn.novalon.gym.manage.app.config; import cn.novalon.gym.manage.file.handler.SysFileHandler; +import cn.novalon.gym.manage.groupcourse.handler.GroupCourseBookingHandler; +import cn.novalon.gym.manage.groupcourse.handler.GroupCourseHandler; import cn.novalon.gym.manage.member.handler.MemberCardHandler; import cn.novalon.gym.manage.member.handler.MemberCardRecordHandler; import cn.novalon.gym.manage.member.handler.MemberCardTransactionHandler; @@ -62,7 +64,9 @@ public class SystemRouter { PasswordDiagnosticHandler passwordDiagnosticHandler, MemberCardHandler memberCardHandler, MemberCardRecordHandler memberCardRecordHandler, - MemberCardTransactionHandler memberCardTransactionHandler) { + MemberCardTransactionHandler memberCardTransactionHandler, + GroupCourseHandler groupCourseHandler, + GroupCourseBookingHandler groupCourseBookingHandler) { return route() // ========== 诊断路由 ========== @@ -249,6 +253,22 @@ public class SystemRouter { .GET("/api/member-card-transactions/statistics/deduct/{cardId}", memberCardTransactionHandler::getDeductCountByCardId) .GET("/api/member-card-transactions/statistics/renew", memberCardTransactionHandler::getRenewAmountByTimeRange) .GET("/api/member-card-transactions/statistics/purchase/{memberId}", memberCardTransactionHandler::getPurchaseAmountByMember) + + // ======================================== + // ========== 团课管理路由 ================= + // ======================================== + + // ===== 团课课程管理 ===== + .GET("/api/groupCourse/list", groupCourseHandler::getAllGroupCourse) + .POST("/api/groupCourse/page", groupCourseHandler::getGroupCoursesByPage) + .GET("/api/groupCourse/{id}", groupCourseHandler::getGroupCourseById) + + // ===== 团课预约管理 ===== + .POST("/api/groupCourse/book", groupCourseBookingHandler::bookCourse) + .POST("/api/groupCourse/booking/{bookingId}/cancel", groupCourseBookingHandler::cancelBooking) + .GET("/api/groupCourse/bookings/member/{memberId}", groupCourseBookingHandler::getBookingsByMemberId) + .GET("/api/groupCourse/bookings/{bookingId}", groupCourseBookingHandler::getBookingById) + .GET("/api/groupCourse/bookings/course/{courseId}", groupCourseBookingHandler::getBookingsByCourseId) .build(); } diff --git a/gym-manage-api/manage-app/src/main/resources/application-dev.yml b/gym-manage-api/manage-app/src/main/resources/application-dev.yml index 443a17e..33e428e 100644 --- a/gym-manage-api/manage-app/src/main/resources/application-dev.yml +++ b/gym-manage-api/manage-app/src/main/resources/application-dev.yml @@ -15,7 +15,7 @@ spring: url: jdbc:postgresql://localhost:55432/manage_system user: novalon password: novalon123 - enabled: false + enabled: true locations: classpath:db/migration baseline-on-migrate: true validate-on-migrate: true diff --git a/gym-manage-api/manage-app/src/main/resources/application.yml b/gym-manage-api/manage-app/src/main/resources/application.yml index 39acf0e..294cdeb 100644 --- a/gym-manage-api/manage-app/src/main/resources/application.yml +++ b/gym-manage-api/manage-app/src/main/resources/application.yml @@ -29,7 +29,7 @@ spring: password: ${DB_PASSWORD:novalon123} driver-class-name: org.postgresql.Driver flyway: - enabled: false + enabled: true locations: classpath:db/migration baseline-on-migrate: true baseline-version: 0 diff --git a/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/config/RedisConfig.java b/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/config/RedisConfig.java index 7321879..6b9f23c 100644 --- a/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/config/RedisConfig.java +++ b/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/config/RedisConfig.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.config; +package cn.novalon.gym.manage.common.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/RedisUtil.java b/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/RedisUtil.java index ea49f50..0482306 100644 --- a/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/RedisUtil.java +++ b/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/RedisUtil.java @@ -1,4 +1,4 @@ -package cn.novalon.gym.manage.member.util; +package cn.novalon.gym.manage.common.util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.ReactiveRedisTemplate; diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql index 4b82d66..4aacedf 100644 --- a/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql @@ -27,7 +27,8 @@ CREATE TABLE IF NOT EXISTS group_course ( CREATE TABLE IF NOT EXISTS group_course_booking ( id BIGSERIAL PRIMARY KEY, course_id BIGINT NOT NULL, - user_id BIGINT NOT NULL, + member_id BIGINT NOT NULL, + member_card_id BIGINT NOT NULL, booking_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, status VARCHAR(1) DEFAULT '0', cancel_time TIMESTAMP, @@ -60,7 +61,8 @@ COMMENT ON COLUMN group_course.deleted_at IS '删除时间（软删除）'; COMMENT ON TABLE group_course_booking IS '团课预约记录表'; COMMENT ON COLUMN group_course_booking.id IS '主键ID'; COMMENT ON COLUMN group_course_booking.course_id IS '团课ID'; -COMMENT ON COLUMN group_course_booking.user_id IS '用户ID'; +COMMENT ON COLUMN group_course_booking.member_id IS '用户ID'; +COMMENT ON COLUMN group_course_booking.member_card_id IS '会员卡ID'; COMMENT ON COLUMN group_course_booking.booking_time IS '预约时间'; COMMENT ON COLUMN group_course_booking.status IS '状态（0已预约 1已取消 2已出席 3缺席）'; COMMENT ON COLUMN group_course_booking.cancel_time IS '取消时间'; diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql index 30d85c7..5ff78b2 100644 --- a/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql @@ -1,19 +1,28 @@ --- 测试数据1: 进行中的瑜伽课程 (已有部分学员) +-- 场景1: 0人预约，可预约（正常状态，6月15日，距开始还有14天） INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES - ('清晨流瑜伽', 101, 1, '2026-05-10 09:00:00', '2026-05-10 10:30:00', 15, 8, '1', 'A座3楼瑜伽教室', '/images/yoga_flow.jpg', '适合有一定基础的学员，通过流畅的体式连接呼吸，唤醒身体能量。', 'admin', '2026-05-01 10:00:00', '2026-05-01 10:00:00'); + ('极速燃脂单车', 104, 2, '2026-06-15 19:30:00', '2026-06-15 20:20:00', 25, 0, 0, '单车房', '/images/spinning.jpg', '跟随音乐节奏变换阻力和速度，体验爬坡与冲刺的快感，一节课消耗800大卡。', 'admin', '2026-06-01 11:00:00', '2026-06-01 11:00:00'); --- 测试数据2: 即将开始的搏击课 (几乎满员) +-- 场景2: 已有人预约，可预约（正常状态，6月12日，5/15人） INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES - ('燃脂搏击', 102, 2, '2026-05-12 18:30:00', '2026-05-12 19:30:00', 20, 19, '1', '综合训练区', '/images/kickboxing.jpg', '高强度间歇训练，配合音乐快速燃脂，释放压力。', 'coach_zhang', '2026-05-02 14:30:00', '2026-05-02 14:30:00'); + ('清晨流瑜伽', 101, 1, '2026-06-12 09:00:00', '2026-06-12 10:30:00', 15, 5, 0, 'A座3楼瑜伽教室', '/images/yoga_flow.jpg', '适合有一定基础的学员，通过流畅的体式连接呼吸，唤醒身体能量。', 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00'); --- 测试数据3: 已结束的私教小团课 (课程号已满) +-- 场景3: 满员，不可预约（正常状态但已满员，6月10日，20/20人） INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES - ('蜜桃臀塑造', 103, 3, '2026-04-25 19:00:00', '2026-04-25 20:00:00', 10, 10, '2', '私教专区', '/images/glute.jpg', '针对性训练臀部肌肉群，打造完美臀线。小班教学，动作一对一纠正。', 'coach_li', '2026-04-20 09:15:00', '2026-04-20 09:15:00'); + ('燃脂搏击', 102, 2, '2026-06-10 18:30:00', '2026-06-10 19:30:00', 20, 20, 0, '综合训练区', '/images/kickboxing.jpg', '高强度间歇训练，配合音乐快速燃脂，释放压力。名额已满，无法预约。', 'coach_zhang', '2026-06-01 14:30:00', '2026-06-01 14:30:00'); --- 测试数据4: 即将开始的动感单车 (名额充足，尚未有人报名) +-- 场景4: 超出可预约时间，不可预约（正常状态但距开始不足30分钟） +-- 当前时间: 2026-06-01 15:00，课程开始: 2026-06-01 15:20 INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES - ('极速燃脂单车', 104, 2, '2026-05-15 19:30:00', '2026-05-15 20:20:00', 25, 0, '0', '单车房', '/images/spinning.jpg', '跟随音乐节奏变换阻力和速度，体验爬坡与冲刺的快感，一节课消耗800大卡。', 'admin', '2026-05-06 11:00:00', '2026-05-06 11:00:00'); + ('哈他瑜伽', 101, 1, '2026-06-01 15:20:00', '2026-06-01 16:50:00', 12, 3, 0, '瑜伽教室B', '/images/hatha_yoga.jpg', '基础哈他瑜伽，适合所有级别。距开始不足30分钟，已停止预约。', 'coach_li', '2026-06-01 08:00:00', '2026-06-01 08:00:00'); --- 测试数据5: 已删除/作废的课程 (deleted_at 不为空) -INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at, deleted_at) VALUES - ('周末冥想修复', 101, 1, '2026-05-03 15:00:00', '2026-05-03 16:00:00', 12, 3, '3', '冥想室', '/images/meditation.jpg', '通过呼吸和正念冥想，深度放松身心，缓解一周疲劳。', 'coach_wang', '2026-04-28 08:00:00', '2026-04-28 08:00:00', '2026-04-29 16:20:00'); \ No newline at end of file +-- 场景5: 课程已取消，不可预约（status=1） +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES + ('周末冥想修复', 101, 1, '2026-06-20 15:00:00', '2026-06-20 16:00:00', 12, 3, 1, '冥想室', '/images/meditation.jpg', '通过呼吸和正念冥想，深度放松身心。该课程已被取消。', 'coach_wang', '2026-05-28 08:00:00', '2026-05-28 08:00:00'); + +-- 场景6: 课程已结束，不可预约（status=2） +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES + ('蜜桃臀塑造', 103, 3, '2026-05-30 19:00:00', '2026-05-30 20:00:00', 10, 8, 2, '私教专区', '/images/glute.jpg', '针对性训练臀部肌肉群，课程已于5月30日结束，无法预约。', 'coach_li', '2026-05-20 09:15:00', '2026-05-20 09:15:00'); + +-- 场景7（可选）: 已结束但未满员的课程（status=2，即使有空位也不可预约） +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES + ('午间冥想放松', 101, 1, '2026-05-31 12:00:00', '2026-05-31 13:00:00', 15, 6, 2, '冥想室', '/images/meditation_noon.jpg', '午间冥想课程，已于5月31日结束。', 'admin', '2026-05-25 09:00:00', '2026-05-25 09:00:00'); \ No newline at end of file diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V8__Create_Member_And_MemberCard.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V8__Create_Member_And_MemberCard.sql new file mode 100644 index 0000000..d9c3954 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V8__Create_Member_And_MemberCard.sql @@ -0,0 +1,281 @@ +-- ============================================ +-- 1. member_user 表（会员表） +-- ============================================ + +-- Step 1: 删除已存在的表（如果需要重建） +-- DROP TABLE IF EXISTS member_user CASCADE; + +-- Step 2: 创建 member_user 表 +CREATE TABLE IF NOT EXISTS member_user ( + -- ========== 主键和基础字段（来自BaseEntity）========== + id BIGSERIAL PRIMARY KEY, -- 主键ID，自增 + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -- 创建时间 + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -- 更新时间 + + -- ========== 会员核心字段 ========== + member_no VARCHAR(50) NOT NULL UNIQUE, -- 会员编号（唯一） + nickname VARCHAR(100), -- 昵称 + phone VARCHAR(255), -- 手机号（AES加密存储） + gender INTEGER DEFAULT 0, -- 性别：0-未知，1-男，2-女 + birthday DATE, -- 生日 + address VARCHAR(500), -- 地址 + avatar VARCHAR(500), -- 头像URL + subscribed BOOLEAN DEFAULT FALSE, -- 是否关注服务号 + last_login_at TIMESTAMP, -- 最后登录时间 + +-- ========== 微信相关字段 ========== + union_id VARCHAR(100), -- 微信UnionID（跨应用唯一标识） + miniapp_open_id VARCHAR(100), -- 小程序OpenID + official_open_id VARCHAR(100), -- 服务号OpenID + +-- ========== 软删除字段 ========== + is_deleted BOOLEAN DEFAULT FALSE -- 是否删除（软删除标记） + ); + +-- Step 3: 创建索引 +-- 会员编号索引（唯一索引，加速查询） +CREATE UNIQUE INDEX IF NOT EXISTS idx_member_user_member_no ON member_user(member_no); + +-- UnionID索引（加速跨平台用户查找） +CREATE INDEX IF NOT EXISTS idx_member_user_union_id ON member_user(union_id); + +-- 小程序OpenID索引（加速小程序登录查询） +CREATE INDEX IF NOT EXISTS idx_member_user_miniapp_openid ON member_user(miniapp_open_id); + +-- 服务号OpenID索引（加速服务号事件处理） +CREATE INDEX IF NOT EXISTS idx_member_user_official_openid ON member_user(official_open_id); + +-- 手机号索引（加速手机号查询和去重） +CREATE INDEX IF NOT EXISTS idx_member_user_phone ON member_user(phone); + +-- 软删除索引（加速查询未删除的记录） +CREATE INDEX IF NOT EXISTS idx_member_user_is_deleted ON member_user(is_deleted); + +-- Step 4: 添加注释 +COMMENT ON TABLE member_user IS '会员表'; + +COMMENT ON COLUMN member_user.id IS '主键ID'; +COMMENT ON COLUMN member_user.created_at IS '创建时间'; +COMMENT ON COLUMN member_user.updated_at IS '更新时间'; + +COMMENT ON COLUMN member_user.member_no IS '会员编号（唯一，格式：MEM + 8位随机字符）'; +COMMENT ON COLUMN member_user.nickname IS '昵称'; +COMMENT ON COLUMN member_user.phone IS '手机号（AES-128-CBC加密存储）'; +COMMENT ON COLUMN member_user.gender IS '性别：0-未知，1-男，2-女'; +COMMENT ON COLUMN member_user.birthday IS '生日'; +COMMENT ON COLUMN member_user.address IS '地址'; +COMMENT ON COLUMN member_user.avatar IS '头像URL'; +COMMENT ON COLUMN member_user.subscribed IS '是否关注服务号：true-已关注，false-未关注'; +COMMENT ON COLUMN member_user.last_login_at IS '最后登录时间'; + +COMMENT ON COLUMN member_user.union_id IS '微信UnionID（用户在开放平台的唯一标识，跨应用相同）'; +COMMENT ON COLUMN member_user.miniapp_open_id IS '小程序OpenID（用户在当前小程序的唯一标识）'; +COMMENT ON COLUMN member_user.official_open_id IS '服务号OpenID（用户在当前服务号的唯一标识）'; + +COMMENT ON COLUMN member_user.is_deleted IS '是否删除（软删除标记）：false-正常，true-已删除'; + + +-- ============================================ +-- 2. wechat_user 表（微信用户表） +-- ============================================ + +-- Step 1: 删除已存在的表（如果需要重建） +-- DROP TABLE IF EXISTS wechat_user CASCADE; + +-- Step 2: 创建 wechat_user 表 +CREATE TABLE IF NOT EXISTS wechat_user ( + -- ========== 主键和基础字段（来自BaseEntity）========== + id BIGSERIAL PRIMARY KEY, -- 主键ID，自增 + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -- 创建时间 + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, -- 更新时间 + + -- ========== 关联字段 ========== + member_id BIGINT NOT NULL, -- 会员ID（外键） + + -- ========== 微信标识字段 ========== + union_id VARCHAR(100), -- 微信UnionID + miniapp_openid VARCHAR(100), -- 小程序OpenID + mp_openid VARCHAR(100), -- 服务号OpenID + +-- ========== 关注状态字段 ========== + is_subscribed BOOLEAN DEFAULT FALSE, -- 是否关注服务号 + subscribe_time TIMESTAMP, -- 首次关注时间 + unsubscribe_time TIMESTAMP -- 最后一次取消关注时间 + ); + +-- Step 3: 创建外键约束 +ALTER TABLE wechat_user + ADD CONSTRAINT fk_wechat_user_member + FOREIGN KEY (member_id) REFERENCES member_user(id) ON DELETE CASCADE; + +-- Step 4: 创建索引 +-- UnionID索引（加速跨平台用户查找） +CREATE INDEX IF NOT EXISTS idx_wechat_user_union_id ON wechat_user(union_id); + +-- 小程序OpenID索引（加速小程序登录查询） +CREATE INDEX IF NOT EXISTS idx_wechat_user_miniapp_openid ON wechat_user(miniapp_openid); + +-- 服务号OpenID索引（加速服务号事件处理） +CREATE INDEX IF NOT EXISTS idx_wechat_user_mp_openid ON wechat_user(mp_openid); + +-- 会员ID索引（加速关联查询） +CREATE INDEX IF NOT EXISTS idx_wechat_user_member_id ON wechat_user(member_id); + +-- Step 5: 添加注释 +COMMENT ON TABLE wechat_user IS '微信用户表'; + +COMMENT ON COLUMN wechat_user.id IS '主键ID'; +COMMENT ON COLUMN wechat_user.created_at IS '创建时间'; +COMMENT ON COLUMN wechat_user.updated_at IS '更新时间'; + +COMMENT ON COLUMN wechat_user.member_id IS '会员ID（关联 member_user 表的 id 字段）'; +COMMENT ON COLUMN wechat_user.union_id IS '微信UnionID（用户在开放平台的唯一标识）'; +COMMENT ON COLUMN wechat_user.miniapp_openid IS '小程序OpenID（用户在当前小程序的唯一标识）'; +COMMENT ON COLUMN wechat_user.mp_openid IS '服务号OpenID（用户在当前服务号的唯一标识）'; + +COMMENT ON COLUMN wechat_user.is_subscribed IS '是否关注服务号：true-已关注，false-未关注'; +COMMENT ON COLUMN wechat_user.subscribe_time IS '首次关注时间'; +COMMENT ON COLUMN wechat_user.unsubscribe_time IS '最后一次取消关注时间'; + + +-- ============================================ +-- 3. member_card 表（会员卡类型表） +-- ============================================ +CREATE TABLE IF NOT EXISTS member_card ( + id BIGSERIAL PRIMARY KEY, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP, + + member_card_id BIGSERIAL, + member_card_name VARCHAR(100) NOT NULL, + member_card_type VARCHAR(20) NOT NULL, + member_card_price DECIMAL(10, 2) NOT NULL, + member_card_validity_days INTEGER, + member_card_total_times INTEGER, + member_card_amount DECIMAL(10, 2), + member_card_status INTEGER DEFAULT 1 NOT NULL, + extra_config TEXT DEFAULT '{}' + ); + +COMMENT ON TABLE member_card IS '会员卡类型表'; +COMMENT ON COLUMN member_card.member_card_id IS '会员卡ID'; +COMMENT ON COLUMN member_card.member_card_name IS '会员卡名称'; +COMMENT ON COLUMN member_card.member_card_type IS '会员卡类型：TIME_CARD-时长卡, COUNT_CARD-次卡, STORED_VALUE_CARD-储值卡'; +COMMENT ON COLUMN member_card.member_card_price IS '会员卡价格'; +COMMENT ON COLUMN member_card.member_card_validity_days IS '有效天数（时长卡用）'; +COMMENT ON COLUMN member_card.member_card_total_times IS '总次数（次卡用）'; +COMMENT ON COLUMN member_card.member_card_amount IS '面额（储值卡用）'; +COMMENT ON COLUMN member_card.member_card_status IS '状态：0-下架, 1-上架'; +COMMENT ON COLUMN member_card.extra_config IS '扩展配置（JSON格式）'; + + +-- ============================================ +-- 4. member_card_record 表（会员卡记录表） +-- ============================================ +CREATE TABLE IF NOT EXISTS member_card_record ( + id BIGSERIAL PRIMARY KEY, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP, + + member_card_record_id BIGSERIAL, + member_id BIGINT NOT NULL, + member_card_id BIGINT NOT NULL, + status VARCHAR(20) NOT NULL DEFAULT 'ACTIVE', + remaining_times INTEGER DEFAULT 0, + remaining_amount DECIMAL(10, 2) DEFAULT 0.00, + expire_time TIMESTAMP, + source_order_id BIGINT, + purchase_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + version INTEGER DEFAULT 0 NOT NULL, + card_composition TEXT + ); + +-- 索引优化 +CREATE INDEX IF NOT EXISTS idx_member_card_record_member_id ON member_card_record(member_id); +CREATE INDEX IF NOT EXISTS idx_member_card_record_status ON member_card_record(status); +CREATE INDEX IF NOT EXISTS idx_member_card_record_expire_time ON member_card_record(expire_time); +CREATE INDEX IF NOT EXISTS idx_member_card_record_member_status ON member_card_record(member_id, status); +CREATE INDEX IF NOT EXISTS idx_member_card_record_status_expire ON member_card_record(status, expire_time) + WHERE status = 'ACTIVE'; + +COMMENT ON TABLE member_card_record IS '会员卡记录表（会员持有的卡）'; +COMMENT ON COLUMN member_card_record.member_card_record_id IS '会员卡记录ID'; +COMMENT ON COLUMN member_card_record.member_id IS '会员ID'; +COMMENT ON COLUMN member_card_record.member_card_id IS '会员卡类型ID'; +COMMENT ON COLUMN member_card_record.status IS '状态：ACTIVE-有效, USED_UP-用完, EXPIRED-过期, REFUNDED-已退款'; +COMMENT ON COLUMN member_card_record.remaining_times IS '剩余次数'; +COMMENT ON COLUMN member_card_record.remaining_amount IS '剩余金额'; +COMMENT ON COLUMN member_card_record.expire_time IS '到期时间'; +COMMENT ON COLUMN member_card_record.source_order_id IS '来源订单ID'; +COMMENT ON COLUMN member_card_record.purchase_time IS '购买时间'; +COMMENT ON COLUMN member_card_record.version IS '乐观锁版本号'; +COMMENT ON COLUMN member_card_record.card_composition IS '卡片组成（JSON格式，用于组合卡）'; + + +-- ============================================ +-- 5. member_card_transactions 表（会员卡交易流水表） +-- ============================================ +CREATE TABLE IF NOT EXISTS member_card_transactions ( + id BIGSERIAL PRIMARY KEY, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + + member_card_record_id BIGINT NOT NULL, + member_id BIGINT NOT NULL, + member_card_id BIGINT NOT NULL, + operation_type VARCHAR(20) NOT NULL, + change_amount INTEGER DEFAULT 0, + change_balance DECIMAL(10, 2) DEFAULT 0.00, + after_remaining_count INTEGER DEFAULT 0, + after_remaining_balance DECIMAL(10, 2) DEFAULT 0.00, + related_biz_type VARCHAR(20), + source_order_id BIGINT, + remark VARCHAR(500), + is_archived BOOLEAN DEFAULT FALSE, + archived_at TIMESTAMP + ); + +-- 索引优化 +CREATE INDEX IF NOT EXISTS idx_member_card_transactions_member_id ON member_card_transactions(member_id); +CREATE INDEX IF NOT EXISTS idx_member_card_transactions_record_id ON member_card_transactions(member_card_record_id); +CREATE INDEX IF NOT EXISTS idx_member_card_transactions_created_at ON member_card_transactions(created_at); +CREATE INDEX IF NOT EXISTS idx_member_card_transactions_member_type_time + ON member_card_transactions(member_id, operation_type, created_at); + +COMMENT ON TABLE member_card_transactions IS '会员卡交易流水表'; +COMMENT ON COLUMN member_card_transactions.operation_type IS '操作类型：PURCHASE-购买, DEDUCT-扣次/扣费, RENEW-续费, REFUND-退款, EXPIRE-过期'; +COMMENT ON COLUMN member_card_transactions.change_amount IS '变动次数'; +COMMENT ON COLUMN member_card_transactions.change_balance IS '变动金额'; +COMMENT ON COLUMN member_card_transactions.after_remaining_count IS '变动后剩余次数'; +COMMENT ON COLUMN member_card_transactions.after_remaining_balance IS '变动后剩余金额'; +COMMENT ON COLUMN member_card_transactions.related_biz_type IS '关联业务类型：GROUP_CLASS-团课, PT_CLASS-私教, CHECK_IN-签到'; +COMMENT ON COLUMN member_card_transactions.is_archived IS '是否已归档'; +COMMENT ON COLUMN member_card_transactions.archived_at IS '归档时间'; + + +-- ============================================ +-- 6. refund_application 表（退款申请表） +-- ============================================ +CREATE TABLE IF NOT EXISTS refund_application ( + id BIGSERIAL PRIMARY KEY, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP, + + record_id BIGINT NOT NULL, + member_id BIGINT NOT NULL, + status VARCHAR(20) NOT NULL DEFAULT 'PENDING', + reason VARCHAR(500), + apply_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + audit_time TIMESTAMP, + auditor_id BIGINT, + audit_remark VARCHAR(500), + refund_amount DECIMAL(10, 2) + ); + +CREATE INDEX IF NOT EXISTS idx_refund_application_record_id ON refund_application(record_id); +CREATE INDEX IF NOT EXISTS idx_refund_application_status ON refund_application(status); + +COMMENT ON TABLE refund_application IS '退款申请表'; +COMMENT ON COLUMN refund_application.status IS '状态：PENDING-待审核, APPROVED-已批准, REJECTED-已拒绝, PROCESSING-处理中, SUCCESS-成功, FAILED-失败'; diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V9__Add_GroupCourse_Booking_Snapshot_Fields.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V9__Add_GroupCourse_Booking_Snapshot_Fields.sql new file mode 100644 index 0000000..8a07dc7 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V9__Add_GroupCourse_Booking_Snapshot_Fields.sql @@ -0,0 +1,15 @@ +-- ============================================ +-- 为团课预约记录表添加课程冗余字段 +-- 用于保存预约时的课程快照信息 +-- ============================================ + +ALTER TABLE group_course_booking + ADD COLUMN IF NOT EXISTS course_name VARCHAR(100), + ADD COLUMN IF NOT EXISTS course_start_time TIMESTAMP, + ADD COLUMN IF NOT EXISTS course_end_time TIMESTAMP, + ADD COLUMN IF NOT EXISTS location VARCHAR(255); + +COMMENT ON COLUMN group_course_booking.course_name IS '课程名称（冗余字段，保存预约时的课程快照）'; +COMMENT ON COLUMN group_course_booking.course_start_time IS '课程开始时间（冗余字段，保存预约时的课程快照）'; +COMMENT ON COLUMN group_course_booking.course_end_time IS '课程结束时间（冗余字段，保存预约时的课程快照）'; +COMMENT ON COLUMN group_course_booking.location IS '上课地点（冗余字段，保存预约时的课程快照）'; \ 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 83ea7df..b83f541 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 @@ -51,7 +51,12 @@ public class SecurityConfig { .pathMatchers("/api/public/**").permitAll() .pathMatchers("/ws/**").permitAll() .pathMatchers("/actuator/**").permitAll() - .pathMatchers("/api/groupCourse/**").permitAll(); + .pathMatchers("/api/groupCourse/**").permitAll() + .pathMatchers("/api/member/**").permitAll() + .pathMatchers("/api/admin/member/**").permitAll() + .pathMatchers("/api/member-cards/**").permitAll() + .pathMatchers("/api/member-card-records/**").permitAll() + .pathMatchers("/api/member-card-transactions/**").permitAll(); if (isDevOrTest) { diff --git a/gym-manage-api/pom.xml b/gym-manage-api/pom.xml index 4a8bb59..e84ef9d 100644 --- a/gym-manage-api/pom.xml +++ b/gym-manage-api/pom.xml @@ -43,6 +43,7 @@ manage-notify manage-file gym-member + gym-groupCourse @@ -229,7 +230,12 @@ hutool-all 5.8.38 - + + + org.springframework.boot + spring-boot-starter-data-redis-reactive + + From de01a3984869859a9a4a9177481ca2944254db84 Mon Sep 17 00:00:00 2001 From: liwentao Date: Thu, 30 Apr 2026 15:53:40 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9B=A2=E8=AF=BE?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/converter/GroupCourseConverter.java | 55 +++++++ .../gym/manage/db/dao/GroupCourseDao.java | 23 +++ .../db/entity/GroupCourseBookingEntity.java | 75 +++++++++ .../manage/db/entity/GroupCourseEntity.java | 148 ++++++++++++++++++ .../db/repository/GroupCourseRepository.java | 57 +++++++ .../manage/sys/core/domain/GroupCourse.java | 146 +++++++++++++++++ .../repository/IGroupCourseRepository.java | 14 ++ .../sys/core/service/IGroupCourseService.java | 11 ++ .../core/service/impl/GroupCourseService.java | 42 +++++ .../groupCourse/GroupCourseHandler.java | 40 +++++ 10 files changed, 611 insertions(+) create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java new file mode 100644 index 0000000..87b66ad --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java @@ -0,0 +1,55 @@ +package cn.novalon.gym.manage.db.converter;/* + * @author:liwentao + * @date:2026/4/26-04-26-13:18 + */ + +import cn.hutool.core.bean.BeanUtil; +import cn.novalon.gym.manage.db.entity.GroupCourseEntity; +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.stream.Collectors; + +@Component +@Slf4j +public class GroupCourseConverter { + public GroupCourse toDomain(GroupCourseEntity entity){ + if(entity == null){ + return null; + } + GroupCourse groupCourse = new GroupCourse(); + BeanUtil.copyProperties(entity,groupCourse); + log.info("转换bean，entity-domain：",groupCourse); + return groupCourse; + } + + public GroupCourseEntity toEntity(GroupCourse domain){ + if(domain == null){ + return null; + } + GroupCourseEntity entity = new GroupCourseEntity(); + BeanUtil.copyProperties(domain,entity); + log.info("转换bean，domain-entity：",entity); + return entity; + } + + public List toDomainList(List entities){ + if (entities == null) { + return null; + } + return entities.stream() + .map(this::toDomain) + .collect(Collectors.toList()); + } + + public List toEntityList(List groupCourses){ + if (groupCourses == null) { + return null; + } + return groupCourses.stream() + .map(this::toEntity) + .collect(Collectors.toList()); + } +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java new file mode 100644 index 0000000..0855162 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java @@ -0,0 +1,23 @@ +package cn.novalon.gym.manage.db.dao; + +import cn.novalon.gym.manage.db.entity.GroupCourseEntity; +import cn.novalon.gym.manage.db.entity.SysUserEntity; +import org.springframework.data.domain.Sort; +import org.springframework.data.r2dbc.repository.R2dbcRepository; +import org.springframework.stereotype.Repository; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +@Repository +public interface GroupCourseDao extends R2dbcRepository { + + Mono findByIdIsAndDeletedAtIsNull(Long id); + + Flux findAll(); + + Flux findAll(Sort sort); + + Flux findAllByDeletedAtIsNull(); + + Flux findAllByDeletedAtIsNull(Sort sort); +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java new file mode 100644 index 0000000..f414735 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java @@ -0,0 +1,75 @@ +package cn.novalon.gym.manage.db.entity; + +import org.springframework.data.relational.core.mapping.Column; +import org.springframework.data.relational.core.mapping.Table; + +import java.util.Date; + +/** + * @author:liwentao + * @date:2026/4/25-04-25-17:50 + * 团课预约记录表 + */ + +@Table("group_course_booking") +public class GroupCourseBookingEntity extends BaseEntity { + + //团课id + @Column("course_id") + private Long courseId; + + //用户id + @Column("user_id") + private Long userId; + + //预约时间 + @Column("booking_time") + private Date bookingTime; + + //状态：0-已预约，1-已取消，2-已出席，3-缺席 + @Column("status") + private Long status; + //取消时间 + @Column("cancel_time") + private Date cancelTime; + + public Long getCourseId() { + return courseId; + } + + public void setCourseId(Long courseId) { + this.courseId = courseId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Date getBookingTime() { + return bookingTime; + } + + public void setBookingTime(Date bookingTime) { + this.bookingTime = bookingTime; + } + + public Long getStatus() { + return status; + } + + public void setStatus(Long status) { + this.status = status; + } + + public Date getCancelTime() { + return cancelTime; + } + + public void setCancelTime(Date cancelTime) { + this.cancelTime = cancelTime; + } +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java new file mode 100644 index 0000000..67cc612 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java @@ -0,0 +1,148 @@ +package cn.novalon.gym.manage.db.entity; +/** + * @author:liwentao + * @date:2026/4/25-04-25-17:34 + * 团课表 + */ + +import org.springframework.data.relational.core.mapping.Column; +import org.springframework.data.relational.core.mapping.Table; + +import java.time.LocalDateTime; +import java.util.Date; + +@Table("group_course") +public class GroupCourseEntity extends BaseEntity { + + //课程名称 + @Column("course_name") + private String courseName; + + //教练id + @Column("coach_id") + private Long coachId; + + //课程类型 + @Column("course_type") + private Long courseType; + + //开始时间 + @Column("start_time") + private LocalDateTime startTime; + + //结束时间 + @Column("end_time") + private LocalDateTime endTime; + + //最大参与人数 + @Column("max_members") + private Integer maxMembers; + + //当前参与人数 + @Column("current_members") + private Integer currentMembers; + + //课程状态：0-正常，1-已取消，2-已结束 + @Column("status") + private Long status; + + //上课地点 + @Column("location") + private String location; + + //封面图URL + @Column("cover_image") + private String coverImage; + + //课程描述 + @Column("description") + private String description; + + public String getCourseName() { + return courseName; + } + + public void setCourseName(String courseName) { + this.courseName = courseName; + } + + public Long getCoachId() { + return coachId; + } + + public void setCoachId(Long coachId) { + this.coachId = coachId; + } + + public Long getCourseType() { + return courseType; + } + + public void setCourseType(Long courseType) { + this.courseType = courseType; + } + + public LocalDateTime getStartTime() { + return startTime; + } + + public void setStartTime(LocalDateTime startTime) { + this.startTime = startTime; + } + + public LocalDateTime getEndTime() { + return endTime; + } + + public void setEndTime(LocalDateTime endTime) { + this.endTime = endTime; + } + + public Integer getMaxMembers() { + return maxMembers; + } + + public void setMaxMembers(Integer maxMembers) { + this.maxMembers = maxMembers; + } + + public Integer getCurrentMembers() { + return currentMembers; + } + + public void setCurrentMembers(Integer currentMembers) { + this.currentMembers = currentMembers; + } + + public Long getStatus() { + return status; + } + + public void setStatus(Long status) { + this.status = status; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getCoverImage() { + return coverImage; + } + + public void setCoverImage(String coverImage) { + this.coverImage = coverImage; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java new file mode 100644 index 0000000..d4846b9 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java @@ -0,0 +1,57 @@ +package cn.novalon.gym.manage.db.repository; + +import cn.novalon.gym.manage.db.converter.GroupCourseConverter; +import cn.novalon.gym.manage.db.dao.GroupCourseDao; +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import cn.novalon.gym.manage.sys.core.repository.IGroupCourseRepository; +import org.springframework.data.domain.Sort; +import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; +import org.springframework.stereotype.Repository; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * @author:liwentao + * @date:2026/4/26-04-26-14:16 + */ +@Repository +public class GroupCourseRepository implements IGroupCourseRepository { + private final GroupCourseDao groupCourseDao; + private final GroupCourseConverter groupCourseConverter; + private final R2dbcEntityTemplate r2dbcEntityTemplate; + + public GroupCourseRepository(GroupCourseDao groupCourseDao,GroupCourseConverter groupCourseConverter, + R2dbcEntityTemplate r2dbcEntityTemplate){ + this.groupCourseDao = groupCourseDao; + this.groupCourseConverter = groupCourseConverter; + this.r2dbcEntityTemplate = r2dbcEntityTemplate; + } + + @Override + public Mono findByIdAndDeletedAtIsNull(Long id) { + return groupCourseDao.findByIdIsAndDeletedAtIsNull(id) + .map(groupCourseConverter::toDomain); + } + + @Override + public Flux findAll() { + return groupCourseDao.findAll() + .map(groupCourseConverter::toDomain); + } + + public Flux findAll(Sort sort) { + return groupCourseDao.findAll(sort) + .map(groupCourseConverter::toDomain); + } + + @Override + public Flux findByDeletedAtIsNull() { + return groupCourseDao.findAllByDeletedAtIsNull() + .map(groupCourseConverter::toDomain); + } + + public Flux findByDeletedAtIsNull(Sort sort) { + return groupCourseDao.findAllByDeletedAtIsNull(sort) + .map(groupCourseConverter::toDomain); + } +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java new file mode 100644 index 0000000..11b9949 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java @@ -0,0 +1,146 @@ +package cn.novalon.gym.manage.sys.core.domain; +/** + * @author:liwentao + * @date:2026/4/26-04-26-13:20 + */ + +import io.swagger.v3.oas.annotations.media.Schema; +import org.springframework.data.relational.core.mapping.Column; + +import java.time.LocalDateTime; +import java.util.Date; +@Schema(description = "") +public class GroupCourse extends BaseDomain{ + + //课程名称 + @Schema(description = "团课名", example = "Push-up") + private String courseName; + + //教练id + @Schema(description = "教练id", example = "1") + private Long coachId; + + //课程类型 + @Schema(description = "课程类型", example = "1") + private Long courseType; + + //开始时间 + @Schema(description = "开始时间", example = "2026-01-01") + private LocalDateTime startTime; + + //结束时间 + @Schema(description = "结束时间", example = "2026-01-02") + private LocalDateTime endTime; + + //最大参与人数 + @Schema(description = "最大参与人数", example = "20") + private Integer maxMembers; + + //当前参与人数 + @Schema(description = "当前参与人数", example = "2") + private Integer currentMembers; + + //课程状态：0-正常，1-已取消，2-已结束 + @Schema(description = "课程状态", example = "0") + private Long status; + + //上课地点 + @Schema(description = "上课地点", example = "龙泉驿区幸福路") + private String location; + + //封面图URL + @Schema(description = "封面图URL", example = "https://12345.com") + private String coverImage; + + //课程描述 + @Schema(description = "课程描述", example = "从入门到入土") + private String description; + + public String getCourseName() { + return courseName; + } + + public void setCourseName(String courseName) { + this.courseName = courseName; + } + + public Long getCoachId() { + return coachId; + } + + public void setCoachId(Long coachId) { + this.coachId = coachId; + } + + public Long getCourseType() { + return courseType; + } + + public void setCourseType(Long courseType) { + this.courseType = courseType; + } + + public LocalDateTime getStartTime() { + return startTime; + } + + public void setStartTime(LocalDateTime startTime) { + this.startTime = startTime; + } + + public LocalDateTime getEndTime() { + return endTime; + } + + public void setEndTime(LocalDateTime endTime) { + this.endTime = endTime; + } + + public Integer getMaxMembers() { + return maxMembers; + } + + public void setMaxMembers(Integer maxMembers) { + this.maxMembers = maxMembers; + } + + public Integer getCurrentMembers() { + return currentMembers; + } + + public void setCurrentMembers(Integer currentMembers) { + this.currentMembers = currentMembers; + } + + public Long getStatus() { + return status; + } + + public void setStatus(Long status) { + this.status = status; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getCoverImage() { + return coverImage; + } + + public void setCoverImage(String coverImage) { + this.coverImage = coverImage; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java new file mode 100644 index 0000000..2d020d4 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java @@ -0,0 +1,14 @@ +package cn.novalon.gym.manage.sys.core.repository; + +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import org.springframework.data.domain.Sort; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +public interface IGroupCourseRepository { + Mono findByIdAndDeletedAtIsNull(Long id); + Flux findAll(); + Flux findAll(Sort sort); + Flux findByDeletedAtIsNull(); + Flux findByDeletedAtIsNull(Sort sort); +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java new file mode 100644 index 0000000..28efd2e --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java @@ -0,0 +1,11 @@ +package cn.novalon.gym.manage.sys.core.service; + +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +public interface IGroupCourseService { + Mono findById(Long id); + Flux findAll(); + Flux findAll(boolean includeDeleted); +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java new file mode 100644 index 0000000..2b1fcbf --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java @@ -0,0 +1,42 @@ +package cn.novalon.gym.manage.sys.core.service.impl; + +import cn.novalon.gym.manage.sys.audit.service.IAuditLogService; +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import cn.novalon.gym.manage.sys.core.repository.IGroupCourseRepository; +import cn.novalon.gym.manage.sys.core.service.IGroupCourseService; +import org.springframework.stereotype.Service; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * @author:liwentao + * @date:2026/4/26-04-26-14:12 + */ +@Service +public class GroupCourseService implements IGroupCourseService { + private final IGroupCourseRepository groupCourseRepository; + private final IAuditLogService auditLogService; + public GroupCourseService(IGroupCourseRepository groupCourseRepository, IAuditLogService auditLogService){ + this.groupCourseRepository = groupCourseRepository; + this.auditLogService = auditLogService; + } + + @Override + public Mono findById(Long id) { + return groupCourseRepository.findByIdAndDeletedAtIsNull(id); + } + + @Override + public Flux findAll() { + return groupCourseRepository.findAll(); + } + + @Override + public Flux findAll(boolean includeDeleted) { + if(includeDeleted){ + return groupCourseRepository.findAll(); + }else{ + return groupCourseRepository.findByDeletedAtIsNull(); + } + } +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java new file mode 100644 index 0000000..b439351 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java @@ -0,0 +1,40 @@ +package cn.novalon.gym.manage.sys.handler.groupCourse; + +import cn.novalon.gym.manage.sys.core.domain.GroupCourse; +import cn.novalon.gym.manage.sys.core.service.IGroupCourseService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Validator; +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; + +/** + * @author:liwentao + * @date:2026/4/26-04-26-14:30 + */ +@Component +@Tag(name="团课管理",description = "团课相关操作") +public class GroupCourseHandler { + private final IGroupCourseService groupCourseService; + private final Validator validator; + public GroupCourseHandler(IGroupCourseService groupCourseService,Validator validator){ + this.groupCourseService = groupCourseService; + this.validator = validator; + } + + @Operation(summary = "获取所有用户", description = "获取系统中所有用户列表") + public Mono getAllGroupCourse(ServerRequest request){ + boolean includeDeleted = Boolean.valueOf(request.queryParam("includeDeleted").orElse("false")); + return ServerResponse.ok() + .body(groupCourseService.findAll(includeDeleted), GroupCourse.class); + } + + public Mono getGroupCourseById(ServerRequest request){ + Long id = Long.valueOf(request.pathVariable("id")); + return groupCourseService.findById(id) + .flatMap(groupCourse -> ServerResponse.ok().bodyValue(groupCourse)) + .switchIfEmpty(ServerResponse.notFound().build()); + } +} From 2f070e6b4478fd50aafb5580fc4c20e63119a539 Mon Sep 17 00:00:00 2001 From: liwentao Date: Sun, 10 May 2026 18:26:33 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E5=B0=86=E5=9B=A2=E8=AF=BE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB=E8=87=B3gym-Group?= =?UTF-8?q?Course=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/converter/GroupCourseConverter.java | 55 ------- .../gym/manage/db/dao/GroupCourseDao.java | 23 --- .../db/entity/GroupCourseBookingEntity.java | 75 --------- .../manage/db/entity/GroupCourseEntity.java | 148 ------------------ .../db/repository/GroupCourseRepository.java | 57 ------- .../manage/sys/core/domain/GroupCourse.java | 146 ----------------- .../repository/IGroupCourseRepository.java | 14 -- .../sys/core/service/IGroupCourseService.java | 11 -- .../core/service/impl/GroupCourseService.java | 42 ----- .../groupCourse/GroupCourseHandler.java | 40 ----- 10 files changed, 611 deletions(-) delete mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java delete mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java delete mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java delete mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java delete mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java delete mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java delete mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java delete mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java delete mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java delete mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java deleted file mode 100644 index 87b66ad..0000000 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GroupCourseConverter.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.novalon.gym.manage.db.converter;/* - * @author:liwentao - * @date:2026/4/26-04-26-13:18 - */ - -import cn.hutool.core.bean.BeanUtil; -import cn.novalon.gym.manage.db.entity.GroupCourseEntity; -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.List; -import java.util.stream.Collectors; - -@Component -@Slf4j -public class GroupCourseConverter { - public GroupCourse toDomain(GroupCourseEntity entity){ - if(entity == null){ - return null; - } - GroupCourse groupCourse = new GroupCourse(); - BeanUtil.copyProperties(entity,groupCourse); - log.info("转换bean，entity-domain：",groupCourse); - return groupCourse; - } - - public GroupCourseEntity toEntity(GroupCourse domain){ - if(domain == null){ - return null; - } - GroupCourseEntity entity = new GroupCourseEntity(); - BeanUtil.copyProperties(domain,entity); - log.info("转换bean，domain-entity：",entity); - return entity; - } - - public List toDomainList(List entities){ - if (entities == null) { - return null; - } - return entities.stream() - .map(this::toDomain) - .collect(Collectors.toList()); - } - - public List toEntityList(List groupCourses){ - if (groupCourses == null) { - return null; - } - return groupCourses.stream() - .map(this::toEntity) - .collect(Collectors.toList()); - } -} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java deleted file mode 100644 index 0855162..0000000 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GroupCourseDao.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.novalon.gym.manage.db.dao; - -import cn.novalon.gym.manage.db.entity.GroupCourseEntity; -import cn.novalon.gym.manage.db.entity.SysUserEntity; -import org.springframework.data.domain.Sort; -import org.springframework.data.r2dbc.repository.R2dbcRepository; -import org.springframework.stereotype.Repository; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -@Repository -public interface GroupCourseDao extends R2dbcRepository { - - Mono findByIdIsAndDeletedAtIsNull(Long id); - - Flux findAll(); - - Flux findAll(Sort sort); - - Flux findAllByDeletedAtIsNull(); - - Flux findAllByDeletedAtIsNull(Sort sort); -} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java deleted file mode 100644 index f414735..0000000 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseBookingEntity.java +++ /dev/null @@ -1,75 +0,0 @@ -package cn.novalon.gym.manage.db.entity; - -import org.springframework.data.relational.core.mapping.Column; -import org.springframework.data.relational.core.mapping.Table; - -import java.util.Date; - -/** - * @author:liwentao - * @date:2026/4/25-04-25-17:50 - * 团课预约记录表 - */ - -@Table("group_course_booking") -public class GroupCourseBookingEntity extends BaseEntity { - - //团课id - @Column("course_id") - private Long courseId; - - //用户id - @Column("user_id") - private Long userId; - - //预约时间 - @Column("booking_time") - private Date bookingTime; - - //状态：0-已预约，1-已取消，2-已出席，3-缺席 - @Column("status") - private Long status; - //取消时间 - @Column("cancel_time") - private Date cancelTime; - - public Long getCourseId() { - return courseId; - } - - public void setCourseId(Long courseId) { - this.courseId = courseId; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - public Date getBookingTime() { - return bookingTime; - } - - public void setBookingTime(Date bookingTime) { - this.bookingTime = bookingTime; - } - - public Long getStatus() { - return status; - } - - public void setStatus(Long status) { - this.status = status; - } - - public Date getCancelTime() { - return cancelTime; - } - - public void setCancelTime(Date cancelTime) { - this.cancelTime = cancelTime; - } -} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java deleted file mode 100644 index 67cc612..0000000 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/entity/GroupCourseEntity.java +++ /dev/null @@ -1,148 +0,0 @@ -package cn.novalon.gym.manage.db.entity; -/** - * @author:liwentao - * @date:2026/4/25-04-25-17:34 - * 团课表 - */ - -import org.springframework.data.relational.core.mapping.Column; -import org.springframework.data.relational.core.mapping.Table; - -import java.time.LocalDateTime; -import java.util.Date; - -@Table("group_course") -public class GroupCourseEntity extends BaseEntity { - - //课程名称 - @Column("course_name") - private String courseName; - - //教练id - @Column("coach_id") - private Long coachId; - - //课程类型 - @Column("course_type") - private Long courseType; - - //开始时间 - @Column("start_time") - private LocalDateTime startTime; - - //结束时间 - @Column("end_time") - private LocalDateTime endTime; - - //最大参与人数 - @Column("max_members") - private Integer maxMembers; - - //当前参与人数 - @Column("current_members") - private Integer currentMembers; - - //课程状态：0-正常，1-已取消，2-已结束 - @Column("status") - private Long status; - - //上课地点 - @Column("location") - private String location; - - //封面图URL - @Column("cover_image") - private String coverImage; - - //课程描述 - @Column("description") - private String description; - - public String getCourseName() { - return courseName; - } - - public void setCourseName(String courseName) { - this.courseName = courseName; - } - - public Long getCoachId() { - return coachId; - } - - public void setCoachId(Long coachId) { - this.coachId = coachId; - } - - public Long getCourseType() { - return courseType; - } - - public void setCourseType(Long courseType) { - this.courseType = courseType; - } - - public LocalDateTime getStartTime() { - return startTime; - } - - public void setStartTime(LocalDateTime startTime) { - this.startTime = startTime; - } - - public LocalDateTime getEndTime() { - return endTime; - } - - public void setEndTime(LocalDateTime endTime) { - this.endTime = endTime; - } - - public Integer getMaxMembers() { - return maxMembers; - } - - public void setMaxMembers(Integer maxMembers) { - this.maxMembers = maxMembers; - } - - public Integer getCurrentMembers() { - return currentMembers; - } - - public void setCurrentMembers(Integer currentMembers) { - this.currentMembers = currentMembers; - } - - public Long getStatus() { - return status; - } - - public void setStatus(Long status) { - this.status = status; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getCoverImage() { - return coverImage; - } - - public void setCoverImage(String coverImage) { - this.coverImage = coverImage; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } -} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java deleted file mode 100644 index d4846b9..0000000 --- a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GroupCourseRepository.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.novalon.gym.manage.db.repository; - -import cn.novalon.gym.manage.db.converter.GroupCourseConverter; -import cn.novalon.gym.manage.db.dao.GroupCourseDao; -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; -import cn.novalon.gym.manage.sys.core.repository.IGroupCourseRepository; -import org.springframework.data.domain.Sort; -import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; -import org.springframework.stereotype.Repository; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -/** - * @author:liwentao - * @date:2026/4/26-04-26-14:16 - */ -@Repository -public class GroupCourseRepository implements IGroupCourseRepository { - private final GroupCourseDao groupCourseDao; - private final GroupCourseConverter groupCourseConverter; - private final R2dbcEntityTemplate r2dbcEntityTemplate; - - public GroupCourseRepository(GroupCourseDao groupCourseDao,GroupCourseConverter groupCourseConverter, - R2dbcEntityTemplate r2dbcEntityTemplate){ - this.groupCourseDao = groupCourseDao; - this.groupCourseConverter = groupCourseConverter; - this.r2dbcEntityTemplate = r2dbcEntityTemplate; - } - - @Override - public Mono findByIdAndDeletedAtIsNull(Long id) { - return groupCourseDao.findByIdIsAndDeletedAtIsNull(id) - .map(groupCourseConverter::toDomain); - } - - @Override - public Flux findAll() { - return groupCourseDao.findAll() - .map(groupCourseConverter::toDomain); - } - - public Flux findAll(Sort sort) { - return groupCourseDao.findAll(sort) - .map(groupCourseConverter::toDomain); - } - - @Override - public Flux findByDeletedAtIsNull() { - return groupCourseDao.findAllByDeletedAtIsNull() - .map(groupCourseConverter::toDomain); - } - - public Flux findByDeletedAtIsNull(Sort sort) { - return groupCourseDao.findAllByDeletedAtIsNull(sort) - .map(groupCourseConverter::toDomain); - } -} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java deleted file mode 100644 index 11b9949..0000000 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/domain/GroupCourse.java +++ /dev/null @@ -1,146 +0,0 @@ -package cn.novalon.gym.manage.sys.core.domain; -/** - * @author:liwentao - * @date:2026/4/26-04-26-13:20 - */ - -import io.swagger.v3.oas.annotations.media.Schema; -import org.springframework.data.relational.core.mapping.Column; - -import java.time.LocalDateTime; -import java.util.Date; -@Schema(description = "") -public class GroupCourse extends BaseDomain{ - - //课程名称 - @Schema(description = "团课名", example = "Push-up") - private String courseName; - - //教练id - @Schema(description = "教练id", example = "1") - private Long coachId; - - //课程类型 - @Schema(description = "课程类型", example = "1") - private Long courseType; - - //开始时间 - @Schema(description = "开始时间", example = "2026-01-01") - private LocalDateTime startTime; - - //结束时间 - @Schema(description = "结束时间", example = "2026-01-02") - private LocalDateTime endTime; - - //最大参与人数 - @Schema(description = "最大参与人数", example = "20") - private Integer maxMembers; - - //当前参与人数 - @Schema(description = "当前参与人数", example = "2") - private Integer currentMembers; - - //课程状态：0-正常，1-已取消，2-已结束 - @Schema(description = "课程状态", example = "0") - private Long status; - - //上课地点 - @Schema(description = "上课地点", example = "龙泉驿区幸福路") - private String location; - - //封面图URL - @Schema(description = "封面图URL", example = "https://12345.com") - private String coverImage; - - //课程描述 - @Schema(description = "课程描述", example = "从入门到入土") - private String description; - - public String getCourseName() { - return courseName; - } - - public void setCourseName(String courseName) { - this.courseName = courseName; - } - - public Long getCoachId() { - return coachId; - } - - public void setCoachId(Long coachId) { - this.coachId = coachId; - } - - public Long getCourseType() { - return courseType; - } - - public void setCourseType(Long courseType) { - this.courseType = courseType; - } - - public LocalDateTime getStartTime() { - return startTime; - } - - public void setStartTime(LocalDateTime startTime) { - this.startTime = startTime; - } - - public LocalDateTime getEndTime() { - return endTime; - } - - public void setEndTime(LocalDateTime endTime) { - this.endTime = endTime; - } - - public Integer getMaxMembers() { - return maxMembers; - } - - public void setMaxMembers(Integer maxMembers) { - this.maxMembers = maxMembers; - } - - public Integer getCurrentMembers() { - return currentMembers; - } - - public void setCurrentMembers(Integer currentMembers) { - this.currentMembers = currentMembers; - } - - public Long getStatus() { - return status; - } - - public void setStatus(Long status) { - this.status = status; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getCoverImage() { - return coverImage; - } - - public void setCoverImage(String coverImage) { - this.coverImage = coverImage; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } -} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java deleted file mode 100644 index 2d020d4..0000000 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGroupCourseRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.novalon.gym.manage.sys.core.repository; - -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; -import org.springframework.data.domain.Sort; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -public interface IGroupCourseRepository { - Mono findByIdAndDeletedAtIsNull(Long id); - Flux findAll(); - Flux findAll(Sort sort); - Flux findByDeletedAtIsNull(); - Flux findByDeletedAtIsNull(Sort sort); -} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java deleted file mode 100644 index 28efd2e..0000000 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGroupCourseService.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.novalon.gym.manage.sys.core.service; - -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -public interface IGroupCourseService { - Mono findById(Long id); - Flux findAll(); - Flux findAll(boolean includeDeleted); -} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java deleted file mode 100644 index 2b1fcbf..0000000 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GroupCourseService.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.novalon.gym.manage.sys.core.service.impl; - -import cn.novalon.gym.manage.sys.audit.service.IAuditLogService; -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; -import cn.novalon.gym.manage.sys.core.repository.IGroupCourseRepository; -import cn.novalon.gym.manage.sys.core.service.IGroupCourseService; -import org.springframework.stereotype.Service; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -/** - * @author:liwentao - * @date:2026/4/26-04-26-14:12 - */ -@Service -public class GroupCourseService implements IGroupCourseService { - private final IGroupCourseRepository groupCourseRepository; - private final IAuditLogService auditLogService; - public GroupCourseService(IGroupCourseRepository groupCourseRepository, IAuditLogService auditLogService){ - this.groupCourseRepository = groupCourseRepository; - this.auditLogService = auditLogService; - } - - @Override - public Mono findById(Long id) { - return groupCourseRepository.findByIdAndDeletedAtIsNull(id); - } - - @Override - public Flux findAll() { - return groupCourseRepository.findAll(); - } - - @Override - public Flux findAll(boolean includeDeleted) { - if(includeDeleted){ - return groupCourseRepository.findAll(); - }else{ - return groupCourseRepository.findByDeletedAtIsNull(); - } - } -} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java deleted file mode 100644 index b439351..0000000 --- a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/groupCourse/GroupCourseHandler.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.novalon.gym.manage.sys.handler.groupCourse; - -import cn.novalon.gym.manage.sys.core.domain.GroupCourse; -import cn.novalon.gym.manage.sys.core.service.IGroupCourseService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Validator; -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; - -/** - * @author:liwentao - * @date:2026/4/26-04-26-14:30 - */ -@Component -@Tag(name="团课管理",description = "团课相关操作") -public class GroupCourseHandler { - private final IGroupCourseService groupCourseService; - private final Validator validator; - public GroupCourseHandler(IGroupCourseService groupCourseService,Validator validator){ - this.groupCourseService = groupCourseService; - this.validator = validator; - } - - @Operation(summary = "获取所有用户", description = "获取系统中所有用户列表") - public Mono getAllGroupCourse(ServerRequest request){ - boolean includeDeleted = Boolean.valueOf(request.queryParam("includeDeleted").orElse("false")); - return ServerResponse.ok() - .body(groupCourseService.findAll(includeDeleted), GroupCourse.class); - } - - public Mono getGroupCourseById(ServerRequest request){ - Long id = Long.valueOf(request.pathVariable("id")); - return groupCourseService.findById(id) - .flatMap(groupCourse -> ServerResponse.ok().bodyValue(groupCourse)) - .switchIfEmpty(ServerResponse.notFound().build()); - } -} From 544ddeec5a78e578d15e57a6051047e8825603df Mon Sep 17 00:00:00 2001 From: liwentao Date: Fri, 15 May 2026 17:32:03 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Redis=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=E6=B3=A8=EF=BC=9A/api/groupCourse/cache/g?= =?UTF-8?q?et=E6=8E=A5=E5=8F=A3=E4=B8=BA=E6=B5=8B=E8=AF=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../groupcourse/service/RedisService.java | 76 +++++++++++++++++++ .../gym/manage/app/config/RedisConfig.java | 43 +++++++++++ .../src/main/resources/application.yml | 1 + 3 files changed, 120 insertions(+) create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java create mode 100644 gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java new file mode 100644 index 0000000..aa92e38 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java @@ -0,0 +1,76 @@ +package cn.novalon.gym.manage.groupcourse.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; + +import java.util.Set; +import java.util.concurrent.TimeUnit; + +/** + * @author:liwentao + * @date:2026/5/15-05-15-16:05 + */ +@Service +public class RedisService { + + @Autowired + private RedisTemplate redisTemplate; + + // 设置值 + public void set(String key, Object value) { + redisTemplate.opsForValue().set(key, value); + } + + // 设置值并指定过期时间（秒） + public void setWithExpire(String key, Object value, long timeout) { + redisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS); + } + + // 获取值 + public Object get(String key) { + return redisTemplate.opsForValue().get(key); + } + + // 删除key + public Boolean delete(String key) { + return redisTemplate.delete(key); + } + + // 判断key是否存在 + public Boolean hasKey(String key) { + return redisTemplate.hasKey(key); + } + + // 设置过期时间 + public Boolean expire(String key, long timeout) { + return redisTemplate.expire(key, timeout, TimeUnit.SECONDS); + } + + // Hash操作 + public void putHash(String key, String hashKey, Object value) { + redisTemplate.opsForHash().put(key, hashKey, value); + } + + public Object getHash(String key, String hashKey) { + return redisTemplate.opsForHash().get(key, hashKey); + } + + // List操作 + public void leftPush(String key, Object value) { + redisTemplate.opsForList().leftPush(key, value); + } + + public Object rightPop(String key) { + return redisTemplate.opsForList().rightPop(key); + } + + // Set操作 + public void addToSet(String key, Object... values) { + redisTemplate.opsForSet().add(key, values); + } + + public Set getSet(String key) { + return redisTemplate.opsForSet().members(key); + } +} diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java new file mode 100644 index 0000000..12d804e --- /dev/null +++ b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java @@ -0,0 +1,43 @@ +package cn.novalon.gym.manage.app.config; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +/** + * @author:liwentao + * @date:2026/5/15-05-15-16:01 + */ +@Configuration +public class RedisConfig { + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory factory) { + RedisTemplate template = new RedisTemplate<>(); + template.setConnectionFactory(factory); + + // 创建ObjectMapper并配置 + ObjectMapper om = new ObjectMapper(); + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + om.activateDefaultTyping(om.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL); + + // 使用GenericJackson2JsonRedisSerializer替代已弃用的方式 + GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer = new GenericJackson2JsonRedisSerializer(om); + + // 使用StringRedisSerializer来序列化和反序列化redis的key值 + StringRedisSerializer stringSerializer = new StringRedisSerializer(); + template.setKeySerializer(stringSerializer); + template.setValueSerializer(genericJackson2JsonRedisSerializer); + template.setHashKeySerializer(stringSerializer); + template.setHashValueSerializer(genericJackson2JsonRedisSerializer); + + template.afterPropertiesSet(); + return template; + } +} \ No newline at end of file diff --git a/gym-manage-api/manage-app/src/main/resources/application.yml b/gym-manage-api/manage-app/src/main/resources/application.yml index 294cdeb..824ca7b 100644 --- a/gym-manage-api/manage-app/src/main/resources/application.yml +++ b/gym-manage-api/manage-app/src/main/resources/application.yml @@ -56,6 +56,7 @@ spring: import: classpath:member-config.yml + management: endpoints: web: From bdcd3b2bf0cce9ed9b9237faa01bbf340d065ce0 Mon Sep 17 00:00:00 2001 From: liwentao Date: Mon, 1 Jun 2026 19:50:39 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=B7=B2=E5=BA=9F?= =?UTF-8?q?=E5=BC=83=E7=9A=84RedisConfig=E5=92=8CRedisService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../groupcourse/service/RedisService.java | 76 ------------------- .../gym/manage/app/config/RedisConfig.java | 43 ----------- 2 files changed, 119 deletions(-) delete mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java delete mode 100644 gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java deleted file mode 100644 index aa92e38..0000000 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/RedisService.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.novalon.gym.manage.groupcourse.service; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.util.Set; -import java.util.concurrent.TimeUnit; - -/** - * @author:liwentao - * @date:2026/5/15-05-15-16:05 - */ -@Service -public class RedisService { - - @Autowired - private RedisTemplate redisTemplate; - - // 设置值 - public void set(String key, Object value) { - redisTemplate.opsForValue().set(key, value); - } - - // 设置值并指定过期时间（秒） - public void setWithExpire(String key, Object value, long timeout) { - redisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS); - } - - // 获取值 - public Object get(String key) { - return redisTemplate.opsForValue().get(key); - } - - // 删除key - public Boolean delete(String key) { - return redisTemplate.delete(key); - } - - // 判断key是否存在 - public Boolean hasKey(String key) { - return redisTemplate.hasKey(key); - } - - // 设置过期时间 - public Boolean expire(String key, long timeout) { - return redisTemplate.expire(key, timeout, TimeUnit.SECONDS); - } - - // Hash操作 - public void putHash(String key, String hashKey, Object value) { - redisTemplate.opsForHash().put(key, hashKey, value); - } - - public Object getHash(String key, String hashKey) { - return redisTemplate.opsForHash().get(key, hashKey); - } - - // List操作 - public void leftPush(String key, Object value) { - redisTemplate.opsForList().leftPush(key, value); - } - - public Object rightPop(String key) { - return redisTemplate.opsForList().rightPop(key); - } - - // Set操作 - public void addToSet(String key, Object... values) { - redisTemplate.opsForSet().add(key, values); - } - - public Set getSet(String key) { - return redisTemplate.opsForSet().members(key); - } -} diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java deleted file mode 100644 index 12d804e..0000000 --- a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/RedisConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.novalon.gym.manage.app.config; - -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -/** - * @author:liwentao - * @date:2026/5/15-05-15-16:01 - */ -@Configuration -public class RedisConfig { - - @Bean - public RedisTemplate redisTemplate(RedisConnectionFactory factory) { - RedisTemplate template = new RedisTemplate<>(); - template.setConnectionFactory(factory); - - // 创建ObjectMapper并配置 - ObjectMapper om = new ObjectMapper(); - om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); - om.activateDefaultTyping(om.getPolymorphicTypeValidator(), ObjectMapper.DefaultTyping.NON_FINAL); - - // 使用GenericJackson2JsonRedisSerializer替代已弃用的方式 - GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer = new GenericJackson2JsonRedisSerializer(om); - - // 使用StringRedisSerializer来序列化和反序列化redis的key值 - StringRedisSerializer stringSerializer = new StringRedisSerializer(); - template.setKeySerializer(stringSerializer); - template.setValueSerializer(genericJackson2JsonRedisSerializer); - template.setHashKeySerializer(stringSerializer); - template.setHashValueSerializer(genericJackson2JsonRedisSerializer); - - template.afterPropertiesSet(); - return template; - } -} \ No newline at end of file From 8af444b7eed8560b2afa37554c8ec8f3db1a0c4c Mon Sep 17 00:00:00 2001 From: liwentao Date: Tue, 2 Jun 2026 16:58:49 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A8=A1=E5=9D=972?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gym-manage-api/docs/V10-booking-test-data.md | 272 +++++++ .../docs/V11-cancel-booking-test-data.md | 204 +++++ gym-manage-api/docs/booking-test-scenarios.md | 400 ++++++++++ gym-manage-api/docs/groupcourse-api.md | 728 ++++++++++++++++++ gym-manage-api/gym-groupCourse/pom.xml | 7 + .../dao/GroupCourseBookingDao.java | 52 +- .../groupcourse/dao/GroupCourseDao.java | 16 + .../groupcourse/domain/GroupCourse.java | 24 + .../domain/GroupCourseBooking.java | 14 +- .../entity/GroupCourseBookingEntity.java | 12 +- .../groupcourse/entity/GroupCourseEntity.java | 24 + .../manage/groupcourse/enums/CourseEvent.java | 24 + .../groupcourse/enums/CourseStatus.java | 43 ++ .../handler/BookingSagaHandler.java | 369 +++++++++ .../handler/GroupCourseBookingHandler.java | 25 +- .../handler/GroupCourseHandler.java | 135 +++- .../handler/GroupCourseStateMachine.java | 139 ++++ .../IGroupCourseBookingRepository.java | 37 +- .../repository/IGroupCourseRepository.java | 10 + .../impl/GroupCourseBookingRepository.java | 34 +- .../impl/GroupCourseRepository.java | 50 ++ .../scheduler/GroupCourseAbsentScheduler.java | 42 + .../service/IGroupCourseBookingService.java | 14 +- .../service/IGroupCourseService.java | 10 + .../impl/GroupCourseBookingService.java | 240 ++++-- .../service/impl/GroupCourseRedisService.java | 13 +- .../service/impl/GroupCourseService.java | 262 ++++++- gym-manage-api/log.text | 200 +++++ .../gym/manage/app/ManageApplication.java | 2 + .../gym/manage/app/config/SystemRouter.java | 5 + .../gym/manage/common/util/RedisUtil.java | 8 + .../V10__Insert_Booking_Test_Data.sql | 86 +++ .../V11__Insert_Cancel_Booking_Test_Data.sql | 116 +++ .../V12__Insert_Time_Conflict_Test_Data.sql | 58 ++ .../V6__Create_GroupCourse_table.sql | 4 + .../V7__Insert_GroupCourse_test_data.sql | 2 +- 36 files changed, 3576 insertions(+), 105 deletions(-) create mode 100644 gym-manage-api/docs/V10-booking-test-data.md create mode 100644 gym-manage-api/docs/V11-cancel-booking-test-data.md create mode 100644 gym-manage-api/docs/booking-test-scenarios.md create mode 100644 gym-manage-api/docs/groupcourse-api.md create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseEvent.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseStatus.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/BookingSagaHandler.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseStateMachine.java create mode 100644 gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/scheduler/GroupCourseAbsentScheduler.java create mode 100644 gym-manage-api/log.text create mode 100644 gym-manage-api/manage-db/src/main/resources/db/migration/V10__Insert_Booking_Test_Data.sql create mode 100644 gym-manage-api/manage-db/src/main/resources/db/migration/V11__Insert_Cancel_Booking_Test_Data.sql create mode 100644 gym-manage-api/manage-db/src/main/resources/db/migration/V12__Insert_Time_Conflict_Test_Data.sql diff --git a/gym-manage-api/docs/V10-booking-test-data.md b/gym-manage-api/docs/V10-booking-test-data.md new file mode 100644 index 0000000..16a938b --- /dev/null +++ b/gym-manage-api/docs/V10-booking-test-data.md @@ -0,0 +1,272 @@ +# V10 团课预约业务场景测试数据 + +## 概述 + +本文档描述了 V10 版本新增的团课预约功能测试数据，覆盖了7种典型的预约业务场景，用于验证系统在不同会员卡状态下的正确处理逻辑。 + +**当前日期**: 2026-06-02 + +--- + +## 一、测试场景总览 + +| 场景 | 会员 | 会员卡状态 | 预约课程 | 预期结果 | +|-----|------|----------|---------|---------| +| 1 | 用户A | 无会员卡 | 次数卡团课 | 提示无可用会员卡 | +| 2 | 用户B | 时长卡已过期 | 次数卡团课 | 提示会员卡已过期 | +| 3 | 会员C | 时长卡有效 | 次数卡团课 | 预约成功 | +| 4 | 会员D | 次数卡次数=0 | 次数卡团课 | 提示剩余次数不足 | +| 5 | 会员E | 次数卡次数=5 | 次数卡团课 | 预约成功 | +| 6 | 会员F | 储值卡余额=30元 | 储值卡团课(需50元) | 提示余额不足 | +| 7 | 会员G | 储值卡余额=200元 | 储值卡团课(需50元) | 预约成功 | + +--- + +## 二、测试会员数据 + +### 2.1 会员列表 + +| 会员编号 | 昵称 | 手机号 | 性别 | 创建时间 | +|---------|------|--------|------|---------| +| MEM_TEST_A | 用户A_无卡新用户 | 13800001001 | 男 | 2026-06-02 10:00:00 | +| MEM_TEST_B | 用户B_过期时长卡 | 13800001002 | 男 | 2026-05-01 10:00:00 | +| MEM_TEST_C | 会员C_有效时长卡 | 13800001003 | 女 | 2026-05-01 10:00:00 | +| MEM_TEST_D | 会员D_次数用尽 | 13800001004 | 男 | 2026-05-01 10:00:00 | +| MEM_TEST_E | 会员E_次数充足 | 13800001005 | 女 | 2026-05-01 10:00:00 | +| MEM_TEST_F | 会员F_储值卡余额不足 | 13800001006 | 男 | 2026-05-01 10:00:00 | +| MEM_TEST_G | 会员G_储值卡余额充足 | 13800001007 | 女 | 2026-05-01 10:00:00 | + +### 2.2 会员场景说明 + +#### 场景1: 用户A - 无会员卡新用户 +- **会员编号**: MEM_TEST_A +- **状态**: 2026-06-02 刚注册，尚未购买任何会员卡 +- **测试目标**: 验证无会员卡用户申请团课预约时的错误提示 + +#### 场景2: 用户B - 时长卡已过期 +- **会员编号**: MEM_TEST_B +- **状态**: 持有30天时长卡，于 2026-05-31 23:59:59 到期 +- **测试目标**: 验证会员卡过期后的预约行为 + +#### 场景3: 会员C - 时长卡有效 +- **会员编号**: MEM_TEST_C +- **状态**: 持有30天时长卡，到期时间 2026-07-02 +- **测试目标**: 验证有效期内的时长卡可以正常预约次数卡团课 + +#### 场景4: 会员D - 次数卡耗尽 +- **会员编号**: MEM_TEST_D +- **状态**: 持有10次卡，剩余次数 = 0 +- **测试目标**: 验证次数耗尽后无法预约团课 + +#### 场景5: 会员E - 次数卡充足 +- **会员编号**: MEM_TEST_E +- **状态**: 持有10次卡，剩余次数 = 5 +- **测试目标**: 验证次数充足时正常预约 + +#### 场景6: 会员F - 储值卡余额不足 +- **会员编号**: MEM_TEST_F +- **状态**: 持有储值卡，余额 = 30.00 元 +- **测试目标**: 验证预约储值卡团课（需50元）时提示余额不足 + +#### 场景7: 会员G - 储值卡余额充足 +- **会员编号**: MEM_TEST_G +- **状态**: 持有储值卡，余额 = 200.00 元 +- **测试目标**: 验证余额充足时正常预约储值卡团课 + +--- + +## 三、团课课程数据 + +### 3.1 团课列表 + +| 课程名称 | 教练ID | 课程类型 | 开始时间 | 结束时间 | 最大人数 | 当前人数 | 状态 | 点卡额度 | 储值额度 | +|---------|-------|---------|---------|---------|---------|---------|------|---------|---------| +| 燃脂搏击_次数卡课程 | 102 | 2 | 2026-06-10 19:30:00 | 2026-06-10 20:30:00 | 20 | 0 | 正常 | 1 | 0.00 | +| 高端普拉提_储值卡课程 | 103 | 1 | 2026-06-11 19:00:00 | 2026-06-11 20:00:00 | 15 | 0 | 正常 | 0 | 50.00 | + +### 3.2 课程说明 + +**燃脂搏击_次数卡课程** +- **收费类型**: 次数卡 +- **消耗点数**: 1次 +- **适用会员**: 时长卡、次数卡用户 +- **课程描述**: 高强度间歇训练，配合音乐快速燃脂 + +**高端普拉提_储值卡课程** +- **收费类型**: 储值卡 +- **消耗金额**: 50.00 元 +- **适用会员**: 储值卡用户 +- **课程描述**: 精准训练核心肌群 + +--- + +## 四、会员卡类型数据 + +| 卡名称 | 卡类型 | 价格 | 有效天数 | 总次数 | 面额 | 状态 | +|-------|-------|------|---------|-------|------|------| +| 30天时长卡 | TIME_CARD | 299.00 | 30 | - | - | 上架 | +| 10次卡 | COUNT_CARD | 499.00 | - | 10 | - | 上架 | +| 储值卡500 | STORED_VALUE_CARD | 500.00 | - | - | 500.00 | 上架 | + +--- + +## 五、会员卡记录数据 + +### 5.1 记录列表 + +| 会员编号 | 卡名称 | 状态 | 剩余次数 | 剩余金额 | 过期时间 | 购买时间 | +|---------|-------|------|---------|---------|---------|---------| +| MEM_TEST_B | 30天时长卡 | EXPIRED | 0 | 0.00 | 2026-05-31 | 2026-05-01 | +| MEM_TEST_C | 30天时长卡 | ACTIVE | 0 | 0.00 | 2026-07-02 | 2026-06-02 | +| MEM_TEST_D | 10次卡 | ACTIVE | 0 | 0.00 | 2026-12-31 | 2026-05-01 | +| MEM_TEST_E | 10次卡 | ACTIVE | 5 | 0.00 | 2026-12-31 | 2026-05-01 | +| MEM_TEST_F | 储值卡500 | ACTIVE | 0 | 30.00 | 2027-06-02 | 2026-05-01 | +| MEM_TEST_G | 储值卡500 | ACTIVE | 0 | 200.00 | 2027-06-02 | 2026-05-01 | + +### 5.2 详细说明 + +**用户B - 时长卡已过期** +``` +会员ID: MEM_TEST_B +卡名称: 30天时长卡 +状态: EXPIRED (已过期) +有效期: 2026-05-01 至 2026-05-31 +剩余次数: 0 +剩余金额: 0.00 +``` + +**会员C - 时长卡有效** +``` +会员ID: MEM_TEST_C +卡名称: 30天时长卡 +状态: ACTIVE (有效) +有效期: 2026-06-02 至 2026-07-02 +剩余次数: 0 +剩余金额: 0.00 +``` + +**会员D - 次数卡耗尽** +``` +会员ID: MEM_TEST_D +卡名称: 10次卡 +状态: ACTIVE (有效) +有效期: 2026-05-01 至 2026-12-31 +剩余次数: 0 (已用尽) +剩余金额: 0.00 +``` + +**会员E - 次数卡充足** +``` +会员ID: MEM_TEST_E +卡名称: 10次卡 +状态: ACTIVE (有效) +有效期: 2026-05-01 至 2026-12-31 +剩余次数: 5 +剩余金额: 0.00 +``` + +**会员F - 储值卡余额不足** +``` +会员ID: MEM_TEST_F +卡名称: 储值卡500 +状态: ACTIVE (有效) +有效期: 2026-05-01 至 2027-06-02 +剩余次数: 0 +剩余金额: 30.00 (不足50.00) +``` + +**会员G - 储值卡余额充足** +``` +会员ID: MEM_TEST_G +卡名称: 储值卡500 +状态: ACTIVE (有效) +有效期: 2026-05-01 至 2027-06-02 +剩余次数: 0 +剩余金额: 200.00 (充足) +``` + +--- + +## 六、SQL数据插入顺序 + +```sql +-- 1. 先插入会员用户 (A-G) +INSERT INTO member_user (member_no, nickname, phone, gender, is_deleted, created_at, updated_at) VALUES + ('MEM_TEST_A', '用户A_无卡新用户', '13800001001', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'), + ('MEM_TEST_B', '用户B_过期时长卡', '13800001002', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_C', '会员C_有效时长卡', '13800001003', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_D', '会员D_次数用尽', '13800001004', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_E', '会员E_次数充足', '13800001005', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_F', '会员F_储值卡余额不足', '13800001006', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_G', '会员G_储值卡余额充足', '13800001007', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'); + +-- 2. 插入团课课程 +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES + ('燃脂搏击_次数卡课程', 102, 2, '2026-06-10 19:30:00', '2026-06-10 20:30:00', 20, 0, '0', '综合训练区', '高强度间歇训练，配合音乐快速燃脂，消耗1次', 1, 0.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00'); + +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES + ('高端普拉提_储值卡课程', 103, 1, '2026-06-11 19:00:00', '2026-06-11 20:00:00', 15, 0, '0', '普拉提教室', '精准训练核心肌群，消耗储值50元', 0, 50.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00'); + +-- 3. 插入会员卡类型 +INSERT INTO member_card (member_card_name, member_card_type, member_card_price, member_card_validity_days, member_card_total_times, member_card_amount, member_card_status, extra_config, created_at, updated_at) VALUES + ('30天时长卡', 'TIME_CARD', 299.00, 30, NULL, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'), + ('10次卡', 'COUNT_CARD', 499.00, NULL, 10, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'), + ('储值卡500', 'STORED_VALUE_CARD', 500.00, NULL, NULL, 500.00, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'); + +-- 4. 插入会员卡记录 +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_B'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'EXPIRED', 0, 0.00, '2026-05-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_C'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'ACTIVE', 0, 0.00, '2026-07-02 23:59:59', '2026-06-02 10:00:00', 0, '{}', '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_D'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 0, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_E'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 5, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_F'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 30.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_G'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 200.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); +``` + +--- + +## 七、预期测试结果 + +### 7.1 成功场景 + +| 场景 | 会员 | 操作 | 预期结果 | +|-----|------|-----|---------| +| 3 | 会员C | 预约次数卡团课 | 预约成功，消耗时长卡1次 | +| 5 | 会员E | 预约次数卡团课 | 预约成功，次数减1 (5→4) | +| 7 | 会员G | 预约储值卡团课 | 预约成功，余额减50 (200→150) | + +### 7.2 失败场景 + +| 场景 | 会员 | 操作 | 预期错误码 | 预期提示信息 | +|-----|------|-----|----------|------------| +| 1 | 用户A | 预约次数卡团课 | NO_CARD | 无可用会员卡 | +| 2 | 用户B | 预约次数卡团课 | CARD_EXPIRED | 会员卡已过期 | +| 4 | 会员D | 预约次数卡团课 | INSUFFICIENT_TIMES | 剩余次数不足 | +| 6 | 会员F | 预约储值卡团课 | INSUFFICIENT_BALANCE | 余额不足，当前余额30.00元，需50.00元 | + +--- + +## 八、数据清理 + +测试完成后，可通过以下 SQL 清理测试数据： + +```sql +-- 删除测试会员（会级联删除相关会员卡记录） +DELETE FROM member_user WHERE member_no LIKE 'MEM_TEST_%'; + +-- 删除测试团课 +DELETE FROM group_course WHERE course_name LIKE '%_次数卡课程' OR course_name LIKE '%_储值卡课程'; + +-- 删除测试会员卡类型 +DELETE FROM member_card WHERE member_card_name IN ('30天时长卡', '10次卡', '储值卡500'); +``` diff --git a/gym-manage-api/docs/V11-cancel-booking-test-data.md b/gym-manage-api/docs/V11-cancel-booking-test-data.md new file mode 100644 index 0000000..83fa698 --- /dev/null +++ b/gym-manage-api/docs/V11-cancel-booking-test-data.md @@ -0,0 +1,204 @@ +# V11 团课预约取消测试数据文档 + +## 文档说明 + +本文档描述了用于测试团课预约取消功能的测试数据，包含三种会员卡类型的取消预约场景。 + +## 测试场景概览 + +| 序号 | 场景描述 | 用户 | 会员卡类型 | +| :--- | :--- | :--- | :--- | +| 1 | 使用时长卡预约后取消 | 张三 | 时长卡（30天） | +| 2 | 使用次数卡预约后取消 | 李四 | 次数卡（10次） | +| 3 | 使用储值卡预约后取消 | 王五 | 储值卡（500元） | + +## 测试用户数据 + +### 1. 张三（时长卡用户） + +| 字段 | 值 | +| :--- | :--- | +| 会员编号 | `MEM_TEST_ZHANG` | +| 昵称 | 张三_时长卡用户 | +| 手机号 | 13800002001 | +| 性别 | 男（1） | + +#### 会员卡信息 + +| 字段 | 值 | +| :--- | :--- | +| 卡类型 | 时长卡（TIME_CARD） | +| 卡名称 | 30天时长卡 | +| 状态 | ACTIVE（有效） | +| 到期时间 | 2026-07-02 23:59:59 | +| 购买时间 | 2026-06-02 10:00:00 | + +--- + +### 2. 李四（次数卡用户） + +| 字段 | 值 | +| :--- | :--- | +| 会员编号 | `MEM_TEST_LI` | +| 昵称 | 李四_次数卡用户 | +| 手机号 | 13800002002 | +| 性别 | 男（1） | + +#### 会员卡信息 + +| 字段 | 值 | +| :--- | :--- | +| 卡类型 | 次数卡（COUNT_CARD） | +| 卡名称 | 10次卡 | +| 状态 | ACTIVE（有效） | +| 剩余次数 | 5次 | +| 到期时间 | 2026-12-31 23:59:59 | + +--- + +### 3. 王五（储值卡用户） + +| 字段 | 值 | +| :--- | :--- | +| 会员编号 | `MEM_TEST_WANG` | +| 昵称 | 王五_储值卡用户 | +| 手机号 | 13800002003 | +| 性别 | 女（2） | + +#### 会员卡信息 + +| 字段 | 值 | +| :--- | :--- | +| 卡类型 | 储值卡（STORED_VALUE_CARD） | +| 卡名称 | 储值卡500 | +| 状态 | ACTIVE（有效） | +| 剩余金额 | 200.00元 | +| 到期时间 | 2027-06-02 23:59:59 | + +--- + +## 测试课程数据 + +### 晚间瑜伽_取消测试 + +| 字段 | 值 | +| :--- | :--- | +| 课程名称 | 晚间瑜伽_取消测试 | +| 教练ID | 101 | +| 课程类型 | 1 | +| 开始时间 | 2026-06-15 19:00:00 | +| 结束时间 | 2026-06-15 20:00:00 | +| 上课地点 | 瑜伽教室 | +| 最大人数 | 20人 | +| 当前人数 | 3人（三位测试用户） | +| 状态 | 0（正常） | +| 次数消耗 | 1次 | +| 储值消耗 | 30.00元 | + +--- + +## 预约记录数据 + +### 预约状态说明 + +| 状态码 | 含义 | +| :--- | :--- | +| `0` | 已预约（等待取消） | +| `1` | 已取消 | +| `2` | 已出席 | +| `3` | 缺席 | + +### 预约记录详情 + +| 用户 | 预约时间 | 状态 | 课程名称 | +| :--- | :--- | :--- | :--- | +| 张三 | 2026-06-02 11:00:00 | 0（已预约） | 晚间瑜伽_取消测试 | +| 李四 | 2026-06-02 11:30:00 | 0（已预约） | 晚间瑜伽_取消测试 | +| 王五 | 2026-06-02 12:00:00 | 0（已预约） | 晚间瑜伽_取消测试 | + +--- + +## 测试用例设计 + +### 场景1：时长卡用户取消预约 + +**前置条件：** +- 张三持有有效时长卡 +- 张三已成功预约课程 +- 当前时间 < 课程开始时间 + +**测试步骤：** +1. 调用取消预约接口，传入张三的预约记录ID +2. 验证预约状态变为 `1`（已取消） +3. 验证课程当前人数减1 +4. 验证时长卡状态保持不变（时长卡取消预约不影响卡状态） + +**预期结果：** +- 预约记录状态更新为已取消 +- 课程剩余名额增加1 +- 时长卡有效期不受影响 + +--- + +### 场景2：次数卡用户取消预约 + +**前置条件：** +- 李四持有次数卡，剩余5次 +- 李四已成功预约课程（已扣除1次） +- 当前时间 < 课程开始时间 + +**测试步骤：** +1. 调用取消预约接口，传入李四的预约记录ID +2. 验证预约状态变为 `1`（已取消） +3. 验证课程当前人数减1 +4. 验证次数卡剩余次数恢复为5次（返还1次） + +**预期结果：** +- 预约记录状态更新为已取消 +- 课程剩余名额增加1 +- 次数卡返还1次，剩余次数恢复为5次 + +--- + +### 场景3：储值卡用户取消预约 + +**前置条件：** +- 王五持有储值卡，余额200元 +- 王五已成功预约课程（已扣除30元） +- 当前时间 < 课程开始时间 + +**测试步骤：** +1. 调用取消预约接口，传入王五的预约记录ID +2. 验证预约状态变为 `1`（已取消） +3. 验证课程当前人数减1 +4. 验证储值卡余额恢复为200元（返还30元） + +**预期结果：** +- 预约记录状态更新为已取消 +- 课程剩余名额增加1 +- 储值卡返还30元，余额恢复为200元 + +--- + +## 数据文件位置 + +``` +manage-db/src/main/resources/db/migration/V11__Insert_Cancel_Booking_Test_Data.sql +``` + +## 数据依赖 + +| 依赖文件 | 说明 | +| :--- | :--- | +| `V6__Create_GroupCourse_table.sql` | 团课相关表结构 | +| `V8__Create_Member_And_MemberCard.sql` | 会员和会员卡表结构 | +| `V9__Add_GroupCourse_Booking_Snapshot_Fields.sql` | 预约快照字段 | + +--- + +## 注意事项 + +1. 测试数据中使用的日期均为未来日期，确保测试时课程尚未开始 +2. 会员卡状态均为 ACTIVE，确保可以正常预约 +3. 取消预约功能应在课程开始前24小时内允许操作（具体时间限制由业务逻辑决定） +4. 取消预约后应记录操作日志和交易流水 diff --git a/gym-manage-api/docs/booking-test-scenarios.md b/gym-manage-api/docs/booking-test-scenarios.md new file mode 100644 index 0000000..cb7a087 --- /dev/null +++ b/gym-manage-api/docs/booking-test-scenarios.md @@ -0,0 +1,400 @@ +# 团课预约场景测试数据文档 + +## 概述 + +本文档描述了团课预约功能的测试数据，覆盖了各种预约场景，用于验证系统在不同业务条件下的正确性和健壮性。 + +--- + +## 一、测试数据概览 + +| 数据类别 | 数量 | 说明 | +|---------|------|------| +| 测试会员 | 5个 | 覆盖不同会员卡状态 | +| 会员卡类型 | 8种 | 次卡/时长卡/储值卡 | +| 会员卡记录 | 5条 | 会员持有的实际卡 | +| 团课预约记录 | 4条 | 不同状态的预约 | +| 交易流水 | 27条 | 完整的消费记录 | + +--- + +## 二、会员测试数据 + +### 2.1 会员列表 + +| 会员ID | 会员编号 | 昵称 | 手机号 | 性别 | 会员卡状态 | +|--------|---------|------|--------|------|-----------| +| 1001 | MEM202606001 | 新用户小张 | 13800138001 | 男 | 无会员卡 | +| 1002 | MEM202606002 | 额度耗尽用户 | 13800138002 | 女 | 次卡已用完 | +| 1003 | MEM202606003 | 额度充足用户 | 13800138003 | 男 | 次卡剩余8次 | +| 1004 | MEM202606004 | 过期卡用户 | 13800138004 | 女 | 月卡已过期 | +| 1005 | MEM202606005 | 多卡用户小李 | 13800138005 | 男 | 次卡+储值卡 | + +### 2.2 会员详情 + +**会员1001 - 新用户小张** +- 状态：新注册用户，尚未购买任何会员卡 +- 用途：测试无会员卡情况下的预约行为 + +**会员1002 - 额度耗尽用户** +- 状态：持有10次团课卡，已全部用完 +- 用途：测试会员卡额度耗尽时的预约行为 + +**会员1003 - 额度充足用户** +- 状态：持有20次团课卡，剩余8次 +- 用途：测试正常预约流程 + +**会员1004 - 过期卡用户** +- 状态：持有月卡，已于2026-05-31过期 +- 用途：测试过期会员卡的预约行为 + +**会员1005 - 多卡用户小李** +- 状态：持有50次团课卡(剩余45次) + 500元储值卡(剩余350元) +- 用途：测试多会员卡用户选择支付方式的场景 + +--- + +## 三、会员卡类型数据 + +### 3.1 次卡类型 + +| 卡类型ID | 卡名称 | 类型 | 价格 | 有效天数 | 总次数 | 状态 | +|---------|-------|------|------|---------|-------|------| +| 101 | 10次团课卡 | COUNT_CARD | 299.00 | 90 | 10 | 上架 | +| 102 | 20次团课卡 | COUNT_CARD | 499.00 | 180 | 20 | 上架 | +| 103 | 50次团课卡 | COUNT_CARD | 999.00 | 365 | 50 | 上架 | + +### 3.2 时长卡类型 + +| 卡类型ID | 卡名称 | 类型 | 价格 | 有效天数 | 状态 | +|---------|-------|------|------|---------|------| +| 201 | 月卡 | TIME_CARD | 399.00 | 30 | 上架 | +| 202 | 季卡 | TIME_CARD | 899.00 | 90 | 上架 | +| 203 | 年卡 | TIME_CARD | 2999.00 | 365 | 上架 | + +### 3.3 储值卡类型 + +| 卡类型ID | 卡名称 | 类型 | 价格 | 面额 | 有效天数 | 状态 | +|---------|-------|------|------|------|---------|------| +| 301 | 500元储值卡 | STORED_VALUE_CARD | 500.00 | 500.00 | 365 | 上架 | +| 302 | 1000元储值卡 | STORED_VALUE_CARD | 1000.00 | 1000.00 | 365 | 上架 | + +--- + +## 四、会员卡记录数据（会员持有的卡） + +| 记录ID | 会员ID | 卡类型ID | 状态 | 剩余次数 | 剩余金额 | 到期时间 | 购买时间 | +|-------|--------|---------|------|---------|---------|---------|---------| +| 2001 | 1002 | 101 | USED_UP | 0 | 0.00 | 2026-09-01 | 2026-06-01 | +| 2002 | 1003 | 102 | ACTIVE | 8 | 0.00 | 2026-12-01 | 2026-06-01 | +| 2003 | 1004 | 201 | EXPIRED | 0 | 0.00 | 2026-05-31 | 2026-05-01 | +| 2004 | 1005 | 103 | ACTIVE | 45 | 0.00 | 2027-06-01 | 2026-06-01 | +| 2005 | 1005 | 301 | ACTIVE | 0 | 350.00 | 2027-06-01 | 2026-05-15 | + +--- + +## 五、团课预约记录数据 + +| 预约ID | 课程ID | 会员ID | 会员卡记录ID | 预约时间 | 状态 | 课程名称 | +|-------|-------|--------|-------------|---------|------|---------| +| 3001 | 1 | 1003 | 2002 | 2026-06-01 15:30 | 已预约(0) | 极速燃脂单车 | +| 3002 | 2 | 1003 | 2002 | 2026-06-01 10:00 | 已取消(1) | 清晨流瑜伽 | +| 3003 | 6 | 1003 | 2002 | 2026-05-28 19:00 | 已出席(2) | 蜜桃臀塑造 | +| 3004 | 7 | 1002 | 2001 | 2026-05-30 10:00 | 缺席(3) | 午间冥想放松 | + +### 状态说明 + +| 状态码 | 状态名称 | 说明 | +|-------|---------|------| +| 0 | 已预约 | 用户已成功预约，等待上课 | +| 1 | 已取消 | 用户主动取消预约 | +| 2 | 已出席 | 用户已按时参加课程 | +| 3 | 缺席 | 用户预约后未出席 | + +--- + +## 六、测试场景详解 + +### 场景1：新注册用户无会员卡预约 + +**测试目标**：验证系统对无会员卡用户的预约拦截 + +**测试数据**： +- 用户ID：1001（新用户小张） +- 目标课程：任意课程 + +**预期结果**： +- 返回错误信息："未绑定会员卡，请先购买会员卡" +- HTTP状态码：400 Bad Request + +--- + +### 场景2：会员卡额度耗尽预约 + +**测试目标**：验证系统对额度耗尽会员卡的预约拦截 + +**测试数据**： +- 用户ID：1002（额度耗尽用户） +- 会员卡记录ID：2001 +- 剩余次数：0 + +**预期结果**： +- 返回错误信息："会员卡余额不足" +- HTTP状态码：400 Bad Request + +--- + +### 场景3：会员卡额度充足预约 + +**测试目标**：验证正常预约流程 + +**测试数据**： +- 用户ID：1003（额度充足用户） +- 会员卡记录ID：2002 +- 剩余次数：8 +- 目标课程：课程ID=1（极速燃脂单车） + +**预期结果**： +- 预约成功 +- 会员卡剩余次数减1（变为7次） +- 生成预约记录 +- HTTP状态码：200 OK + +--- + +### 场景4：会员卡已过期预约 + +**测试目标**：验证系统对过期会员卡的预约拦截 + +**测试数据**： +- 用户ID：1004（过期卡用户） +- 会员卡记录ID：2003 +- 状态：EXPIRED +- 到期时间：2026-05-31 + +**预期结果**： +- 返回错误信息："会员卡已过期" +- HTTP状态码：400 Bad Request + +--- + +### 场景5：课程已满员预约--------------- + +**测试目标**：验证系统对满员课程的预约拦截 + +**测试数据**： +- 课程ID：3（燃脂搏击） +- 当前人数：20/20 + +**预期结果**： +- 返回错误信息："课程已满员" +- HTTP状态码：400 Bad Request + +--- + +### 场景6：课程已取消预约 + +**测试目标**：验证系统对已取消课程的预约拦截 + +**测试数据**： +- 课程ID：5（周末冥想修复） +- 状态：1（已取消） + +**预期结果**： +- 返回错误信息："课程已取消" +- HTTP状态码：400 Bad Request + +--- + +### 场景7：课程已结束预约 + +**测试目标**：验证系统对已结束课程的预约拦截 + +**测试数据**： +- 课程ID：6（蜜桃臀塑造）或 7（午间冥想放松） +- 状态：2（已结束） + +**预期结果**： +- 返回错误信息："课程已结束" +- HTTP状态码：400 Bad Request + +--- + +### 场景8：超出预约时间预约 + +**测试目标**：验证系统对预约时间窗口的控制 + +**测试数据**： +- 课程ID：4（哈他瑜伽） +- 开始时间：2026-06-01 15:20:00 +- 测试时间：课程开始前30分钟内 + +**预期结果**： +- 返回错误信息："已过预约时间" +- HTTP状态码：400 Bad Request + +--- + +### 场景9：重复预约同一课程 + +**测试目标**：验证系统对重复预约的拦截 + +**测试数据**： +- 用户ID：1003（额度充足用户） +- 课程ID：1（极速燃脂单车） +- 已有预约记录：booking_id=3001 + +**预期结果**： +- 返回错误信息："已预约该课程" +- HTTP状态码：400 Bad Request + +--- + +### 场景10：多会员卡用户选择支付方式 + +**测试目标**：验证多卡用户的支付方式选择功能 + +**测试数据**： +- 用户ID：1005（多卡用户小李） +- 可用卡1：次卡（记录ID=2004，剩余45次） +- 可用卡2：储值卡（记录ID=2005，剩余350元） + +**预期结果**： +- 系统列出用户所有可用会员卡 +- 用户可选择使用次卡或储值卡支付 +- 根据选择的卡类型扣减相应额度 + +--- + +## 七、交易流水说明 + +### 7.1 会员1002（额度耗尽用户）消费记录 + +| 操作顺序 | 操作类型 | 变动次数 | 剩余次数 | 备注 | +|---------|---------|---------|---------|------| +| 1 | PURCHASE | +10 | 10 | 购买10次团课卡 | +| 2-11 | DEDUCT | -1×10 | 0 | 10次课程消费 | + +### 7.2 会员1003（额度充足用户）消费记录 + +| 操作顺序 | 操作类型 | 变动次数 | 剩余次数 | 备注 | +|---------|---------|---------|---------|------| +| 1 | PURCHASE | +20 | 20 | 购买20次团课卡 | +| 2-12 | DEDUCT | -12 | 8 | 12次课程消费 | + +### 7.3 会员1005（多卡用户）消费记录 + +| 会员卡记录ID | 操作类型 | 变动次数 | 变动金额 | 备注 | +|-------------|---------|---------|---------|------| +| 2004 | PURCHASE | +50 | 0 | 购买50次团课卡 | +| 2004 | DEDUCT | -5 | 0 | 预约5节课程 | +| 2005 | PURCHASE | 0 | +500 | 购买500元储值卡 | +| 2005 | DEDUCT | 0 | -150 | 私教课消费150元 | + +--- + +## 八、API测试示例 + +### 8.1 预约接口 + +```http +POST /api/group-course/bookings +Content-Type: application/json + +{ + "courseId": 1, + "memberCardRecordId": 2002 +} +``` + +### 8.2 取消预约接口 + +```http +PUT /api/group-course/bookings/{bookingId}/cancel +Content-Type: application/json + +{ + "reason": "临时有事无法参加" +} +``` + +### 8.3 查询用户预约列表 + +```http +GET /api/group-course/bookings?memberId=1003 +``` + +--- + +## 九、测试数据对应关系图 + +``` +会员表 (member_user) + │ + ├── 1001 ──→ (无会员卡) + ├── 1002 ──→ 会员卡记录 2001 (USED_UP) + ├── 1003 ──→ 会员卡记录 2002 (ACTIVE, 8次) + ├── 1004 ──→ 会员卡记录 2003 (EXPIRED) + └── 1005 ──→ 会员卡记录 2004 (ACTIVE, 45次) + └── 会员卡记录 2005 (ACTIVE, 350元) + │ + ↓ + 预约记录表 (group_course_booking) + │ + ├── 3001: 已预约 + ├── 3002: 已取消 + ├── 3003: 已出席 + └── 3004: 缺席 +``` + +--- + +## 十、数据初始化 + +测试数据通过 Flyway 迁移脚本 `V10__Insert_Booking_Test_Data.sql` 初始化，需在数据库初始化时执行。 + +**执行顺序**： +1. V1__Create_all_tables.sql - 创建基础表结构 +2. V2__Insert_initial_data.sql - 插入初始数据 +3. V6__Create_GroupCourse_table.sql - 创建团课表 +4. V7__Insert_GroupCourse_test_data.sql - 插入团课测试数据 +5. V8__Create_Member_And_MemberCard.sql - 创建会员和会员卡表 +6. V9__Add_GroupCourse_Booking_Snapshot_Fields.sql - 添加冗余字段 +7. V10__Insert_Booking_Test_Data.sql - 插入预约测试数据（本文件） + +--- + +**文档版本**: v1.1 +**创建时间**: 2026-06-02 +**更新时间**: 2026-06-02 +**适用场景**: 团课预约功能测试 + +--- + +## 十一、重要说明 + +### 11.1 字段说明 + +`member_card_record` 表包含两个ID字段： +- `id` - 数据库主键（BIGSERIAL PRIMARY KEY） +- `member_card_record_id` - 业务ID（BIGSERIAL），代码中使用此字段作为查询和更新条件 + +### 11.2 测试数据修复记录 + +**v1.1 修复内容**： +- 修复了 `member_card_record` 表测试数据缺失 `member_card_record_id` 字段的问题 +- 原问题：测试数据只插入了 `id` 字段，导致 `member_card_record_id` 为 NULL +- 影响：代码使用 `member_card_record_id` 作为WHERE条件时无法匹配到记录，导致扣减权益失败 +- 解决：在INSERT语句中添加 `member_card_record_id` 字段，值与 `id` 相同 + +**修复前**： +```sql +INSERT INTO member_card_record (id, member_id, member_card_id, ...) VALUES +(2001, 1002, 101, ...); +``` + +**修复后**： +```sql +INSERT INTO member_card_record (id, member_card_record_id, member_id, member_card_id, ...) VALUES +(2001, 2001, 1002, 101, ...); +``` diff --git a/gym-manage-api/docs/groupcourse-api.md b/gym-manage-api/docs/groupcourse-api.md new file mode 100644 index 0000000..17509e4 --- /dev/null +++ b/gym-manage-api/docs/groupcourse-api.md @@ -0,0 +1,728 @@ +# 团课管理模块 API 文档 + +> **文档版本**: v1.0 +> **创建日期**: 2026-06-02 +> **作者**: 张翔 +> **状态**: 正式发布 + +--- + +## 📋 目录 + +1. [概述](#概述) +2. [基础路径](#基础路径) +3. [团课管理接口](#团课管理接口) + - [获取所有团课](#获取所有团课) + - [分页获取团课](#分页获取团课) + - [根据ID获取团课详情](#根据ID获取团课详情) + - [创建团课](#创建团课) + - [更新团课](#更新团课) + - [取消团课](#取消团课) + - [团课签到](#团课签到) + - [删除团课](#删除团课) +4. [团课预约接口](#团课预约接口) + - [预约团课](#预约团课) + - [取消预约](#取消预约) + - [查询会员预约记录](#查询会员预约记录) + - [查询预约详情](#查询预约详情) + - [查询课程预约记录](#查询课程预约记录) +5. [数据模型](#数据模型) + - [GroupCourse（团课）](#GroupCourse团课) + - [GroupCourseBooking（团课预约）](#GroupCourseBooking团课预约) +6. [状态码说明](#状态码说明) +7. [业务规则](#业务规则) + +--- + +## 概述 + +团课管理模块提供团课的创建、编辑、查询、取消和签到功能，以及团课预约相关操作。采用 Spring WebFlux 响应式编程，支持高并发场景。 + +## 基础路径 + +所有接口的基础路径为: `http://{host}:{port}/api/groupCourse` + +--- + +## 团课管理接口 + +### 获取所有团课 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | GET | +| **接口路径** | `/api/groupCourse/list` | +| **所属文件** | `GroupCourseHandler.java` | + +**请求参数**: + +| 参数名 | 类型 | 必填 | 默认值 | 说明 | +|--------|------|------|--------|------| +| includeDeleted | boolean | 否 | false | 是否包含已删除的团课 | + +**成功响应** (200 OK): + +```json +[ + { + "id": 1, + "courseName": "瑜伽入门", + "coachId": 1, + "courseType": 1, + "startTime": "2026-06-02T09:00:00", + "endTime": "2026-06-02T10:00:00", + "maxMembers": 20, + "currentMembers": 15, + "status": 0, + "location": "健身房A区", + "coverImage": "https://example.com/yoga.jpg", + "description": "适合初学者的瑜伽课程", + "createdAt": "2026-06-01T10:00:00", + "updatedAt": "2026-06-01T10:00:00" + } +] +``` + +--- + +### 分页获取团课 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | POST | +| **接口路径** | `/api/groupCourse/page` | +| **所属文件** | `GroupCourseHandler.java` | + +**请求体**: + +```json +{ + "page": 0, + "size": 10, + "sort": "id", + "order": "asc", + "keyword": "瑜伽" +} +``` + +| 参数名 | 类型 | 必填 | 默认值 | 说明 | +|--------|------|------|--------|------| +| page | int | 否 | 0 | 页码，从0开始 | +| size | int | 否 | 10 | 每页数量，最大100 | +| sort | string | 否 | id | 排序字段 | +| order | string | 否 | asc | 排序方式（asc/desc） | +| keyword | string | 否 | - | 搜索关键词 | + +**请求参数**: + +| 参数名 | 类型 | 必填 | 默认值 | 说明 | +|--------|------|------|--------|------| +| includeDeleted | boolean | 否 | false | 是否包含已删除的团课 | + +**成功响应** (200 OK): + +```json +{ + "data": [...], + "totalPages": 5, + "totalElements": 45, + "page": 0, + "size": 10 +} +``` + +--- + +### 根据ID获取团课详情 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | GET | +| **接口路径** | `/api/groupCourse/{id}` | +| **所属文件** | `GroupCourseHandler.java` | + +**路径参数**: + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| id | Long | 是 | 团课ID | + +**成功响应** (200 OK): + +```json +{ + "id": 1, + "courseName": "瑜伽入门", + "coachId": 1, + "courseType": 1, + "startTime": "2026-06-02T09:00:00", + "endTime": "2026-06-02T10:00:00", + "maxMembers": 20, + "currentMembers": 15, + "status": 0, + "location": "健身房A区", + "coverImage": "https://example.com/yoga.jpg", + "description": "适合初学者的瑜伽课程", + "pointCardAmount": 1, + "storedValueAmount": 50.00, + "createdAt": "2026-06-01T10:00:00", + "updatedAt": "2026-06-01T10:00:00" +} +``` + +**失败响应** (404 Not Found): + +```json +{} +``` + +--- + +### 创建团课 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | POST | +| **接口路径** | `/api/groupCourse` | +| **所属文件** | `GroupCourseHandler.java` | + +**请求体**: + +```json +{ + "courseName": "动感单车", + "coachId": 2, + "courseType": 2, + "startTime": "2026-06-05T18:00:00", + "endTime": "2026-06-05T19:00:00", + "maxMembers": 25, + "location": "健身房B区", + "coverImage": "https://example.com/spinning.jpg", + "description": "高强度有氧运动课程", + "pointCardAmount": 1, + "storedValueAmount": 50.00 +} +``` + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| courseName | String | **是** | 课程名称 | +| coachId | Long | 否 | 教练ID | +| courseType | Long | 否 | 课程类型 | +| startTime | LocalDateTime | 否 | 开始时间 | +| endTime | LocalDateTime | 否 | 结束时间 | +| maxMembers | Integer | 否 | 最大参与人数，默认20 | +| location | String | 否 | 上课地点 | +| coverImage | String | 否 | 封面图URL | +| description | String | 否 | 课程描述 | +| pointCardAmount | Integer | 否 | 点卡额度（消耗次数），默认1 | +| storedValueAmount | BigDecimal | 否 | 储值卡额度（消耗金额），默认0 | + +**成功响应** (200 OK): + +```json +{ + "success": true, + "message": "团课创建成功", + "data": { + "id": 2, + "courseName": "动感单车", + "coachId": 2, + "courseType": 2, + "startTime": "2026-06-05T18:00:00", + "endTime": "2026-06-05T19:00:00", + "maxMembers": 25, + "currentMembers": 0, + "status": 0, + "location": "健身房B区", + "coverImage": "https://example.com/spinning.jpg", + "description": "高强度有氧运动课程", + "pointCardAmount": 1, + "storedValueAmount": 50.00 + } +} +``` + +**失败响应** (400 Bad Request): + +```json +{ + "success": false, + "message": "课程名称不能为空" +} +``` + +--- + +### 更新团课 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | PUT | +| **接口路径** | `/api/groupCourse/{id}` | +| **所属文件** | `GroupCourseHandler.java` | + +**路径参数**: + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| id | Long | 是 | 团课ID | + +**请求体**: + +```json +{ + "courseName": "动感单车升级版", + "coachId": 2, + "maxMembers": 30, + "description": "升级版高强度有氧运动课程", + "pointCardAmount": 2, + "storedValueAmount": 80.00 +} +``` + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| courseName | String | 否 | 课程名称 | +| coachId | Long | 否 | 教练ID | +| courseType | Long | 否 | 课程类型 | +| startTime | LocalDateTime | 否 | 开始时间 | +| endTime | LocalDateTime | 否 | 结束时间 | +| maxMembers | Integer | 否 | 最大参与人数 | +| location | String | 否 | 上课地点 | +| coverImage | String | 否 | 封面图URL | +| description | String | 否 | 课程描述 | +| pointCardAmount | Integer | 否 | 点卡额度（消耗次数） | +| storedValueAmount | BigDecimal | 否 | 储值卡额度（消耗金额） | + +**成功响应** (200 OK): + +```json +{ + "success": true, + "message": "团课更新成功", + "data": { + "id": 2, + "courseName": "动感单车升级版", + "coachId": 2, + "maxMembers": 30, + "description": "升级版高强度有氧运动课程", + "pointCardAmount": 2, + "storedValueAmount": 80.00 + } +} +``` + +**失败响应** (400 Bad Request): + +```json +{ + "success": false, + "message": "团课不存在" +} +``` + +--- + +### 取消团课 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | POST | +| **接口路径** | `/api/groupCourse/{id}/cancel` | +| **所属文件** | `GroupCourseHandler.java` | + +**路径参数**: + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| id | Long | 是 | 团课ID | + +**成功响应** (200 OK): + +```json +{ + "success": true, + "message": "团课取消成功", + "data": { + "id": 2, + "status": 1 + } +} +``` + +**失败响应** (400 Bad Request): + +```json +{ + "success": false, + "message": "课程取消需提前24小时" +} +``` + +--- + +### 团课签到 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | POST | +| **接口路径** | `/api/groupCourse/{courseId}/signin` | +| **所属文件** | `GroupCourseHandler.java` | + +**路径参数**: + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| courseId | Long | 是 | 团课ID | + +**请求体**: + +```json +{ + "memberId": 1001 +} +``` + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| memberId | Long | **是** | 会员ID | + +**成功响应** (200 OK): + +```json +{ + "success": true, + "message": "签到成功", + "data": { + "id": 2, + "currentMembers": 16 + } +} +``` + +**失败响应** (400 Bad Request): + +```json +{ + "success": false, + "message": "课程已满员" +} +``` + +--- + +### 删除团课 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | DELETE | +| **接口路径** | `/api/groupCourse/{id}` | +| **所属文件** | `GroupCourseHandler.java` | + +**路径参数**: + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| id | Long | 是 | 团课ID | + +**成功响应** (200 OK): + +```json +{ + "success": true, + "message": "团课删除成功" +} +``` + +--- + +## 团课预约接口 + +### 预约团课 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | POST | +| **接口路径** | `/api/groupCourse/book` | +| **所属文件** | `GroupCourseBookingHandler.java` | + +**请求体**: + +```json +{ + "courseId": 1, + "memberId": 1001, + "memberCardRecordId": 5001 +} +``` + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| courseId | Long | **是** | 团课ID | +| memberId | Long | **是** | 会员ID | +| memberCardRecordId | Long | **是** | 会员卡记录ID | + +**成功响应** (200 OK): + +```json +{ + "success": true, + "message": "预约成功", + "data": { + "id": 100, + "courseId": 1, + "memberId": 1001, + "memberCardRecordId": 5001, + "bookingTime": "2026-06-02T08:00:00", + "status": "0" + } +} +``` + +--- + +### 取消预约 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | POST | +| **接口路径** | `/api/groupCourse/booking/{bookingId}/cancel` | +| **所属文件** | `GroupCourseBookingHandler.java` | + +**路径参数**: + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| bookingId | Long | 是 | 预约ID | + +**请求体**: + +```json +{ + "memberId": 1001 +} +``` + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| memberId | Long | **是** | 会员ID | + +**成功响应** (200 OK): + +```json +{ + "success": true, + "message": "取消成功", + "data": { + "id": 100, + "status": "1", + "cancelTime": "2026-06-02T09:00:00" + } +} +``` + +--- + +### 查询会员预约记录 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | GET | +| **接口路径** | `/api/groupCourse/bookings/member/{memberId}` | +| **所属文件** | `GroupCourseBookingHandler.java` | + +**路径参数**: + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| memberId | Long | 是 | 会员ID | + +**成功响应** (200 OK): + +```json +[ + { + "id": 100, + "courseId": 1, + "courseName": "瑜伽入门", + "memberId": 1001, + "memberCardRecordId": 5001, + "bookingTime": "2026-06-02T08:00:00", + "status": "0", + "courseStartTime": "2026-06-02T09:00:00", + "location": "健身房A区" + } +] +``` + +--- + +### 查询预约详情 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | GET | +| **接口路径** | `/api/groupCourse/bookings/{bookingId}` | +| **所属文件** | `GroupCourseBookingHandler.java` | + +**路径参数**: + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| bookingId | Long | 是 | 预约ID | + +**成功响应** (200 OK): + +```json +{ + "id": 100, + "courseId": 1, + "courseName": "瑜伽入门", + "memberId": 1001, + "memberCardRecordId": 5001, + "bookingTime": "2026-06-02T08:00:00", + "status": "0", + "courseStartTime": "2026-06-02T09:00:00", + "courseEndTime": "2026-06-02T10:00:00", + "location": "健身房A区" +} +``` + +**失败响应** (404 Not Found): + +```json +{} +``` + +--- + +### 查询课程预约记录 + +| 属性 | 值 | +|------|-----| +| **HTTP方法** | GET | +| **接口路径** | `/api/groupCourse/bookings/course/{courseId}` | +| **所属文件** | `GroupCourseBookingHandler.java` | + +**路径参数**: + +| 参数名 | 类型 | 必填 | 说明 | +|--------|------|------|------| +| courseId | Long | 是 | 团课ID | + +**成功响应** (200 OK): + +```json +[ + { + "id": 100, + "courseId": 1, + "courseName": "瑜伽入门", + "memberId": 1001, + "bookingTime": "2026-06-02T08:00:00", + "status": "0" + } +] +``` + +--- + +## 数据模型 + +### GroupCourse（团课） + +| 字段名 | 类型 | 说明 | +|--------|------|------| +| id | Long | 主键ID | +| courseName | String | 课程名称 | +| coachId | Long | 教练ID | +| courseType | Long | 课程类型 | +| startTime | LocalDateTime | 开始时间 | +| endTime | LocalDateTime | 结束时间 | +| maxMembers | Integer | 最大参与人数 | +| currentMembers | Integer | 当前参与人数 | +| status | Long | 状态（0-正常，1-已取消，2-已结束） | +| location | String | 上课地点 | +| coverImage | String | 封面图URL | +| description | String | 课程描述 | +| pointCardAmount | Integer | 点卡额度（消耗次数），默认1 | +| storedValueAmount | BigDecimal | 储值卡额度（消耗金额），默认0 | +| createdBy | String | 创建人 | +| updatedBy | String | 更新人 | +| createdAt | LocalDateTime | 创建时间 | +| updatedAt | LocalDateTime | 更新时间 | +| deletedAt | LocalDateTime | 删除时间（软删除） | + +### GroupCourseBooking（团课预约） + +| 字段名 | 类型 | 说明 | +|--------|------|------| +| id | Long | 主键ID | +| courseId | Long | 团课ID | +| courseName | String | 团课名称 | +| memberId | Long | 会员ID | +| memberCardRecordId | Long | 会员卡记录ID | +| bookingTime | LocalDateTime | 预约时间 | +| status | String | 状态（0-已预约，1-已取消，2-已出席，3-缺席） | +| cancelTime | LocalDateTime | 取消时间 | +| courseStartTime | LocalDateTime | 课程开始时间 | +| courseEndTime | LocalDateTime | 课程结束时间 | +| location | String | 上课地点 | +| createdBy | String | 创建人 | +| updatedBy | String | 更新人 | +| createdAt | LocalDateTime | 创建时间 | +| updatedAt | LocalDateTime | 更新时间 | +| deletedAt | LocalDateTime | 删除时间（软删除） | + +--- + +## 状态码说明 + +### 团课状态 + +| 状态码 | 含义 | +|--------|------| +| 0 | 正常 | +| 1 | 已取消 | +| 2 | 已结束 | + +### 预约状态 + +| 状态码 | 含义 | +|--------|------| +| 0 | 已预约 | +| 1 | 已取消 | +| 2 | 已出席 | +| 3 | 缺席 | + +--- + +## 业务规则 + +### 团课管理 +1. **创建团课**：课程名称为必填项 +2. **取消团课**：需提前24小时通知，否则拒绝操作 +3. **团课签到**：验证课程状态必须为正常，且未达最大人数限制 +4. **删除团课**：采用软删除机制，数据保留可恢复 + +### 团课预约 +1. **预约团课**：需验证会员卡有效性和课程名额 +2. **取消预约**：需在课程开始前至少2小时取消 + +--- + +## 附录：错误响应格式 + +所有接口的错误响应统一格式： + +```json +{ + "success": false, + "message": "错误描述信息" +} +``` + +--- + +*文档结束* \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/pom.xml b/gym-manage-api/gym-groupCourse/pom.xml index a7bfc02..2b8ae6b 100644 --- a/gym-manage-api/gym-groupCourse/pom.xml +++ b/gym-manage-api/gym-groupCourse/pom.xml @@ -74,6 +74,13 @@ org.springframework.boot spring-boot-starter-data-redis + + + + cn.novalon.gym.manage + gym-member + ${project.version} + diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java index f61f0c9..766c617 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseBookingDao.java @@ -52,12 +52,60 @@ public interface GroupCourseBookingDao extends R2dbcRepository findByCourseIdAndMemberIdAndStatusAndDeletedAtIsNull(Long courseId, Long memberId, String status); /** - * 根据会员卡ID查询预约记录 + * 根据会员卡记录ID查询预约记录 */ - Flux findByMemberCardIdAndDeletedAtIsNull(Long memberCardId); + Flux findByMemberCardRecordIdAndDeletedAtIsNull(Long memberCardRecordId); /** * 统计团课已预约人数 */ Mono countByCourseIdAndStatusAndDeletedAtIsNull(Long courseId, String status); + + /** + * 查询会员是否有时间冲突的预约（状态为已预约且未取消） + * 时间冲突条件：新课程的开始时间 < 已预约课程的结束时间 且 新课程的结束时间 > 已预约课程的开始时间 + */ + @org.springframework.data.r2dbc.repository.Query("SELECT * FROM group_course_booking b " + + "JOIN group_course c ON b.course_id = c.id " + + "WHERE b.member_id = :memberId " + + "AND b.status = '0' " + + "AND b.deleted_at IS NULL " + + "AND c.deleted_at IS NULL " + + "AND :newStartTime < c.end_time " + + "AND :newEndTime > c.start_time") + Flux findConflictingBookings(Long memberId, java.time.LocalDateTime newStartTime, java.time.LocalDateTime newEndTime); + + /** + * 更新预约状态 + */ + @org.springframework.data.r2dbc.repository.Modifying + @org.springframework.data.r2dbc.repository.Query("UPDATE group_course_booking SET status = :status, cancel_time = :cancelTime, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL") + Mono updateStatus(Long id, String status, java.time.LocalDateTime cancelTime, java.time.LocalDateTime updatedAt); + + /** + * 软删除预约记录 + */ + @org.springframework.data.r2dbc.repository.Modifying + @org.springframework.data.r2dbc.repository.Query("UPDATE group_course_booking SET deleted_at = :deletedAt WHERE id = :id") + Mono softDelete(Long id, java.time.LocalDateTime deletedAt); + + /** + * 查询已开始课程但未到场会员的预约记录 + * 条件：课程开始时间早于当前时间，预约状态为已预约(0) + */ + @org.springframework.data.r2dbc.repository.Query("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") + Flux findAbsentMembers(); + + /** + * 批量更新预约状态为缺席 + */ + @org.springframework.data.r2dbc.repository.Modifying + @org.springframework.data.r2dbc.repository.Query("UPDATE group_course_booking SET status = '3', updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL") + Mono updateToAbsent(Long id, java.time.LocalDateTime updatedAt); } \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseDao.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseDao.java index 688e2a6..9a0000b 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseDao.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/dao/GroupCourseDao.java @@ -3,11 +3,15 @@ package cn.novalon.gym.manage.groupcourse.dao; import cn.novalon.gym.manage.groupcourse.entity.GroupCourseEntity; import org.springframework.data.domain.Sort; +import org.springframework.data.r2dbc.repository.Modifying; +import org.springframework.data.r2dbc.repository.Query; import org.springframework.data.r2dbc.repository.R2dbcRepository; import org.springframework.stereotype.Repository; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.time.LocalDateTime; + @Repository public interface GroupCourseDao extends R2dbcRepository { @@ -20,4 +24,16 @@ public interface GroupCourseDao extends R2dbcRepository Flux findAllByDeletedAtIsNull(); Flux findAllByDeletedAtIsNull(Sort sort); + + @Modifying + @Query("UPDATE group_course SET status = '1', updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL") + Mono cancelCourse(Long id, LocalDateTime updatedAt); + + @Modifying + @Query("UPDATE group_course SET current_members = current_members + :delta, updated_at = :updatedAt WHERE id = :id AND deleted_at IS NULL") + Mono updateCurrentMembers(Long id, Integer delta, LocalDateTime updatedAt); + + @Modifying + @Query("UPDATE group_course SET deleted_at = :deletedAt WHERE id = :id") + Mono softDelete(Long id, LocalDateTime deletedAt); } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourse.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourse.java index ca40da8..b3100e7 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourse.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourse.java @@ -52,6 +52,14 @@ public class GroupCourse extends BaseDomain{ @Schema(description = "课程描述", example = "从入门到入土") private String description; + //点卡额度（消耗次数） + @Schema(description = "点卡额度（消耗次数）", example = "1") + private Integer pointCardAmount; + + //储值卡额度（消耗金额） + @Schema(description = "储值卡额度（消耗金额）", example = "50.00") + private java.math.BigDecimal storedValueAmount; + public String getCourseName() { return courseName; } @@ -139,4 +147,20 @@ public class GroupCourse extends BaseDomain{ public void setDescription(String description) { this.description = description; } + + public Integer getPointCardAmount() { + return pointCardAmount; + } + + public void setPointCardAmount(Integer pointCardAmount) { + this.pointCardAmount = pointCardAmount; + } + + public java.math.BigDecimal getStoredValueAmount() { + return storedValueAmount; + } + + public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) { + this.storedValueAmount = storedValueAmount; + } } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourseBooking.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourseBooking.java index e26423f..cea5e74 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourseBooking.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/domain/GroupCourseBooking.java @@ -25,9 +25,9 @@ public class GroupCourseBooking extends BaseDomain { @Schema(description = "会员ID", example = "1") private Long memberId; - //会员卡ID - @Schema(description = "会员卡ID", example = "1") - private Long memberCardId; + //会员卡记录ID + @Schema(description = "会员卡记录ID", example = "1") + private Long memberCardRecordId; //预约时间 @Schema(description = "预约时间", example = "2026-06-01 10:00:00") @@ -77,12 +77,12 @@ public class GroupCourseBooking extends BaseDomain { this.memberId = memberId; } - public Long getMemberCardId() { - return memberCardId; + public Long getMemberCardRecordId() { + return memberCardRecordId; } - public void setMemberCardId(Long memberCardId) { - this.memberCardId = memberCardId; + public void setMemberCardRecordId(Long memberCardRecordId) { + this.memberCardRecordId = memberCardRecordId; } public LocalDateTime getBookingTime() { diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseBookingEntity.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseBookingEntity.java index dbea5aa..093699e 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseBookingEntity.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseBookingEntity.java @@ -23,9 +23,9 @@ public class GroupCourseBookingEntity extends BaseEntity { @Column("member_id") private Long memberId; - //会员卡ID + //会员卡记录ID @Column("member_card_id") - private Long memberCardId; + private Long memberCardRecordId; //预约时间 @Column("booking_time") @@ -71,12 +71,12 @@ public class GroupCourseBookingEntity extends BaseEntity { this.memberId = memberId; } - public Long getMemberCardId() { - return memberCardId; + public Long getMemberCardRecordId() { + return memberCardRecordId; } - public void setMemberCardId(Long memberCardId) { - this.memberCardId = memberCardId; + public void setMemberCardRecordId(Long memberCardRecordId) { + this.memberCardRecordId = memberCardRecordId; } public LocalDateTime getBookingTime() { diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseEntity.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseEntity.java index 9ab5328..1b16c78 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseEntity.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/entity/GroupCourseEntity.java @@ -54,6 +54,14 @@ public class GroupCourseEntity extends BaseEntity { @Column("description") private String description; + //点卡额度（消耗次数） + @Column("point_card_amount") + private Integer pointCardAmount; + + //储值卡额度（消耗金额） + @Column("stored_value_amount") + private java.math.BigDecimal storedValueAmount; + public String getCourseName() { return courseName; } @@ -141,4 +149,20 @@ public class GroupCourseEntity extends BaseEntity { public void setDescription(String description) { this.description = description; } + + public Integer getPointCardAmount() { + return pointCardAmount; + } + + public void setPointCardAmount(Integer pointCardAmount) { + this.pointCardAmount = pointCardAmount; + } + + public java.math.BigDecimal getStoredValueAmount() { + return storedValueAmount; + } + + public void setStoredValueAmount(java.math.BigDecimal storedValueAmount) { + this.storedValueAmount = storedValueAmount; + } } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseEvent.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseEvent.java new file mode 100644 index 0000000..94ce597 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseEvent.java @@ -0,0 +1,24 @@ +package cn.novalon.gym.manage.groupcourse.enums; + +/** + * 团课状态机事件枚举 + * + * @author 张翔 + * @date 2026-06-02 + */ +public enum CourseEvent { + + CANCEL("取消课程"), + END("结束课程"), + START("开始课程"); + + private final String desc; + + CourseEvent(String desc) { + this.desc = desc; + } + + public String getDesc() { + return desc; + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseStatus.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseStatus.java new file mode 100644 index 0000000..ed198e6 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/enums/CourseStatus.java @@ -0,0 +1,43 @@ +package cn.novalon.gym.manage.groupcourse.enums; + +/** + * 团课状态枚举 + * + * @author 张翔 + * @date 2026-06-02 + */ +public enum CourseStatus { + + NORMAL(0L, "正常"), + CANCELLED(1L, "已取消"), + ENDED(2L, "已结束"), + IN_PROGRESS(3L, "进行中"); + + private final Long value; + private final String desc; + + CourseStatus(Long value, String desc) { + this.value = value; + this.desc = desc; + } + + public Long getValue() { + return value; + } + + public String getDesc() { + return desc; + } + + /** + * 根据值获取枚举 + */ + public static CourseStatus fromValue(Long value) { + for (CourseStatus status : values()) { + if (status.value.equals(value)) { + return status; + } + } + return NORMAL; + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/BookingSagaHandler.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/BookingSagaHandler.java new file mode 100644 index 0000000..b62032d --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/BookingSagaHandler.java @@ -0,0 +1,369 @@ +package cn.novalon.gym.manage.groupcourse.handler; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking; +import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository; +import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository; +import cn.novalon.gym.manage.groupcourse.service.impl.GroupCourseRedisService; +import cn.novalon.gym.manage.member.entity.MemberCard; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.enums.MemberCardType; +import cn.novalon.gym.manage.member.repository.MemberCardRepository; +import cn.novalon.gym.manage.member.service.IMemberCardRecordService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import reactor.core.publisher.Mono; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * 预约 Saga 处理器 + * + * 实现预约和取消预约的分布式事务处理 + * + * @author 张翔 + * @date 2026-06-02 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class BookingSagaHandler { + + private final IGroupCourseBookingRepository bookingRepository; + private final IGroupCourseRepository courseRepository; + private final IMemberCardRecordService memberCardRecordService; + private final MemberCardRepository memberCardRepository; + private final GroupCourseRedisService redisService; + + private static final double DEFAULT_GROUP_COURSE_PRICE = 50.0; + + /** + * 执行预约事务 + * + * 步骤： + * 1. 保存预约记录 + * 2. 扣减会员卡权益 + * 3. 更新课程当前人数 + */ + public Mono executeBooking(GroupCourseBooking booking, Long recordId) { + List steps = new ArrayList<>(); + List rollbackSteps = new ArrayList<>(); + + // 步骤1：保存预约记录 + SagaStep step1 = new SagaStep( + "保存预约记录", + saveBooking(booking), + Mono.defer(() -> deleteBooking(booking.getId())) + ); + steps.add(step1); + rollbackSteps.add(0, step1); + + // 步骤2：扣减会员卡权益（根据卡类型决定扣除次数还是金额） + SagaStep step2 = new SagaStep( + "扣减会员卡权益", + deductCardUsageByCardType(booking.getMemberId(), recordId), + Mono.defer(() -> restoreCardUsageByCardType(booking.getMemberId(), recordId)) + ); + steps.add(step2); + rollbackSteps.add(0, step2); + + // 步骤3：更新课程当前人数 + SagaStep step3 = new SagaStep( + "更新课程当前人数", + incrementCourseCurrentMembers(booking.getCourseId()), + Mono.defer(() -> decrementCourseCurrentMembers(booking.getCourseId())) + ); + steps.add(step3); + rollbackSteps.add(0, step3); + + // 步骤4：更新Redis预约计数 + SagaStep step4 = new SagaStep( + "更新Redis预约计数", + incrementRedisBookingCount(booking.getCourseId()), + Mono.defer(() -> decrementRedisBookingCount(booking.getCourseId())) + ); + steps.add(step4); + rollbackSteps.add(0, step4); + + return executeSaga(steps, rollbackSteps) + .then(Mono.just(booking)); + } + + /** + * 根据会员卡类型扣减权益 + */ + private Mono deductCardUsageByCardType(Long memberId, Long recordId) { + return memberCardRecordService.findById(recordId) + .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在"))) + .flatMap(record -> { + // 验证会员卡归属 + if (!record.getMemberId().equals(memberId)) { + return Mono.error(new RuntimeException("会员卡不归属当前用户")); + } + + return memberCardRepository.findById(record.getMemberCardId()) + .flatMap(card -> { + MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType()); + + switch (cardType) { + case COUNT_CARD: + // 次卡扣除次数 + return deductCardUsage(recordId, 1, 0.0); + case STORED_VALUE_CARD: + // 储值卡扣除金额 + return deductCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE); + case TIME_CARD: + // 时长卡不扣除，但需验证有效期 + return validateTimeCard(record); + default: + return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType)); + } + }); + }); + } + + /** + * 验证时长卡有效期 + * + * @param record 会员卡记录 + * @return 验证通过返回Mono.empty()，否则返回Mono.error() + */ + private Mono validateTimeCard(MemberCardRecord record) { + // 验证会员卡状态 + cn.novalon.gym.manage.member.enums.MemberCardRecordStatus status = record.getStatus(); + if (status != cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.ACTIVE) { + return Mono.error(new RuntimeException("会员卡状态无效，当前状态: " + (status != null ? status.getDesc() : "未知"))); + } + + // 验证有效期 + java.time.LocalDateTime expireTime = record.getExpireTime(); + if (expireTime == null) { + return Mono.error(new RuntimeException("会员卡有效期未设置")); + } + if (expireTime.isBefore(java.time.LocalDateTime.now())) { + return Mono.error(new RuntimeException("会员卡已过期，有效期至: " + expireTime)); + } + + log.debug("时长卡验证通过: recordId={}, expireTime={}", record.getId(), expireTime); + return Mono.empty(); + } + + /** + * 根据会员卡类型恢复权益 + */ + private Mono restoreCardUsageByCardType(Long memberId, Long recordId) { + return memberCardRecordService.findById(recordId) + .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在，无法恢复权益"))) + .flatMap(record -> { + // 验证会员卡归属（memberId为null时跳过验证） + if (memberId != null && !record.getMemberId().equals(memberId)) { + return Mono.error(new RuntimeException("会员卡不归属当前用户")); + } + + return memberCardRepository.findById(record.getMemberCardId()) + .flatMap(card -> { + MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType()); + + switch (cardType) { + case COUNT_CARD: + return restoreCardUsage(recordId, 1, 0.0); + case STORED_VALUE_CARD: + return restoreCardUsage(recordId, 0, DEFAULT_GROUP_COURSE_PRICE); + case TIME_CARD: + return Mono.empty(); + default: + return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType)); + } + }); + }); + } + + /** + * 执行取消预约事务 + */ + public Mono executeCancelBooking(Long bookingId, Long courseId, Long recordId, Long memberId) { + List steps = new ArrayList<>(); + List rollbackSteps = new ArrayList<>(); + + // 步骤1：更新预约状态为已取消 + SagaStep step1 = new SagaStep( + "更新预约状态为已取消", + updateBookingStatus(bookingId, "1"), + Mono.defer(() -> updateBookingStatus(bookingId, "0")) + ); + steps.add(step1); + rollbackSteps.add(0, step1); + + // 步骤2：恢复会员卡权益 + SagaStep step2 = new SagaStep( + "恢复会员卡权益", + restoreCardUsageByCardType(memberId, recordId), + Mono.defer(() -> deductCardUsageByCardType(memberId, recordId)) + ); + steps.add(step2); + rollbackSteps.add(0, step2); + + // 步骤3：减少课程当前人数 + SagaStep step3 = new SagaStep( + "减少课程当前人数", + decrementCourseCurrentMembers(courseId), + Mono.defer(() -> incrementCourseCurrentMembers(courseId)) + ); + steps.add(step3); + rollbackSteps.add(0, step3); + + // 步骤4：更新Redis预约计数 + SagaStep step4 = new SagaStep( + "更新Redis预约计数", + decrementRedisBookingCount(courseId), + Mono.defer(() -> incrementRedisBookingCount(courseId)) + ); + steps.add(step4); + rollbackSteps.add(0, step4); + + return executeSaga(steps, rollbackSteps) + .then(bookingRepository.findById(bookingId)); + } + + private Mono updateBookingStatus(Long bookingId, String status) { + return bookingRepository.updateStatus(bookingId, status) + .flatMap(rows -> { + if (rows == 0) { + return Mono.error(new RuntimeException("更新预约状态失败")); + } + return Mono.empty(); + }); + } + + private Mono saveBooking(GroupCourseBooking booking) { + return bookingRepository.save(booking) + .flatMap(saved -> { + if (saved.getId() == null) { + return Mono.error(new RuntimeException("保存预约记录失败")); + } + booking.setId(saved.getId()); + return Mono.empty(); + }); + } + + private Mono deleteBooking(Long bookingId) { + return bookingRepository.deleteById(bookingId); + } + + private Mono deductCardUsage(Long recordId, Integer deductTimes, Double deductAmount) { + if (deductTimes == 0 && deductAmount == 0.0) { + return Mono.empty(); + } + + return memberCardRecordService.findById(recordId) + .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在"))) + .flatMap(record -> { + cn.novalon.gym.manage.member.enums.MemberCardRecordStatus status = record.getStatus(); + if (status != cn.novalon.gym.manage.member.enums.MemberCardRecordStatus.ACTIVE) { + return Mono.error(new RuntimeException("会员卡状态无效，当前状态: " + (status != null ? status.getDesc() : "未知"))); + } + java.time.LocalDateTime expireTime = record.getExpireTime(); + if (expireTime != null && expireTime.isBefore(java.time.LocalDateTime.now())) { + return Mono.error(new RuntimeException("会员卡已过期")); + } + if (record.getRemainingTimes() != null && deductTimes > 0 && record.getRemainingTimes() < deductTimes) { + return Mono.error(new RuntimeException("会员卡剩余次数不足，当前剩余: " + record.getRemainingTimes() + "次")); + } + if (record.getRemainingAmount() != null && deductAmount > 0 && record.getRemainingAmount() < deductAmount) { + return Mono.error(new RuntimeException("会员卡余额不足，当前剩余: " + record.getRemainingAmount())); + } + return memberCardRecordService.deductUsage(recordId, deductTimes, deductAmount) + .flatMap(rows -> { + if (rows == 0) { + return Mono.error(new RuntimeException("扣减会员卡权益失败，请重试")); + } + return Mono.empty(); + }); + }); + } + + private Mono restoreCardUsage(Long recordId, Integer addTimes, Double addAmount) { + if (addTimes == 0 && addAmount == 0.0) { + return Mono.empty(); + } + + return memberCardRecordService.findById(recordId) + .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在，无法恢复权益"))) + .flatMap(record -> { + // 使用当前记录的过期时间，避免清空过期时间 + return memberCardRecordService.renewCard(recordId, addTimes, addAmount, record.getExpireTime()) + .flatMap(rows -> { + if (rows == 0) { + return Mono.error(new RuntimeException("恢复会员卡权益失败，请重试")); + } + return Mono.empty(); + }); + }); + } + + private Mono incrementCourseCurrentMembers(Long courseId) { + return courseRepository.updateCurrentMembers(courseId, 1).then(); + } + + private Mono decrementCourseCurrentMembers(Long courseId) { + return courseRepository.updateCurrentMembers(courseId, -1).then(); + } + + private Mono incrementRedisBookingCount(Long courseId) { + return redisService.incrementBookingCount(courseId).then(); + } + + private Mono decrementRedisBookingCount(Long courseId) { + return redisService.decrementBookingCount(courseId).then(); + } + + private Mono executeSaga(List steps, List rollbackSteps) { + List completedSteps = new ArrayList<>(); + return executeStep(steps, 0, completedSteps); + } + + private Mono executeStep(List steps, int index, List completedSteps) { + if (index >= steps.size()) { + return Mono.empty(); + } + + SagaStep currentStep = steps.get(index); + + return currentStep.operation() + .doOnSuccess(unused -> completedSteps.add(currentStep)) + .then(Mono.defer(() -> executeStep(steps, index + 1, completedSteps))) + .onErrorResume(error -> { + log.error("Saga步骤执行失败: step={}, error={}", currentStep.description(), error.getMessage()); + return rollbackCompletedSteps(completedSteps).then(Mono.error(error)); + }); + } + + private Mono rollbackCompletedSteps(List completedSteps) { + if (completedSteps.isEmpty()) { + return Mono.empty(); + } + + // 反转已完成的步骤，按逆序回滚 + List reversed = new ArrayList<>(completedSteps); + Collections.reverse(reversed); + + return rollbackSteps(reversed, 0); + } + + private Mono rollbackSteps(List rollbackSteps, int index) { + if (index >= rollbackSteps.size()) { + return Mono.empty(); + } + + SagaStep currentStep = rollbackSteps.get(index); + + return currentStep.rollbackOperation() + .then(Mono.defer(() -> rollbackSteps(rollbackSteps, index + 1))) + .doOnError(error -> log.error("Saga回滚失败: step={}, error={}", currentStep.description(), error.getMessage())) + .onErrorResume(e -> Mono.empty()); + } + + private record SagaStep(String description, Mono operation, Mono rollbackOperation) {} +} diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java index 3c83e9a..e879c5c 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseBookingHandler.java @@ -35,11 +35,22 @@ public class GroupCourseBookingHandler { public Mono bookCourse(ServerRequest request) { return request.bodyToMono(Map.class) .flatMap(body -> { + // 验证必填参数 + if (body.get("courseId") == null) { + return buildErrorResponse("请提供课程ID"); + } + if (body.get("memberId") == null) { + return buildErrorResponse("请提供会员ID"); + } + if (body.get("memberCardRecordId") == null) { + return buildErrorResponse("请提供会员卡记录ID"); + } + Long courseId = ((Number) body.get("courseId")).longValue(); Long memberId = ((Number) body.get("memberId")).longValue(); - Long memberCardId = ((Number) body.get("memberCardId")).longValue(); + Long memberCardRecordId = ((Number) body.get("memberCardRecordId")).longValue(); - return bookingService.bookCourse(courseId, memberId, memberCardId) + return bookingService.bookCourse(courseId, memberId, memberCardRecordId) .flatMap(booking -> { Map response = new HashMap<>(); response.put("success", true); @@ -117,4 +128,14 @@ public class GroupCourseBookingHandler { return ServerResponse.ok() .body(bookingService.getBookingsByCourseId(courseId), GroupCourseBooking.class); } + + /** + * 构建错误响应 + */ + private Mono buildErrorResponse(String message) { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", message); + return ServerResponse.badRequest().bodyValue(response); + } } \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java index 3886e98..0b4d38b 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseHandler.java @@ -71,8 +71,139 @@ public class GroupCourseHandler { @Operation(summary = "根据ID获取团课", description = "根据ID获取团课详情") public Mono getGroupCourseById(ServerRequest request){ Long id = Long.valueOf(request.pathVariable("id")); - return ServerResponse.ok() - .body(groupCourseService.findById(id), GroupCourse.class); + return groupCourseService.findById(id) + .flatMap(course -> ServerResponse.ok().bodyValue(course)) + .switchIfEmpty(ServerResponse.notFound().build()); + } + + @Operation(summary = "创建团课", description = "创建新的团课") + public Mono createGroupCourse(ServerRequest request) { + return request.bodyToMono(GroupCourse.class) + .flatMap(groupCourse -> { + if (groupCourse.getCourseName() == null || groupCourse.getCourseName().isEmpty()) { + Map error = new HashMap<>(); + error.put("success", false); + error.put("message", "课程名称不能为空"); + return ServerResponse.badRequest().bodyValue(error); + } + + return groupCourseService.create(groupCourse) + .flatMap(course -> { + Map response = new HashMap<>(); + response.put("success", true); + response.put("message", "团课创建成功"); + response.put("data", course); + return ServerResponse.ok().bodyValue(response); + }) + .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 updateGroupCourse(ServerRequest request) { + Long id = Long.valueOf(request.pathVariable("id")); + + return request.bodyToMono(GroupCourse.class) + .flatMap(groupCourse -> { + return groupCourseService.update(id, groupCourse) + .flatMap(course -> { + Map response = new HashMap<>(); + response.put("success", true); + response.put("message", "团课更新成功"); + response.put("data", course); + return ServerResponse.ok().bodyValue(response); + }) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); + }); + } + + @Operation(summary = "取消团课", description = "取消指定团课（需提前24小时）") + public Mono cancelGroupCourse(ServerRequest request) { + Long id = Long.valueOf(request.pathVariable("id")); + + return groupCourseService.cancel(id) + .flatMap(course -> { + Map response = new HashMap<>(); + response.put("success", true); + response.put("message", "团课取消成功"); + response.put("data", course); + return ServerResponse.ok().bodyValue(response); + }) + .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 signIn(ServerRequest request) { + Long courseId = Long.valueOf(request.pathVariable("courseId")); + + return request.bodyToMono(Map.class) + .flatMap(body -> { + if (body == null || body.isEmpty()) { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", "请求体不能为空"); + return ServerResponse.badRequest().bodyValue(response); + } + + Object memberIdObj = body.get("memberId"); + if (memberIdObj == null) { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", "memberId不能为空"); + return ServerResponse.badRequest().bodyValue(response); + } + + Long memberId = ((Number) memberIdObj).longValue(); + + return groupCourseService.signIn(courseId, memberId) + .flatMap(course -> { + Map response = new HashMap<>(); + response.put("success", true); + response.put("message", "签到成功"); + response.put("data", course); + return ServerResponse.ok().bodyValue(response); + }) + .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 deleteGroupCourse(ServerRequest request) { + Long id = Long.valueOf(request.pathVariable("id")); + + return groupCourseService.delete(id) + .then(Mono.defer(() -> { + Map response = new HashMap<>(); + response.put("success", true); + response.put("message", "团课删除成功"); + return ServerResponse.ok().bodyValue(response); + })) + .onErrorResume(error -> { + Map response = new HashMap<>(); + response.put("success", false); + response.put("message", error.getMessage()); + return ServerResponse.badRequest().bodyValue(response); + }); } @Operation(summary = "测试-根据Key获取Redis缓存", description = "测试接口：根据传入的key值获取Redis中缓存的数据") diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseStateMachine.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseStateMachine.java new file mode 100644 index 0000000..79fb78b --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/handler/GroupCourseStateMachine.java @@ -0,0 +1,139 @@ +package cn.novalon.gym.manage.groupcourse.handler; + +import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.enums.CourseEvent; +import cn.novalon.gym.manage.groupcourse.enums.CourseStatus; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import reactor.core.publisher.Mono; + +import java.util.HashMap; +import java.util.Map; + +/** + * 团课状态机处理器 + * + * 管理团课的状态转换逻辑 + * + * @author 张翔 + * @date 2026-06-02 + */ +@Slf4j +@Component +public class GroupCourseStateMachine { + + private final Map> stateTransitionMap; + + public GroupCourseStateMachine() { + this.stateTransitionMap = buildStateTransitionMap(); + } + + private Map> buildStateTransitionMap() { + Map> map = new HashMap<>(); + + // NORMAL 状态可以转换的事件 + Map normalTransitions = new HashMap<>(); + normalTransitions.put(CourseEvent.CANCEL, CourseStatus.CANCELLED); + normalTransitions.put(CourseEvent.END, CourseStatus.ENDED); + normalTransitions.put(CourseEvent.START, CourseStatus.IN_PROGRESS); + map.put(CourseStatus.NORMAL, normalTransitions); + + // IN_PROGRESS 状态可以转换的事件 + Map inProgressTransitions = new HashMap<>(); + inProgressTransitions.put(CourseEvent.END, CourseStatus.ENDED); + map.put(CourseStatus.IN_PROGRESS, inProgressTransitions); + + // CANCELLED 状态是终态，不允许任何转换 + + // ENDED 状态是终态，不允许任何转换 + + return map; + } + + /** + * 检查是否可以转换状态 + */ + public Mono canTransition(CourseStatus currentState, CourseEvent event) { + return Mono.fromSupplier(() -> { + Map transitions = stateTransitionMap.get(currentState); + if (transitions == null) { + return false; + } + return transitions.containsKey(event); + }); + } + + /** + * 执行状态转换 + */ + public Mono transition(CourseStatus currentState, CourseEvent event) { + return Mono.fromSupplier(() -> { + Map transitions = stateTransitionMap.get(currentState); + if (transitions == null || !transitions.containsKey(event)) { + log.error("Invalid state transition: currentState={}, event={}", currentState, event); + throw new IllegalStateException( + String.format("不允许的状态转换: 当前状态=%s, 事件=%s", currentState, event)); + } + CourseStatus newState = transitions.get(event); + log.info("State transition: {} --({})--> {}", currentState, event, newState); + return newState; + }); + } + + /** + * 验证状态转换是否允许 + */ + public Mono validateTransition(GroupCourse course, CourseEvent event) { + Long statusValue = course.getStatus(); + CourseStatus currentState = CourseStatus.fromValue(statusValue != null ? statusValue : 0L); + + return canTransition(currentState, event) + .flatMap(canTransition -> { + if (!canTransition) { + String errorMessage = buildErrorMessage(course.getId(), currentState, event); + return Mono.error(new IllegalStateException(errorMessage)); + } + return Mono.empty(); + }); + } + + /** + * 构建状态转换错误信息 + */ + private String buildErrorMessage(Long courseId, CourseStatus currentState, CourseEvent event) { + String currentStateDesc = currentState.getDesc(); + String eventDesc = event.getDesc(); + + String advice = ""; + switch (currentState) { + case CANCELLED: + advice = "（课程已取消，无法进行此操作）"; + break; + case ENDED: + advice = "（课程已结束，无法进行此操作）"; + break; + case IN_PROGRESS: + if (event == CourseEvent.CANCEL) { + advice = "（课程正在进行中，无法取消）"; + } + break; + default: + break; + } + + return String.format("团课ID=%d 不允许的状态转换: 当前状态=%s(%s), 操作=%s%s", + courseId, currentState, currentStateDesc, eventDesc, advice); + } + + /** + * 执行状态转换并更新课程对象 + */ + public Mono applyTransition(GroupCourse course, CourseEvent event) { + return validateTransition(course, event) + .then(transition(CourseStatus.fromValue(course.getStatus()), event)) + .map(newStatus -> { + course.setStatus(newStatus.getValue()); + return course; + }); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java index 8ccc8ae..99d832e 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseBookingRepository.java @@ -53,7 +53,40 @@ public interface IGroupCourseBookingRepository { Mono update(GroupCourseBooking booking); /** - * 根据会员卡ID查询预约记录 + * 更新预约状态 */ - Flux findByMemberCardId(Long memberCardId); + Mono updateStatus(Long bookingId, String status); + + /** + * 删除预约记录 + */ + Mono deleteById(Long bookingId); + + /** + * 根据会员卡记录ID查询预约记录 + */ + Flux findByMemberCardRecordId(Long memberCardRecordId); + + /** + * 查询会员是否有时间冲突的预约 + * + * @param memberId 会员ID + * @param newStartTime 新课程开始时间 + * @param newEndTime 新课程结束时间 + * @return 冲突的预约记录列表 + */ + Flux findConflictingBookings(Long memberId, java.time.LocalDateTime newStartTime, java.time.LocalDateTime newEndTime); + + /** + * 查询已开始课程但未到场会员的预约记录 + * @return 缺席会员的预约记录列表 + */ + Flux findAbsentMembers(); + + /** + * 更新预约状态为缺席(3) + * @param bookingId 预约ID + * @return 更新记录数 + */ + Mono updateToAbsent(Long bookingId); } \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java index 1a2d402..cee768e 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/IGroupCourseRepository.java @@ -17,4 +17,14 @@ public interface IGroupCourseRepository { Mono> findByPage(PageRequest pageRequest); Mono> findByPageAndNotDeleted(PageRequest pageRequest); + + Mono save(GroupCourse groupCourse); + + Mono update(GroupCourse groupCourse); + + Mono cancel(Long id); + + Mono deleteById(Long id); + + Mono updateCurrentMembers(Long id, Integer delta); } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java index 8c4c347..c95b0bb 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseBookingRepository.java @@ -78,8 +78,38 @@ public class GroupCourseBookingRepository implements IGroupCourseBookingReposito } @Override - public Flux findByMemberCardId(Long memberCardId) { - return groupCourseBookingDao.findByMemberCardIdAndDeletedAtIsNull(memberCardId) + public Mono updateStatus(Long bookingId, String status) { + java.time.LocalDateTime now = java.time.LocalDateTime.now(); + java.time.LocalDateTime cancelTime = "1".equals(status) ? now : null; + return groupCourseBookingDao.updateStatus(bookingId, status, cancelTime, now); + } + + @Override + public Mono deleteById(Long bookingId) { + return groupCourseBookingDao.softDelete(bookingId, java.time.LocalDateTime.now()).then(); + } + + @Override + public Flux findByMemberCardRecordId(Long memberCardRecordId) { + return groupCourseBookingDao.findByMemberCardRecordIdAndDeletedAtIsNull(memberCardRecordId) .map(groupCourseConverter::toBookingDomain); } + + @Override + public Flux findConflictingBookings(Long memberId, java.time.LocalDateTime newStartTime, java.time.LocalDateTime newEndTime) { + return groupCourseBookingDao.findConflictingBookings(memberId, newStartTime, newEndTime) + .map(groupCourseConverter::toBookingDomain); + } + + @Override + public Flux findAbsentMembers() { + return groupCourseBookingDao.findAbsentMembers() + .map(groupCourseConverter::toBookingDomain); + } + + @Override + public Mono updateToAbsent(Long bookingId) { + java.time.LocalDateTime now = java.time.LocalDateTime.now(); + return groupCourseBookingDao.updateToAbsent(bookingId, now); + } } \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java index aa249d1..ef344d0 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/repository/impl/GroupCourseRepository.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Repository; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.time.LocalDateTime; import java.util.List; @Repository @@ -128,4 +129,53 @@ public class GroupCourseRepository implements IGroupCourseRepository { return new PageResponse<>(courseList, totalPages, total, page, size); }); } + + @Override + public Mono save(GroupCourse groupCourse) { + GroupCourseEntity entity = groupCourseConverter.toEntity(groupCourse); + entity.setCreatedAt(LocalDateTime.now()); + entity.setUpdatedAt(LocalDateTime.now()); + entity.setStatus(0L); + entity.setCurrentMembers(0); + + return groupCourseDao.save(entity) + .map(groupCourseConverter::toDomain); + } + + @Override + public Mono update(GroupCourse groupCourse) { + GroupCourseEntity entity = groupCourseConverter.toEntity(groupCourse); + entity.setUpdatedAt(LocalDateTime.now()); + + return r2dbcEntityTemplate.update(entity) + .then(findByIdAndDeletedAtIsNull(groupCourse.getId())); + } + + @Override + public Mono cancel(Long id) { + return groupCourseDao.cancelCourse(id, LocalDateTime.now()) + .flatMap(updated -> { + if (updated > 0) { + return findByIdAndDeletedAtIsNull(id); + } + return Mono.empty(); + }); + } + + @Override + public Mono deleteById(Long id) { + return groupCourseDao.softDelete(id, LocalDateTime.now()) + .then(); + } + + @Override + public Mono updateCurrentMembers(Long id, Integer delta) { + return groupCourseDao.updateCurrentMembers(id, delta, LocalDateTime.now()) + .flatMap(updated -> { + if (updated > 0) { + return findByIdAndDeletedAtIsNull(id); + } + return Mono.empty(); + }); + } } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/scheduler/GroupCourseAbsentScheduler.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/scheduler/GroupCourseAbsentScheduler.java new file mode 100644 index 0000000..c1a23d5 --- /dev/null +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/scheduler/GroupCourseAbsentScheduler.java @@ -0,0 +1,42 @@ +package cn.novalon.gym.manage.groupcourse.scheduler; + +import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * 团课缺席会员定时任务 + * + * 功能：定期检查已开始但会员未到场的课程，自动更新预约记录状态为缺席 + * + * @author 张翔 + * @date 2026-06-02 + */ +@Component +public class GroupCourseAbsentScheduler { + + private static final Logger logger = LoggerFactory.getLogger(GroupCourseAbsentScheduler.class); + + private final IGroupCourseBookingService bookingService; + + public GroupCourseAbsentScheduler(IGroupCourseBookingService bookingService) { + this.bookingService = bookingService; + } + + /** + * 每分钟检查一次已开始课程但未到场会员的预约记录 + * 使用fixedRate保证任务间隔稳定执行 + */ + @Scheduled(fixedRate = 60000) + public void checkAndUpdateAbsentMembers() { + logger.debug("定时任务开始检查已开始课程但未到场会员的预约记录"); + + bookingService.processAbsentMembers() + .subscribe( + count -> logger.debug("定时任务完成，更新了 {} 条缺席记录", count), + error -> logger.error("定时任务执行失败：{}", error.getMessage(), error) + ); + } +} \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseBookingService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseBookingService.java index 915d660..ce1d068 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseBookingService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseBookingService.java @@ -14,13 +14,13 @@ public interface IGroupCourseBookingService { /** * 预约团课 - * + * * @param courseId 团课ID * @param memberId 会员ID - * @param memberCardId 会员卡ID + * @param memberCardRecordId 会员卡记录ID * @return 预约记录 */ - Mono bookCourse(Long courseId, Long memberId, Long memberCardId); + Mono bookCourse(Long courseId, Long memberId, Long memberCardRecordId); /** * 取消预约 @@ -54,4 +54,12 @@ public interface IGroupCourseBookingService { * @return 预约记录列表 */ Flux getBookingsByCourseId(Long courseId); + + /** + * 处理已开始课程但未到场会员的预约记录 + * 将状态更新为缺席(3) + * + * @return 处理的记录数 + */ + Mono processAbsentMembers(); } \ No newline at end of file diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java index 7fa0b70..7db154d 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/IGroupCourseService.java @@ -13,4 +13,14 @@ public interface IGroupCourseService { Flux findAll(boolean includeDeleted); Mono> findByPage(PageRequest pageRequest, boolean includeDeleted); + + Mono create(GroupCourse groupCourse); + + Mono update(Long id, GroupCourse groupCourse); + + Mono cancel(Long id); + + Mono signIn(Long courseId, Long memberId); + + Mono delete(Long id); } diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java index 2e664fd..1159f71 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseBookingService.java @@ -3,6 +3,7 @@ package cn.novalon.gym.manage.groupcourse.service.impl; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking; import cn.novalon.gym.manage.groupcourse.event.BookingReminderEventPublisher; +import cn.novalon.gym.manage.groupcourse.handler.BookingSagaHandler; import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository; import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository; import cn.novalon.gym.manage.groupcourse.service.IGroupCourseBookingService; @@ -43,6 +44,7 @@ public class GroupCourseBookingService implements IGroupCourseBookingService { private final IGroupCourseRepository courseRepository; private final GroupCourseRedisService redisService; private final BookingReminderEventPublisher bookingReminderEventPublisher; + private final BookingSagaHandler bookingSagaHandler; // 预约提前时间限制（分钟） private static final long BOOKING_MIN_ADVANCE_MINUTES = 30; @@ -52,16 +54,18 @@ public class GroupCourseBookingService implements IGroupCourseBookingService { public GroupCourseBookingService(IGroupCourseBookingRepository bookingRepository, IGroupCourseRepository courseRepository, GroupCourseRedisService redisService, - BookingReminderEventPublisher bookingReminderEventPublisher) { + BookingReminderEventPublisher bookingReminderEventPublisher, + BookingSagaHandler bookingSagaHandler) { this.bookingRepository = bookingRepository; this.courseRepository = courseRepository; this.redisService = redisService; this.bookingReminderEventPublisher = bookingReminderEventPublisher; + this.bookingSagaHandler = bookingSagaHandler; } @Override - public Mono bookCourse(Long courseId, Long memberId, Long memberCardId) { - logger.info("开始预约团课：courseId={}, memberId={}, memberCardId={}", courseId, memberId, memberCardId); + public Mono bookCourse(Long courseId, Long memberId, Long memberCardRecordId) { + logger.info("开始预约团课：courseId={}, memberId={}, memberCardRecordId={}", courseId, memberId, memberCardRecordId); // 生成唯一请求ID用于分布式锁 String requestId = UUID.randomUUID().toString(); @@ -77,8 +81,19 @@ public class GroupCourseBookingService implements IGroupCourseBookingService { return getCourseWithCache(courseId) .flatMap(course -> { // 3. 验证课程状态 - if (!"0".equals(String.valueOf(course.getStatus()))) { - return releaseLockAndError(courseId, requestId, "课程状态不可预约"); + Long status = course.getStatus(); + if (status == null || status != 0L) { + String errorMessage; + if (status == null) { + errorMessage = "课程状态异常"; + } else if (status == 1L) { + errorMessage = "课程已取消，无法预约"; + } else if (status == 2L) { + errorMessage = "课程已结束，无法预约"; + } else { + errorMessage = "课程状态不可预约"; + } + return releaseLockAndError(courseId, requestId, errorMessage); } // 4. 验证预约时间 @@ -90,59 +105,84 @@ public class GroupCourseBookingService implements IGroupCourseBookingService { "需在课程开始前" + BOOKING_MIN_ADVANCE_MINUTES + "分钟预约"); } - // 5. 验证是否已预约 - return bookingRepository.findValidBooking(courseId, memberId) - .flatMap(existingBooking -> { - return releaseLockAndError(courseId, requestId, "您已预约该课程"); - }) - .switchIfEmpty( - // 6. 使用Redis原子操作验证课程人数是否已满 - validateAndIncrementBookingCount(courseId, course.getMaxMembers()) - .flatMap(countValid -> { - if (countValid > course.getMaxMembers()) { - return releaseLockAndError(courseId, requestId, "课程已满"); - } + // 5. 验证课程人数是否已满（使用数据库中的current_members字段） + if (course.getCurrentMembers() != null && + course.getMaxMembers() != null && + course.getCurrentMembers() >= course.getMaxMembers()) { + return releaseLockAndError(courseId, requestId, "课程已满"); + } - // 7. 创建预约记录 - GroupCourseBooking booking = new GroupCourseBooking(); - booking.setCourseId(courseId); - booking.setMemberId(memberId); - booking.setMemberCardId(memberCardId); - booking.setBookingTime(LocalDateTime.now()); - booking.setStatus("0"); // 0-已预约 + // 6. 验证时间冲突（会员是否已预约时间重叠的课程） + return bookingRepository.findConflictingBookings(memberId, course.getStartTime(), course.getEndTime()) + .collectList() + .flatMap(conflictingBookings -> { + if (!conflictingBookings.isEmpty()) { + StringBuilder errorMsg = new StringBuilder("您已预约的课程与当前课程时间冲突："); + for (GroupCourseBooking conflict : conflictingBookings) { + errorMsg.append(conflict.getCourseName()) + .append("(") + .append(conflict.getCourseStartTime()) + .append(" - ") + .append(conflict.getCourseEndTime()) + .append(") "); + } + return releaseLockAndError(courseId, requestId, errorMsg.toString()); + } - // 添加课程信息到预约记录 - booking.setCourseName(course.getCourseName()); - booking.setCourseStartTime(course.getStartTime()); - booking.setCourseEndTime(course.getEndTime()); - booking.setLocation(course.getLocation()); + // 7. 验证是否已预约 + return bookingRepository.findValidBooking(courseId, memberId) + .flatMap(existingBooking -> { + return releaseLockAndError(courseId, requestId, "您已预约该课程"); + }) + .switchIfEmpty( + // 8. 使用Redis原子操作验证课程人数是否已满 + validateAndIncrementBookingCount(courseId, course.getMaxMembers()) + .flatMap(countValid -> { + if (countValid > course.getMaxMembers()) { + return releaseLockAndError(courseId, requestId, "课程已满"); + } - // 8. 保存预约记录 - return bookingRepository.save(booking) - .flatMap(savedBooking -> { - // 9. 释放锁 - return redisService.releaseLock(courseId, requestId) - .then(Mono.just(savedBooking)); - }) - .doOnSuccess(savedBooking -> { - logger.info("预约成功：bookingId={}, courseId={}, memberId={}", - savedBooking.getId(), courseId, memberId); - // 发布预约成功事件 - bookingReminderEventPublisher.publishBookingSuccessEvent( - savedBooking.getId(), - savedBooking.getMemberId(), - savedBooking.getCourseName(), - savedBooking.getCourseStartTime().toString() - ); - }) - .doOnError(error -> { - // 回滚Redis计数 - redisService.decrementBookingCount(courseId).subscribe(); - logger.error("预约失败：courseId={}, memberId={}, error={}", - courseId, memberId, error.getMessage()); - }); - }) - ); + // 9. 创建预约记录 + GroupCourseBooking booking = new GroupCourseBooking(); + booking.setCourseId(courseId); + booking.setMemberId(memberId); + booking.setMemberCardRecordId(memberCardRecordId); + booking.setBookingTime(LocalDateTime.now()); + booking.setStatus("0"); // 0-已预约 + + // 添加课程信息到预约记录 + booking.setCourseName(course.getCourseName()); + booking.setCourseStartTime(course.getStartTime()); + booking.setCourseEndTime(course.getEndTime()); + booking.setLocation(course.getLocation()); + + // 10. 使用Saga事务执行预约（包含权益扣减） + return bookingSagaHandler.executeBooking(booking, memberCardRecordId) + .flatMap(savedBooking -> { + // 11. 释放锁 + return redisService.releaseLock(courseId, requestId) + .then(Mono.just(savedBooking)); + }) + .doOnSuccess(savedBooking -> { + logger.info("预约成功：bookingId={}, courseId={}, memberId={}", + savedBooking.getId(), courseId, memberId); + // 发布预约成功事件 + bookingReminderEventPublisher.publishBookingSuccessEvent( + savedBooking.getId(), + savedBooking.getMemberId(), + savedBooking.getCourseName(), + savedBooking.getCourseStartTime().toString() + ); + }) + .doOnError(error -> { + // 回滚Redis计数 + redisService.decrementBookingCount(courseId).subscribe(); + logger.error("预约失败：courseId={}, memberId={}, error={}", + courseId, memberId, error.getMessage()); + }); + }) + ); + }); }) .onErrorResume(error -> { // 发生错误时释放锁 @@ -172,12 +212,23 @@ public class GroupCourseBookingService implements IGroupCourseBookingService { * 验证并增加预约人数（使用Redis原子操作） */ private Mono validateAndIncrementBookingCount(Long courseId, Integer maxMembers) { - return redisService.incrementBookingCount(courseId) - .map(count -> { - // 同时查询数据库中的预约数进行双重验证 - // 这里简化处理，实际生产环境应该结合数据库查询 - return count.intValue(); - }); + // 先获取当前Redis中的预约计数 + return redisService.getBookingCount(courseId) + .flatMap(currentCount -> { + // 如果Redis中计数为0，可能是首次访问，需要从数据库同步 + if (currentCount == 0) { + // 从数据库查询实际预约人数 + return bookingRepository.countValidBookings(courseId) + .flatMap(dbCount -> { + // 将数据库中的实际预约人数同步到Redis + return redisService.setBookingCount(courseId, dbCount.intValue()) + .then(Mono.just(dbCount.intValue())); + }); + } + return Mono.just(currentCount); + }) + // 递增预约计数 + .flatMap(count -> redisService.incrementBookingCount(courseId).map(Long::intValue)); } /** @@ -212,32 +263,37 @@ public class GroupCourseBookingService implements IGroupCourseBookingService { } // 3. 验证预约状态 - if (!"0".equals(booking.getStatus())) { - return releaseLockAndError(bookingId, requestId, "预约状态不允许取消"); + String status = booking.getStatus(); + if (!"0".equals(status)) { + String errorMessage; + if ("1".equals(status)) { + errorMessage = "预约已取消，无需重复取消"; + } else if ("2".equals(status)) { + errorMessage = "课程已出席，无法取消"; + } else if ("3".equals(status)) { + errorMessage = "已缺席课程，无法取消"; + } else { + errorMessage = "预约状态不允许取消"; + } + return releaseLockAndError(bookingId, requestId, errorMessage); } // 4. 验证取消时间 LocalDateTime now = LocalDateTime.now(); LocalDateTime startTime = booking.getCourseStartTime(); + if (startTime == null) { + return releaseLockAndError(bookingId, requestId, "课程开始时间为空，无法取消预约"); + } long hoursUntilStart = ChronoUnit.HOURS.between(now, startTime); if (hoursUntilStart < CANCEL_MIN_ADVANCE_HOURS) { return releaseLockAndError(bookingId, requestId, "需在课程开始前" + CANCEL_MIN_ADVANCE_HOURS + "小时取消"); } - // 5. 更新预约状态 - booking.setStatus("1"); // 1-已取消 - booking.setCancelTime(LocalDateTime.now()); - - // 6. 保存更新 - return bookingRepository.update(booking) + // 5. 使用Saga事务执行取消预约（包含权益恢复） + return bookingSagaHandler.executeCancelBooking(bookingId, booking.getCourseId(), booking.getMemberCardRecordId(), memberId) .flatMap(updatedBooking -> { - // 7. 减少Redis中的预约人数计数 - return redisService.decrementBookingCount(booking.getCourseId()) - .then(Mono.just(updatedBooking)); - }) - .flatMap(updatedBooking -> { - // 8. 释放锁 + // 6. 释放锁 return redisService.releaseLock(bookingId, requestId) .then(Mono.just(updatedBooking)); }) @@ -281,4 +337,36 @@ public class GroupCourseBookingService implements IGroupCourseBookingService { return bookingRepository.findByCourseId(courseId) .doOnComplete(() -> logger.debug("查询完成：courseId={}", courseId)); } -} \ No newline at end of file + + @Override + public Mono processAbsentMembers() { + logger.info("开始处理已开始课程但未到场会员的预约记录"); + + return bookingRepository.findAbsentMembers() + .collectList() + .flatMap(absentBookings -> { + if (absentBookings.isEmpty()) { + logger.info("没有需要处理的缺席会员记录"); + return Mono.just(0); + } + + logger.info("发现 {} 条需要更新为缺席状态的预约记录", absentBookings.size()); + + // 批量更新状态为缺席 + return Flux.fromIterable(absentBookings) + .flatMap(booking -> { + logger.debug("更新预约记录为缺席状态：bookingId={}, memberId={}, courseId={}", + booking.getId(), booking.getMemberId(), booking.getCourseId()); + return bookingRepository.updateToAbsent(booking.getId()); + }) + .reduce(Integer::sum) + .defaultIfEmpty(0) + .doOnSuccess(count -> { + logger.info("成功更新 {} 条预约记录为缺席状态", count); + }) + .doOnError(error -> { + logger.error("处理缺席会员记录时发生错误：{}", error.getMessage(), error); + }); + }); + } +} diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseRedisService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseRedisService.java index 59c3f25..f8110e4 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseRedisService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseRedisService.java @@ -180,4 +180,15 @@ public class GroupCourseRedisService { .decrement(key) .doOnSuccess(count -> logger.debug("预约人数减少：courseId={}, count={}", courseId, count)); } -} \ No newline at end of file + + /** + * 设置课程预约人数（用于从数据库同步） + */ + public Mono setBookingCount(Long courseId, Integer count) { + String key = "booking_count:" + courseId; + return reactiveRedisTemplate.opsForValue() + .set(key, count) + .doOnSuccess(result -> logger.debug("预约人数已设置：courseId={}, count={}", courseId, count)) + .then(); + } +} diff --git a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java index 98b5ea9..7847c9a 100644 --- a/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java +++ b/gym-manage-api/gym-groupCourse/src/main/java/cn/novalon/gym/manage/groupcourse/service/impl/GroupCourseService.java @@ -5,8 +5,18 @@ import cn.novalon.gym.manage.common.dto.PageRequest; import cn.novalon.gym.manage.common.dto.PageResponse; import cn.novalon.gym.manage.common.util.RedisUtil; import cn.novalon.gym.manage.groupcourse.domain.GroupCourse; +import cn.novalon.gym.manage.groupcourse.domain.GroupCourseBooking; +import cn.novalon.gym.manage.groupcourse.enums.CourseEvent; +import cn.novalon.gym.manage.groupcourse.enums.CourseStatus; +import cn.novalon.gym.manage.groupcourse.handler.GroupCourseStateMachine; +import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseBookingRepository; import cn.novalon.gym.manage.groupcourse.repository.IGroupCourseRepository; import cn.novalon.gym.manage.groupcourse.service.IGroupCourseService; +import cn.novalon.gym.manage.member.entity.MemberCard; +import cn.novalon.gym.manage.member.entity.MemberCardRecord; +import cn.novalon.gym.manage.member.enums.MemberCardType; +import cn.novalon.gym.manage.member.repository.MemberCardRepository; +import cn.novalon.gym.manage.member.service.IMemberCardRecordService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; @@ -15,24 +25,40 @@ import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.time.LocalDateTime; + @Service public class GroupCourseService implements IGroupCourseService { private static final Logger logger = LoggerFactory.getLogger(GroupCourseService.class); private final IGroupCourseRepository groupCourseRepository; + private final IGroupCourseBookingRepository bookingRepository; + private final IMemberCardRecordService memberCardRecordService; + private final MemberCardRepository memberCardRepository; private final RedisUtil redisUtil; private final ObjectMapper objectMapper; + private final GroupCourseStateMachine stateMachine; private static final String CACHE_KEY_PREFIX = "group_course:page:"; private static final String CACHE_KEY_ID_PREFIX = "group_course:id:"; private static final long CACHE_EXPIRE_SECONDS = 300; + private static final double DEFAULT_GROUP_COURSE_PRICE = 50.0; + public GroupCourseService(IGroupCourseRepository groupCourseRepository, + IGroupCourseBookingRepository bookingRepository, + IMemberCardRecordService memberCardRecordService, + MemberCardRepository memberCardRepository, RedisUtil redisUtil, - ObjectMapper objectMapper){ + ObjectMapper objectMapper, + GroupCourseStateMachine stateMachine){ this.groupCourseRepository = groupCourseRepository; + this.bookingRepository = bookingRepository; + this.memberCardRecordService = memberCardRecordService; + this.memberCardRepository = memberCardRepository; this.redisUtil = redisUtil; this.objectMapper = objectMapper; + this.stateMachine = stateMachine; } @Override @@ -133,4 +159,238 @@ public class GroupCourseService implements IGroupCourseService { }) ); } + + @Override + public Mono create(GroupCourse groupCourse) { + return groupCourseRepository.save(groupCourse) + .doOnSuccess(course -> logger.info("团课创建成功 - id={}, name={}", course.getId(), course.getCourseName())) + .flatMap(course -> clearCache().thenReturn(course)) + .doOnError(error -> logger.error("团课创建失败 - error: {}", error.getMessage())); + } + + @Override + public Mono update(Long id, GroupCourse groupCourse) { + return groupCourseRepository.findByIdAndDeletedAtIsNull(id) + .switchIfEmpty(Mono.error(new RuntimeException("团课不存在"))) + .flatMap(existing -> { + if (groupCourse.getCourseName() != null) { + existing.setCourseName(groupCourse.getCourseName()); + } + if (groupCourse.getCoachId() != null) { + existing.setCoachId(groupCourse.getCoachId()); + } + if (groupCourse.getCourseType() != null) { + existing.setCourseType(groupCourse.getCourseType()); + } + if (groupCourse.getStartTime() != null) { + existing.setStartTime(groupCourse.getStartTime()); + } + if (groupCourse.getEndTime() != null) { + existing.setEndTime(groupCourse.getEndTime()); + } + if (groupCourse.getMaxMembers() != null) { + existing.setMaxMembers(groupCourse.getMaxMembers()); + } + if (groupCourse.getStatus() != null) { + existing.setStatus(groupCourse.getStatus()); + } + if (groupCourse.getLocation() != null) { + existing.setLocation(groupCourse.getLocation()); + } + if (groupCourse.getCoverImage() != null) { + existing.setCoverImage(groupCourse.getCoverImage()); + } + if (groupCourse.getDescription() != null) { + existing.setDescription(groupCourse.getDescription()); + } + if (groupCourse.getPointCardAmount() != null) { + existing.setPointCardAmount(groupCourse.getPointCardAmount()); + } + if (groupCourse.getStoredValueAmount() != null) { + existing.setStoredValueAmount(groupCourse.getStoredValueAmount()); + } + return groupCourseRepository.update(existing); + }) + .doOnSuccess(course -> logger.info("团课更新成功 - id={}", id)) + .flatMap(course -> clearCache().thenReturn(course)) + .doOnError(error -> logger.error("团课更新失败 - id={}, error: {}", id, error.getMessage())); + } + + @Override + public Mono cancel(Long id) { + return groupCourseRepository.findByIdAndDeletedAtIsNull(id) + .switchIfEmpty(Mono.error(new RuntimeException("团课不存在"))) + .flatMap(course -> { + // 使用状态机验证状态转换 + return stateMachine.validateTransition(course, CourseEvent.CANCEL) + .then(Mono.just(course)); + }) + .flatMap(course -> { + LocalDateTime now = LocalDateTime.now(); + // 检查当前时间是否超过课程开始前24小时 + // 如果当前时间 > (课程开始时间 - 24小时)，则不允许取消 + if (now.isAfter(course.getStartTime().minusHours(24))) { + return Mono.error(new RuntimeException("课程取消需提前24小时")); + } + + // 取消课程并返还权益 + return groupCourseRepository.cancel(id) + .flatMap(canceledCourse -> { + // 为所有预约该课程的会员返还权益 + return refundBookingMembers(canceledCourse.getId()) + .then(Mono.just(canceledCourse)); + }); + }) + .doOnSuccess(course -> logger.info("团课取消成功 - id={}", id)) + .flatMap(course -> clearCache().thenReturn(course)) + .doOnError(error -> logger.error("团课取消失败 - id={}, error: {}", id, error.getMessage())); + } + + /** + * 为预约课程的所有会员返还权益 + * + * @param courseId 课程ID + * @return 空Mono + */ + private Mono refundBookingMembers(Long courseId) { + logger.info("开始为课程预约会员返还权益: courseId={}", courseId); + + return groupCourseRepository.findByIdAndDeletedAtIsNull(courseId) + .switchIfEmpty(Mono.error(new RuntimeException("课程不存在"))) + .flatMap(course -> { + Integer pointCardAmount = course.getPointCardAmount() != null ? course.getPointCardAmount() : 1; + Double storedValueAmount = course.getStoredValueAmount() != null ? + course.getStoredValueAmount().doubleValue() : DEFAULT_GROUP_COURSE_PRICE; + + logger.info("课程权益信息: courseId={}, pointCardAmount={}, storedValueAmount={}", + courseId, pointCardAmount, storedValueAmount); + + return bookingRepository.findByCourseId(courseId) + .filter(booking -> "0".equals(booking.getStatus())) // 只处理已预约状态的记录 + .flatMap(booking -> { + Long memberCardRecordId = booking.getMemberCardRecordId(); + if (memberCardRecordId == null) { + logger.warn("预约记录没有会员卡记录ID: bookingId={}", booking.getId()); + return Mono.empty(); + } + + // 根据会员卡类型返还权益 + return refundCardUsage(booking.getId(), memberCardRecordId, pointCardAmount, storedValueAmount) + .doOnSuccess(unused -> logger.info("会员权益返还成功: bookingId={}, memberId={}", + booking.getId(), booking.getMemberId())) + .doOnError(error -> logger.error("会员权益返还失败: bookingId={}, memberId={}, error={}", + booking.getId(), booking.getMemberId(), error.getMessage())) + .onErrorResume(e -> Mono.empty()); // 单个会员返还失败不影响其他会员 + }) + .then(); + }); + } + + /** + * 根据会员卡类型返还权益 + * + * @param bookingId 预约ID + * @param recordId 会员卡记录ID + * @param pointCardAmount 次卡返还次数 + * @param storedValueAmount 储值卡返还金额 + * @return 空Mono + */ + private Mono refundCardUsage(Long bookingId, Long recordId, Integer pointCardAmount, Double storedValueAmount) { + return memberCardRecordService.findById(recordId) + .switchIfEmpty(Mono.error(new RuntimeException("会员卡记录不存在"))) + .flatMap(record -> { + return memberCardRepository.findById(record.getMemberCardId()) + .flatMap(card -> { + MemberCardType cardType = MemberCardType.valueOf(card.getMemberCardType()); + + Mono refundOperation; + switch (cardType) { + case COUNT_CARD: + // 次卡返还次数（基于课程设置的pointCardAmount） + logger.debug("返还次卡次数: recordId={}, amount={}", recordId, pointCardAmount); + refundOperation = memberCardRecordService.renewCard(recordId, pointCardAmount, 0.0, record.getExpireTime()) + .then(Mono.empty()); + break; + case STORED_VALUE_CARD: + // 储值卡返还金额（基于课程设置的storedValueAmount） + logger.debug("返还储值卡金额: recordId={}, amount={}", recordId, storedValueAmount); + refundOperation = memberCardRecordService.renewCard(recordId, 0, storedValueAmount, record.getExpireTime()) + .then(Mono.empty()); + break; + case TIME_CARD: + // 时长卡不返还，仅修改预约记录状态 + logger.debug("时长卡不返还权益，仅更新预约状态: bookingId={}", bookingId); + refundOperation = Mono.empty(); + break; + default: + return Mono.error(new RuntimeException("不支持的会员卡类型: " + cardType)); + } + + // 无论哪种卡类型，都需要更新预约记录状态为已取消 + return refundOperation.then(bookingRepository.updateStatus(bookingId, "1")) + .flatMap(rows -> { + if (rows == 0) { + logger.warn("更新预约状态失败: bookingId={}", bookingId); + } + return Mono.empty(); + }); + }); + }); + } + + @Override + public Mono signIn(Long courseId, Long memberId) { + return groupCourseRepository.findByIdAndDeletedAtIsNull(courseId) + .switchIfEmpty(Mono.error(new RuntimeException("团课不存在"))) + .flatMap(course -> { + if (course.getStatus() != 0L) { + return Mono.error(new RuntimeException("课程状态不允许签到")); + } + + if (course.getCurrentMembers() >= course.getMaxMembers()) { + return Mono.error(new RuntimeException("课程已满员")); + } + + // 检查会员是否已预约此课程 + return bookingRepository.findValidBooking(courseId, memberId) + .switchIfEmpty(Mono.error(new RuntimeException("会员未预约此课程"))) + .flatMap(booking -> { + // 更新课程当前人数 + return groupCourseRepository.updateCurrentMembers(courseId, 1) + .flatMap(updatedCourse -> { + // 更新预约状态为已出席 + return bookingRepository.updateStatus(booking.getId(), "2") + .thenReturn(updatedCourse); + }); + }); + }) + .doOnSuccess(course -> logger.info("团课签到成功 - courseId={}, memberId={}", courseId, memberId)) + .flatMap(course -> clearCache().thenReturn(course)) + .doOnError(error -> logger.error("团课签到失败 - courseId={}, memberId={}, error: {}", courseId, memberId, error.getMessage())); + } + + @Override + public Mono delete(Long id) { + // 先查询课程状态，只有已取消的课程才能删除 + return groupCourseRepository.findByIdAndDeletedAtIsNull(id) + .switchIfEmpty(Mono.error(new RuntimeException("团课不存在"))) + .flatMap(course -> { + // 检查课程状态是否为已取消（状态码1） + if (course.getStatus() == null || !course.getStatus().equals(CourseStatus.CANCELLED.getValue())) { + return Mono.error(new RuntimeException("只有已取消的课程才能删除，当前状态: " + + (course.getStatus() != null ? course.getStatus() : "未知"))); + } + + // 删除课程 + return groupCourseRepository.deleteById(id) + .doOnSuccess(v -> logger.info("团课删除成功 - id={}", id)) + .then(clearCache()) + .doOnError(error -> logger.error("团课删除失败 - id={}, error: {}", id, error.getMessage())); + }); + } + + private Mono clearCache() { + return redisUtil.deleteByPattern(CACHE_KEY_PREFIX + "*") + .then(redisUtil.deleteByPattern(CACHE_KEY_ID_PREFIX + "*")).then(); + } } diff --git a/gym-manage-api/log.text b/gym-manage-api/log.text new file mode 100644 index 0000000..c2deea4 --- /dev/null +++ b/gym-manage-api/log.text @@ -0,0 +1,200 @@ +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 diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/ManageApplication.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/ManageApplication.java index beef525..b190bfd 100644 --- a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/ManageApplication.java +++ b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/ManageApplication.java @@ -13,12 +13,14 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories; import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories; +import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.web.server.WebFilter; import java.util.List; @SpringBootApplication(scanBasePackages = "cn.novalon.gym.manage", exclude = { ReactiveUserDetailsServiceAutoConfiguration.class }) +@EnableScheduling @EnableR2dbcRepositories(basePackages = { "cn.novalon.gym.manage.db.dao", "cn.novalon.gym.manage.sys.audit.repository" , diff --git a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java index 52acb21..76e0b56 100644 --- a/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java +++ b/gym-manage-api/manage-app/src/main/java/cn/novalon/gym/manage/app/config/SystemRouter.java @@ -262,6 +262,11 @@ public class SystemRouter { .GET("/api/groupCourse/list", groupCourseHandler::getAllGroupCourse) .POST("/api/groupCourse/page", groupCourseHandler::getGroupCoursesByPage) .GET("/api/groupCourse/{id}", groupCourseHandler::getGroupCourseById) + .POST("/api/groupCourse", groupCourseHandler::createGroupCourse) + .PUT("/api/groupCourse/{id}", groupCourseHandler::updateGroupCourse) + .DELETE("/api/groupCourse/{id}", groupCourseHandler::deleteGroupCourse) + .POST("/api/groupCourse/{id}/cancel", groupCourseHandler::cancelGroupCourse) + .POST("/api/groupCourse/{courseId}/signin", groupCourseHandler::signIn) // ===== 团课预约管理 ===== .POST("/api/groupCourse/book", groupCourseBookingHandler::bookCourse) diff --git a/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/RedisUtil.java b/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/RedisUtil.java index 0482306..e880dee 100644 --- a/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/RedisUtil.java +++ b/gym-manage-api/manage-common/src/main/java/cn/novalon/gym/manage/common/util/RedisUtil.java @@ -69,4 +69,12 @@ public class RedisUtil { public Mono expire(String key, long timeoutSeconds) { return reactiveRedisTemplate.expire(key, Duration.ofSeconds(timeoutSeconds)); } + + /** + * 根据通配符模式删除key + */ + public Mono deleteByPattern(String pattern) { + return reactiveRedisTemplate.keys(pattern) + .flatMap(keys -> reactiveRedisTemplate.delete(keys)).count(); + } } \ No newline at end of file diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V10__Insert_Booking_Test_Data.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V10__Insert_Booking_Test_Data.sql new file mode 100644 index 0000000..c6c4452 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V10__Insert_Booking_Test_Data.sql @@ -0,0 +1,86 @@ +-- V10: 团课预约业务场景测试数据 +-- 测试场景： +-- 1. 用户A刚刚注册，在没有任何会员卡的情况下申请团课预约 +-- 2. 用户B已有时长卡，但已经过期 +-- 3. 会员C有时长卡，未过期 +-- 4. 会员D有次数卡，但次数卡耗尽次数 +-- 5. 会员E有次数卡，且次数充足 +-- 6. 会员F有储值卡，但余额不足以支付其预约的团课 +-- 7. 会员G有储值卡，余额充足 + +-- ============================================ +-- 1. 创建测试会员用户 (A-G) +-- ============================================ + +INSERT INTO member_user (member_no, nickname, phone, gender, is_deleted, created_at, updated_at) VALUES + ('MEM_TEST_A', '用户A_无卡新用户', '13800001001', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'), + ('MEM_TEST_B', '用户B_过期时长卡', '13800001002', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_C', '会员C_有效时长卡', '13800001003', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_D', '会员D_次数用尽', '13800001004', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_E', '会员E_次数充足', '13800001005', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_F', '会员F_储值卡余额不足', '13800001006', 1, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'), + ('MEM_TEST_G', '会员G_储值卡余额充足', '13800001007', 2, false, '2026-05-01 10:00:00', '2026-05-01 10:00:00'); + +-- ============================================ +-- 2. 团课课程测试数据（用于预约测试） +-- ============================================ + +-- 团课A: 收费类型为次数卡(点卡额度=1) +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES + ('燃脂搏击_次数卡课程', 102, 2, '2026-06-10 19:30:00', '2026-06-10 20:30:00', 20, 0, '0', '综合训练区', '高强度间歇训练，配合音乐快速燃脂，消耗1次', 1, 0.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00'); + +-- 团课B: 收费类型为储值卡(储值额度=50.00) +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES + ('高端普拉提_储值卡课程', 103, 1, '2026-06-11 19:00:00', '2026-06-11 20:00:00', 15, 0, '0', '普拉提教室', '精准训练核心肌群，消耗储值50元', 0, 20.00, 'admin', '2026-06-01 10:00:00', '2026-06-01 10:00:00'); + +-- ============================================ +-- 3. 会员卡类型定义 +-- ============================================ + +INSERT INTO member_card (member_card_name, member_card_type, member_card_price, member_card_validity_days, member_card_total_times, member_card_amount, member_card_status, extra_config, created_at, updated_at) VALUES + ('30天时长卡', 'TIME_CARD', 299.00, 30, NULL, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'), + ('10次卡', 'COUNT_CARD', 499.00, NULL, 10, NULL, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'), + ('储值卡500', 'STORED_VALUE_CARD', 500.00, NULL, NULL, 500.00, 1, '{}', '2026-01-01 00:00:00', '2026-01-01 00:00:00'); + +-- ============================================ +-- 4. 会员卡记录测试数据 +-- ============================================ + +-- 场景2: 用户B - 时长卡已过期 (expire_time < 当前时间) +-- 购买于30天前，有效期30天，现已过期 +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_B'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'EXPIRED', 0, 0.00, '2026-05-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +-- 场景3: 会员C - 时长卡未过期 (expire_time > 当前时间) +-- 购买于今天，有效期30天，还有30天有效期 +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_C'), (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), 'ACTIVE', 0, 0.00, '2026-07-02 23:59:59', '2026-06-02 10:00:00', 0, '{}', '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +-- 场景4: 会员D - 次数卡耗尽 (remaining_times = 0) +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_D'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 0, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +-- 场景5: 会员E - 次数卡充足 (remaining_times >= point_card_amount) +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_E'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 5, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +-- 场景6: 会员F - 储值卡余额不足 (remaining_amount < stored_value_amount of course) +-- 团课B收费50元，但会员F储值卡只有30元 +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_F'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 30.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +-- 场景7: 会员G - 储值卡余额充足 (remaining_amount >= stored_value_amount of course) +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_G'), (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), 'ACTIVE', 0, 200.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +-- ============================================ +-- 5. 测试场景说明 +-- ============================================ + +-- 场景1: 用户A无会员卡 -> 预约团课时应提示"无可用会员卡" +-- 场景2: 用户B时长卡已过期 -> 预约团课时应提示"会员卡已过期" +-- 场景3: 会员C时长卡有效 -> 可以正常预约次数卡团课 +-- 场景4: 会员D次数为0 -> 预约团课时应提示"剩余次数不足" +-- 场景5: 会员E次数充足 -> 可以正常预约次数卡团课 +-- 场景6: 会员F储值卡余额30元，团课需50元 -> 预约时应提示"余额不足" +-- 场景7: 会员G储值卡余额200元，团课需50元 -> 可以正常预约储值卡团课 diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V11__Insert_Cancel_Booking_Test_Data.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V11__Insert_Cancel_Booking_Test_Data.sql new file mode 100644 index 0000000..a6d94c8 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V11__Insert_Cancel_Booking_Test_Data.sql @@ -0,0 +1,116 @@ +-- V11: 团课预约取消业务场景测试数据 +-- 测试场景： +-- 1. 用户张三使用时长卡预约了团课，需要取消预约 +-- 2. 用户李四使用次数卡预约了团课，需要取消预约 +-- 3. 用户王五使用储值卡预约了团课，需要取消预约 + +-- ============================================ +-- 1. 创建测试会员用户 (张三、李四、王五) +-- ============================================ + +INSERT INTO member_user (member_no, nickname, phone, gender, is_deleted, created_at, updated_at) VALUES + ('MEM_TEST_ZHANG', '张三_时长卡用户', '13800002001', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'), + ('MEM_TEST_LI', '李四_次数卡用户', '13800002002', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'), + ('MEM_TEST_WANG', '王五_储值卡用户', '13800002003', 2, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +-- ============================================ +-- 2. 确保会员卡类型已存在（如果不存在则创建） +-- ============================================ + +-- 时长卡类型（30天） +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 '30天时长卡', '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 = '30天时长卡'); + +-- 次数卡类型（10次） +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 '10次卡', 'COUNT_CARD', 499.00, NULL, 10, 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 = '10次卡'); + +-- 储值卡类型（500元） +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 '储值卡500', 'STORED_VALUE_CARD', 500.00, NULL, NULL, 500.00, 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 = '储值卡500'); + +-- ============================================ +-- 3. 为测试用户分配会员卡 +-- ============================================ + +-- 张三：时长卡（有效期内） +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_ZHANG'), + (SELECT member_card_id FROM member_card WHERE member_card_name = '30天时长卡'), + 'ACTIVE', 0, 0.00, '2026-07-02 23:59:59', '2026-06-02 10:00:00', 0, '{}', '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +-- 李四：次数卡（剩余5次） +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_LI'), + (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), + 'ACTIVE', 5, 0.00, '2026-12-31 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +-- 王五：储值卡（余额200元） +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TEST_WANG'), + (SELECT member_card_id FROM member_card WHERE member_card_name = '储值卡500'), + 'ACTIVE', 0, 200.00, '2027-06-02 23:59:59', '2026-05-01 10:00:00', 0, '{}', '2026-05-01 10:00:00', '2026-06-02 10:00:00'); + +-- ============================================ +-- 4. 创建用于取消预约测试的团课 +-- ============================================ + +-- 团课X: 时长卡可用课程（使用次数卡支付，时长卡会员可预约） +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-15 19:00:00', '2026-06-15 20:00:00', 20, 0, '0', '瑜伽教室', '适合所有级别的瑜伽课程，用于测试取消预约功能', 1, 30.00, 'admin', '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +-- ============================================ +-- 5. 创建已预约的记录（状态为0-已预约） +-- ============================================ + +-- 张三使用时长卡预约团课（状态：已预约） +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 = '晚间瑜伽_取消测试'), + (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_ZHANG'), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_ZHANG')), + '2026-06-02 11:00:00', '0', '晚间瑜伽_取消测试', '2026-06-15 19:00:00', '2026-06-15 20:00:00', '瑜伽教室', + '2026-06-02 11:00:00', '2026-06-02 11:00:00'); + +-- 李四使用次数卡预约团课（状态：已预约） +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 = '晚间瑜伽_取消测试'), + (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_LI'), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_LI')), + '2026-06-02 11:30:00', '0', '晚间瑜伽_取消测试', '2026-06-15 19:00:00', '2026-06-15 20:00:00', '瑜伽教室', + '2026-06-02 11:30:00', '2026-06-02 11:30:00'); + +-- 王五使用储值卡预约团课（状态：已预约） +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 = '晚间瑜伽_取消测试'), + (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_WANG'), + (SELECT id FROM member_card_record WHERE member_id = (SELECT id FROM member_user WHERE member_no = 'MEM_TEST_WANG')), + '2026-06-02 12:00:00', '0', '晚间瑜伽_取消测试', '2026-06-15 19:00:00', '2026-06-15 20:00:00', '瑜伽教室', + '2026-06-02 12:00:00', '2026-06-02 12:00:00'); + +-- ============================================ +-- 6. 更新团课当前预约人数 +-- ============================================ + +UPDATE group_course +SET current_members = current_members + 3 +WHERE course_name = '晚间瑜伽_取消测试'; + +-- ============================================ +-- 测试数据说明 +-- ============================================ +-- 用户信息： +-- 张三 (MEM_TEST_ZHANG): 13800002001 - 持有有效期内的时长卡 +-- 李四 (MEM_TEST_LI): 13800002002 - 持有次数卡（剩余5次） +-- 王五 (MEM_TEST_WANG): 13800002003 - 持有储值卡（余额200元） + +-- 测试场景： +-- 1. 张三使用时长卡预约了团课 -> 取消预约 -> 应恢复时长卡状态，释放课程名额 +-- 2. 李四使用次数卡预约了团课 -> 取消预约 -> 应返还扣除的次数，释放课程名额 +-- 3. 王五使用储值卡预约了团课 -> 取消预约 -> 应返还扣除的金额，释放课程名额 + +-- 预约记录状态说明： +-- status = '0' 表示已预约 +-- status = '1' 表示已取消（取消后应更新为此状态） diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V12__Insert_Time_Conflict_Test_Data.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V12__Insert_Time_Conflict_Test_Data.sql new file mode 100644 index 0000000..7189cce --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V12__Insert_Time_Conflict_Test_Data.sql @@ -0,0 +1,58 @@ +-- V12: 团课预约时间冲突测试数据 +-- 测试场景：会员预约两个时间重叠的团课时，系统应检测到时间冲突并拒绝预约 + +-- ============================================ +-- 1. 创建测试会员 +-- ============================================ + +INSERT INTO member_user (member_no, nickname, phone, gender, is_deleted, created_at, updated_at) VALUES + ('MEM_TIME_CONFLICT', '时间冲突测试会员', '13800009999', 1, false, '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +-- ============================================ +-- 2. 创建时间冲突的团课 +-- ============================================ + +-- 团课A: 6月15日 13:00 - 15:00 +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES + ('时间冲突测试_A_13点-15点', 102, 2, '2026-06-15 13:00:00', '2026-06-15 15:00:00', 20, 0, '0', '综合训练区', '测试用团课A，用于验证时间冲突检测', 1, 0.00, 'admin', '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +-- 团课B: 6月15日 14:00 - 16:00 (与团课A时间重叠) +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 + ('时间冲突测试_B_14点-16点', 103, 1, '2026-06-15 14:00:00', '2026-06-15 16:00:00', 15, 0, '0', '普拉提教室', '测试用团课B，与团课A时间重叠（14:00-15:00）', 1, 0.00, 'admin', '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +-- 团课C: 6月15日 10:00 - 12:00 (不冲突，作为对照) +INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, description, point_card_amount, stored_value_amount, create_by, created_at, updated_at) VALUES + ('时间冲突测试_C_10点-12点', 101, 1, '2026-06-15 10:00:00', '2026-06-15 12:00:00', 15, 0, '0', '瑜伽教室', '测试用团课C，与团课A/B不冲突', 1, 0.00, 'admin', '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +-- ============================================ +-- 3. 会员卡记录（用于预约） +-- ============================================ + +-- 为时间冲突测试会员创建有效次数卡 +INSERT INTO member_card_record (member_id, member_card_id, status, remaining_times, remaining_amount, expire_time, purchase_time, version, card_composition, created_at, updated_at) VALUES + ((SELECT id FROM member_user WHERE member_no = 'MEM_TIME_CONFLICT'), (SELECT member_card_id FROM member_card WHERE member_card_name = '10次卡'), 'ACTIVE', 10, 0.00, '2026-12-31 23:59:59', '2026-06-02 10:00:00', 0, '{}', '2026-06-02 10:00:00', '2026-06-02 10:00:00'); + +-- ============================================ +-- 4. 测试场景说明 +-- ============================================ +-- +-- 测试步骤： +-- 1. 使用会员 MEM_TIME_CONFLICT 预约团课A (course_name='时间冲突测试_A_13点-15点') +-- → 预期：预约成功 +-- +-- 2. 使用会员 MEM_TIME_CONFLICT 预约团课B (course_name='时间冲突测试_B_14点-16点') +-- → 预期：预约失败，提示时间冲突（14:00-15:00与已预约的团课A重叠） +-- +-- 3. 使用会员 MEM_TIME_CONFLICT 预约团课C (course_name='时间冲突测试_C_10点-12点') +-- → 预期：预约成功（与团课A时间不冲突） +-- +-- 时间冲突判断逻辑： +-- 新课程开始时间 < 已预约课程结束时间 AND 新课程结束时间 > 已预约课程开始时间 +-- 即：newStartTime < existingEndTime AND newEndTime > existingStartTime +-- +-- 本测试数据中的时间关系： +-- - 团课A: 13:00 - 15:00 +-- - 团课B: 14:00 - 16:00 +-- → 14:00 < 15:00 AND 16:00 > 13:00 → 冲突 +-- - 团课C: 10:00 - 12:00 +-- → 10:00 < 15:00 AND 12:00 > 13:00 → 12:00 > 13:00 不成立 → 不冲突 \ No newline at end of file diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql index 4aacedf..0e26497 100644 --- a/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_GroupCourse_table.sql @@ -16,6 +16,8 @@ CREATE TABLE IF NOT EXISTS group_course ( location VARCHAR(255), cover_image VARCHAR(500), description TEXT, + point_card_amount INTEGER DEFAULT 1, + stored_value_amount DECIMAL(10,2) DEFAULT 0, create_by VARCHAR(50), update_by VARCHAR(50), created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, @@ -52,6 +54,8 @@ COMMENT ON COLUMN group_course.status IS '状态（0正常 1已取消 2已结束 COMMENT ON COLUMN group_course.location IS '上课地点'; COMMENT ON COLUMN group_course.cover_image IS '封面图URL'; COMMENT ON COLUMN group_course.description IS '课程描述'; +COMMENT ON COLUMN group_course.point_card_amount IS '点卡额度（消耗次数）'; +COMMENT ON COLUMN group_course.stored_value_amount IS '储值卡额度（消耗金额）'; COMMENT ON COLUMN group_course.create_by IS '创建人'; COMMENT ON COLUMN group_course.update_by IS '更新人'; COMMENT ON COLUMN group_course.created_at IS '创建时间'; diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql index 5ff78b2..ee7adaa 100644 --- a/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_GroupCourse_test_data.sql @@ -1,6 +1,6 @@ -- 场景1: 0人预约，可预约（正常状态，6月15日，距开始还有14天） INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES - ('极速燃脂单车', 104, 2, '2026-06-15 19:30:00', '2026-06-15 20:20:00', 25, 0, 0, '单车房', '/images/spinning.jpg', '跟随音乐节奏变换阻力和速度，体验爬坡与冲刺的快感，一节课消耗800大卡。', 'admin', '2026-06-01 11:00:00', '2026-06-01 11:00:00'); + ('极速燃脂单车', 104, 2, '2026-06-02 16:45:00', '2026-06-15 20:20:00', 25, 0, 0, '单车房', '/images/spinning.jpg', '跟随音乐节奏变换阻力和速度，体验爬坡与冲刺的快感，一节课消耗800大卡。', 'admin', '2026-06-01 11:00:00', '2026-06-01 11:00:00'); -- 场景2: 已有人预约，可预约（正常状态，6月12日，5/15人） INSERT INTO group_course (course_name, coach_id, course_type, start_time, end_time, max_members, current_members, status, location, cover_image, description, create_by, created_at, updated_at) VALUES From 8bedac5ab5ee730c1017e354e17a9aaa0734b220 Mon Sep 17 00:00:00 2001 From: liwentao Date: Sun, 31 May 2026 15:07:44 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96uni-app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gym-manage-uniapp/.gitignore | 4 + gym-manage-uniapp/App.vue | 17 + gym-manage-uniapp/{src => }/api/index.js | 0 gym-manage-uniapp/common/style/base.css | 130 ++++ gym-manage-uniapp/examples/index.html | 570 ++++++++++++++++++ gym-manage-uniapp/index.html | 20 + gym-manage-uniapp/main.js | 22 + gym-manage-uniapp/manifest.json | 128 ++-- gym-manage-uniapp/package.json | 19 - gym-manage-uniapp/pages.json | 41 +- gym-manage-uniapp/pages/index/index.vue | 52 ++ gym-manage-uniapp/src/pages/index/index.vue | 40 -- gym-manage-uniapp/static/logo.png | Bin 0 -> 4023 bytes gym-manage-uniapp/{src => }/store/index.ts | 0 gym-manage-uniapp/{src => }/store/user.ts | 0 gym-manage-uniapp/uni.promisify.adaptor.js | 13 + gym-manage-uniapp/uni.scss | 76 +++ .../请在此文本文档内写入使用的第三方框架.txt | 1 + 18 files changed, 988 insertions(+), 145 deletions(-) create mode 100644 gym-manage-uniapp/.gitignore create mode 100644 gym-manage-uniapp/App.vue rename gym-manage-uniapp/{src => }/api/index.js (100%) create mode 100644 gym-manage-uniapp/common/style/base.css create mode 100644 gym-manage-uniapp/examples/index.html create mode 100644 gym-manage-uniapp/index.html create mode 100644 gym-manage-uniapp/main.js delete mode 100644 gym-manage-uniapp/package.json create mode 100644 gym-manage-uniapp/pages/index/index.vue delete mode 100644 gym-manage-uniapp/src/pages/index/index.vue create mode 100644 gym-manage-uniapp/static/logo.png rename gym-manage-uniapp/{src => }/store/index.ts (100%) rename gym-manage-uniapp/{src => }/store/user.ts (100%) create mode 100644 gym-manage-uniapp/uni.promisify.adaptor.js create mode 100644 gym-manage-uniapp/uni.scss create mode 100644 gym-manage-uniapp/请在此文本文档内写入使用的第三方框架.txt diff --git a/gym-manage-uniapp/.gitignore b/gym-manage-uniapp/.gitignore new file mode 100644 index 0000000..2370852 --- /dev/null +++ b/gym-manage-uniapp/.gitignore @@ -0,0 +1,4 @@ +node_modules/ +unpackage/ +.hbuilderx/ +.DS_Store diff --git a/gym-manage-uniapp/App.vue b/gym-manage-uniapp/App.vue new file mode 100644 index 0000000..8c2b732 --- /dev/null +++ b/gym-manage-uniapp/App.vue @@ -0,0 +1,17 @@ + + + diff --git a/gym-manage-uniapp/src/api/index.js b/gym-manage-uniapp/api/index.js similarity index 100% rename from gym-manage-uniapp/src/api/index.js rename to gym-manage-uniapp/api/index.js diff --git a/gym-manage-uniapp/common/style/base.css b/gym-manage-uniapp/common/style/base.css new file mode 100644 index 0000000..543d12a --- /dev/null +++ b/gym-manage-uniapp/common/style/base.css @@ -0,0 +1,130 @@ +/** + * ============================================ + * 健身房管理系统小程序 - 全局配色变量 + * 主题：活力运动风格 + * 主色调：深蓝专业 + 活力橙热情 + * 兼容暗色/浅色模式基础，保证可访问性 + * ============================================ + */ + +:root { + /* ========== 主品牌色 ========== */ + --primary-dark: #0B2B4B; /* 深蓝主色 - 用于头部导航栏、重要按钮、品牌标识，体现专业信赖感 */ + --primary-deep: #1A4A6F; /* 中深蓝色 - 用于hover状态、次级按钮、图标点缀，增加层次感 */ + --primary-light: #2C6288; /* 浅蓝色（预留）- 用于选中态或辅助背景，保持和谐渐变 */ + + /* ========== 强调/行动色 ========== */ + --accent-orange: #FF6B35; /* 活力橙 - 主要CTA按钮、会员标识、高亮徽章、关键数据，刺激行动力 */ + --accent-orange-light: #FF8C5A; /* 浅橙色 - hover轻量背景、渐变辅助，带来温暖运动感 */ + --accent-orange-dark: #E55A2B; /* 深橙色 - 按压状态或重要警告，保持色彩体系完整 */ + + /* ========== 背景色系 ========== */ + --bg-light: #F9FAFE; /* 全局浅灰蓝背景 - 柔和且提升深蓝/橙色的视觉舒适度 */ + --bg-white: #FFFFFF; /* 纯白卡片背景 - 用于内容卡片、表单区域，提高可读性与层次感 */ + --bg-gray: #F2F5F9; /* 浅灰辅助背景 - 分割区域或禁用态背景 */ + + /* ========== 文本色系 ========== */ + --text-dark: #1E2A3A; /* 主要文字 - 标题、正文，保证高对比度 */ + --text-muted: #5E6F8D; /* 辅助文字 - 次要信息、占位符，保持易读性 */ + --text-light: #8A99B4; /* 更浅文字 - 提示语、时间戳，但需注意与背景对比 */ + --text-inverse: #FFFFFF; /* 反白文字 - 深色/橙色背景上的文字 */ + + /* ========== 边框/分割线 ========== */ + --border-light: #E9EDF2; /* 浅边框 - 卡片分割、列表边界，细腻柔和 */ + --border-focus: #FF6B35; /* 聚焦边框 - 输入框选中或强调区域，使用橙色点缀 */ + + /* ========== 状态颜色（功能性） ========== */ + --success-green: #2ECC71; /* 成功绿 - 已完成课程、健康打卡 */ + --warning-amber: #F39C12; /* 警示橙黄 - 提醒、到期提示 */ + --error-red: #E74C3C; /* 错误红 - 异常情况或取消预约 */ + --info-blue: #3498DB; /* 信息蓝 - 提示气泡、帮助文字 */ + + /* ========== 渐变色 (提升活力感) ========== */ + --gradient-orange: linear-gradient(135deg, #FF6B35 0%, #FF8C5A 100%); /* 橙色渐变 - 会员按钮、重要徽章 */ + --gradient-blue: linear-gradient(135deg, #0B2B4B 0%, #1A4A6F 100%); /* 深蓝渐变 - 头部banner或特别卡片 */ + --gradient-subtle: linear-gradient(120deg, #F9FAFE 0%, #FFFFFF 100%); /* 微弱渐变 - 增加细节精致度 */ + + /* ========== 阴影层级 ========== */ + --shadow-sm: 0 8px 20px rgba(0, 0, 0, 0.03), 0 2px 6px rgba(0, 0, 0, 0.05); /* 卡片小阴影 轻量浮起 */ + --shadow-md: 0 12px 28px rgba(0, 0, 0, 0.08); /* 中等阴影 - 弹窗或下拉菜单 */ + --shadow-lg: 0 20px 35px rgba(0, 0, 0, 0.12); /* 大阴影 - 模态框、悬浮元素 */ + --shadow-orange-glow: 0 4px 12px rgba(255, 107, 53, 0.25); /* 橙色光晕 - 增强CTA吸引力 */ + + /* ========== 圆角规范 (柔和运动风) ========== */ + --radius-sm: 12px; /* 小组件、标签圆角 */ + --radius-md: 20px; /* 标准卡片圆角 */ + --radius-lg: 28px; /* 大容器、头部卡片圆角 */ + --radius-full: 999px; /* 胶囊按钮、头像完全圆角 */ + + /* ========== 布局与间距 ========== */ + --spacing-xs: 4px; + --spacing-sm: 8px; + --spacing-md: 16px; + --spacing-lg: 24px; + --spacing-xl: 32px; + + /* ========== 字体 (移动端优先) ========== */ + --font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif; + --font-size-xs: 0.7rem; /* 辅助标注 */ + --font-size-sm: 0.8rem; /* 次要文字 */ + --font-size-base: 0.9rem; /* 正文基准 */ + --font-size-md: 1rem; /* 小标题 */ + --font-size-lg: 1.2rem; /* 卡片标题 */ + --font-size-xl: 1.4rem; /* 大数字/欢迎语 */ + --font-weight-regular: 400; + --font-weight-medium: 500; + --font-weight-bold: 700; + --font-weight-extrabold: 800; +} + +/* ========== 暗色模式适配（可选，保持品牌一致性） ========== */ +@media (prefers-color-scheme: dark) { + :root { + /* 暗色模式下微调背景与文字，保留品牌色核心 */ + --bg-light: #121826; + --bg-white: #1E2636; + --bg-gray: #0F141F; + --text-dark: #EDF2F7; + --text-muted: #9AA9C1; + --border-light: #2A3346; + --shadow-sm: 0 8px 20px rgba(0, 0, 0, 0.4); + /* 保留主色深蓝与橙色不变，但可适当提高对比 */ + --primary-dark: #123A5E; /* 亮一点保证深色背景可见度 */ + --accent-orange: #FF7846; /* 稍微提亮橙色 */ + } +} + +/* ========== 辅助类 (方便开发直接复用) ========== */ +.bg-primary { + background-color: var(--primary-dark); +} +.bg-accent { + background-color: var(--accent-orange); +} +.text-primary { + color: var(--primary-dark); +} +.text-accent { + color: var(--accent-orange); +} +.btn-orange { + background: var(--gradient-orange); + color: white; + border: none; + border-radius: var(--radius-full); + padding: 10px 20px; + font-weight: var(--font-weight-bold); + box-shadow: var(--shadow-orange-glow); + transition: all 0.2s ease; +} +.btn-orange:active { + transform: scale(0.97); + background: var(--accent-orange-dark); +} +.card-default { + background: var(--bg-white); + border-radius: var(--radius-md); + box-shadow: var(--shadow-sm); + border: 1px solid var(--border-light); + padding: var(--spacing-md); +} \ No newline at end of file diff --git a/gym-manage-uniapp/examples/index.html b/gym-manage-uniapp/examples/index.html new file mode 100644 index 0000000..007f509 --- /dev/null +++ b/gym-manage-uniapp/examples/index.html @@ -0,0 +1,570 @@ + + + + + + 健身房管理系统 | 动感配色方案 + + + + + +
+ +
+ 9:41 + +
+ + +
+
+
+

IRONPULSE

+

智能健身 · 即刻燃动

+
+
+ + +
+
+ +
+
+

欢迎回来，

+

张峻铭 💪

+
+
MVP 黑金会员
+
+
+ + +
+
+ +
1,280
+
今日卡路里
+
+
+ +
126
+
运动分钟
+
+
+ +
12
+
本月课程
+
+
+ + +
+
签到
+
团课预约
+
体测报告
+
我的会籍
+
+ + +
+

热门团课

+ 查看全部 → +
+
+
+
+
+

极速燃脂 · 动感单车

+

张教练 | 综合有氧

+
+
19:30 满员
+
+
+
+
+

搏击风暴 · 泰拳基础

+

李娜 | 格斗区

+
+
18:00 火热
+
+
+
+
+

普拉提核心唤醒

+

Elena | 瑜伽室

+
+
明早 09:30
+
+
+ + +
+
+

🌟 明星私教推荐

+

Alex 王 · 增肌塑形专家

+

剩余3个时段可约

+
+
立即预约
+
+ + +
+
首页
+
日程
+
数据
+
我的
+
+
+ + +
+
+ 健身房管理系统 · 能量配色方案 +
+
+
+
+ 深蓝主色 #0B2B4B
专业信赖 +
+
+
+ 活力橙 #FF6B35
行动/热情 +
+
+
+ 深邃辅助 #1A4A6F +
+
+
+ 浅色背景 #F9FAFE +
+
+
+ 卡片白 #FFFFFF +
+
+
+
+ 设计理念：深蓝色传递专业与稳定感，活力橙色提升运动热情与CTA转化。
+ 圆润卡片 + 强烈对比，适合健身管理小程序的年轻、力量与现代氛围。 +
+
+ + + + \ No newline at end of file diff --git a/gym-manage-uniapp/index.html b/gym-manage-uniapp/index.html new file mode 100644 index 0000000..b5d330d --- /dev/null +++ b/gym-manage-uniapp/index.html @@ -0,0 +1,20 @@ + + + + + + + + + + +
+ + + diff --git a/gym-manage-uniapp/main.js b/gym-manage-uniapp/main.js new file mode 100644 index 0000000..c1caf36 --- /dev/null +++ b/gym-manage-uniapp/main.js @@ -0,0 +1,22 @@ +import App from './App' + +// #ifndef VUE3 +import Vue from 'vue' +import './uni.promisify.adaptor' +Vue.config.productionTip = false +App.mpType = 'app' +const app = new Vue({ + ...App +}) +app.$mount() +// #endif + +// #ifdef VUE3 +import { createSSRApp } from 'vue' +export function createApp() { + const app = createSSRApp(App) + return { + app + } +} +// #endif \ No newline at end of file diff --git a/gym-manage-uniapp/manifest.json b/gym-manage-uniapp/manifest.json index 39bd84f..702bf05 100644 --- a/gym-manage-uniapp/manifest.json +++ b/gym-manage-uniapp/manifest.json @@ -1,64 +1,72 @@ { - "name": "gym-manage-uniapp", - "appid": "", - "description": "Gym Management System Mobile App", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 + "name" : "gym-manage-uniapp", + "appid" : "", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + /* 5+App特有相关 */ + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + /* 模块配置 */ + "modules" : {}, + /* 应用发布信息 */ + "distribute" : { + /* android打包配置 */ + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios" : {}, + /* SDK配置 */ + "sdkConfigs" : {} + } }, - "modules": {}, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "ios": {}, - "sdkConfigs": {} - } - }, - "quickapp": {}, - "mp-weixin": { - "appid": "", - "setting": { - "urlCheck": false + /* 快应用特有相关 */ + "quickapp" : {}, + /* 小程序特有相关 */ + "mp-weixin" : { + "appid" : "", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true }, - "usingComponents": true - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - }, - "vueVersion": "3" + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "uniStatistics" : { + "enable" : false + }, + "vueVersion" : "3" } diff --git a/gym-manage-uniapp/package.json b/gym-manage-uniapp/package.json deleted file mode 100644 index c3506cd..0000000 --- a/gym-manage-uniapp/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "gym-manage-uniapp", - "version": "1.0.0", - "description": "Gym Management System Mobile App", - "main": "main.js", - "scripts": { - "dev:mp-weixin": "uni -p mp-weixin", - "build:mp-weixin": "uni build -p mp-weixin", - "dev:h5": "uni", - "build:h5": "uni build" - }, - "keywords": [ - "uniapp", - "gym", - "management" - ], - "author": "Novalon", - "license": "MIT" -} diff --git a/gym-manage-uniapp/pages.json b/gym-manage-uniapp/pages.json index bd13bd5..869105d 100644 --- a/gym-manage-uniapp/pages.json +++ b/gym-manage-uniapp/pages.json @@ -1,28 +1,17 @@ { - "pages": [ - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "首页" - } - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "健身房管理系统", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - }, - "tabBar": { - "color": "#7A7E83", - "selectedColor": "#007AFF", - "borderStyle": "black", - "backgroundColor": "#F8F8F8", - "list": [ - { - "pagePath": "pages/index/index", - "text": "首页" - } - ] - } + "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "uni-app" + } + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "uniIdRouter": {} } diff --git a/gym-manage-uniapp/pages/index/index.vue b/gym-manage-uniapp/pages/index/index.vue new file mode 100644 index 0000000..ec0ec26 --- /dev/null +++ b/gym-manage-uniapp/pages/index/index.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/gym-manage-uniapp/src/pages/index/index.vue b/gym-manage-uniapp/src/pages/index/index.vue deleted file mode 100644 index 5b7705f..0000000 --- a/gym-manage-uniapp/src/pages/index/index.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/gym-manage-uniapp/static/logo.png b/gym-manage-uniapp/static/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b5771e209bb677e2ebd5ff766ad5ee11790f305a GIT binary patch literal 4023 zcmaJ^c|25Y`#+XyC`+5OUafkYqmlSEl)+V zC53EJB$S8m@9Vz4*Y&-Yb3W(3Y;(d~fM1#)0003Cvn<7K1}HtM`$d{YenwQ;C^-S(Bw!dKGPRQ{5d$=<+Bb^=&62=9 zyT3g7ffNAnXPh^N0JjBz*>4v5+kn2(URc+5KlGCVF`&OikMw zfqqB8XK2+;V}LL3B>(G>)mVo1y5YXue4A!H*}eQbcg`t##g9HFply&`y$2%Ui`qzhj;o^=JbnXrW48s;xu1fDr z0))La)fp=QkX*N#V0eTJXiqO11AyvJlBY^iBrIQo0Kg>g;^BKnJ9a%2Wz`F2Ka;Jl zm*B>3H!<9`zg|z+c>6eWFMqydnvs-!J))2I(LEmNyxo~2!VjOpv<0SyMNVCup-60Z zm&|RDtd8R2HEIU!!OA0Ic6-G4K{`MZ8S%UjEL!s#vj{vLBWeqI(M&DkE;aT|aziV8 zRiTRN#GNwykvPx{R==`-rP>^pa`AyJ&s**Q!zU$j(pO&Q(YolGLT=2o0>3Wlhx?Gs z#|6b*$3F$ofzT`QIA#}2(Cg}Z?5V5KrtX)WrInh*aTCsP#{@V|*7<0lm`r^xmJQm^ z9n0J^3p#yCxWPX>G11)F(iv5vIIHkbqzdH37jX&JZ~&5AV*OAtL}axw*aLAt(b-!Vf)wRw=S8((e`~WLqlDBobRbj)NXB zS>W`fibSDA>uYN*&&Ml75iep!E%^%eV~SElj=}K;6TCNXs2gYG-L`En&3y~H9fP=W z(t?;5Xalv2F5ROUkg3?7C5~z>QYq|tok{Q}toT5u=~a9mBKDc4zfSM=`?OF-lS(V+pE1(m&x$HE_9vj;Cy)b@OiPMS0bs1 zRL9h?)T!I{4m1aY9>(pR_IDhF?wocEy=CU`m(5ry-&^rJJ*Bb^PfNARJ1{|*1e;FV zGljKhHo|}41Rg|1n&m~I3+-_gFQww-#b2u97o3fIsg67|%6`|aJX{~F&RPa;TayWd zp0l(=(QbROypp_fCeOBW3BJ5PJg@UU`&fs3hd{?U6&@7>mHWNEWnN`rWk>r%`fK|= z=BRVxb2I(y07{Nwj&jZtf{0iN;H%QAvaO1&8VKn8tp5f#! zN#ZlRm)#|IR8144l_=#8)5guWCE`B$T_;p_&0iWR+1=_>mDK1{*kw_8pi=2ewD%Z1 zSVG^6Mc(Vd()@@Y^wYz75Yz{X8jD_x*B)w5@yqn8>U#Kw-qzNvJjm)}wamur^knR_o)EvaGVkz%1gB=%{GIq3%OVcBFpT?D{PKZ079tIh|$fvf?svxl^`nuZV1~ zE?xILl^)O*=ufGhDH_pyUfNjteA>xd#yg*uvj~^Cbv&_EBt0-)!j4#crI>Uhq&0Oy z`b$;!qc=;1Sx>VD%ia^;erQ9!2)(mrrJ5zv;`SWLHu^Td;yik`Z7ioatGHn?aSD1m z@U+Y6wVHj_e`PD>_Noz^2O3?6Yg*5_BlMB@A05*?`Y-jlZ-m^4uDw+Y8A8@7g!P7H zgzZ?*UDN&1x{>g`ZiMkweBs14cdln#6I?YHr7!-)nyY$73 zckv0h$WfEY^%7rYR&g4G-pZL>Vy{3sVkc#OsI@6s?(5whAJqvO5)LEZTD6>Rdkl&h zHusOIlp{!GNUVm69y+XkTlKT;Lp%Ce`igQdYushcyC!}iq4eq#-2van)Ie{RuRq2g zH=9+-th`-$F*y3W=|Z{)eb0Wrxy$2?eT~S=V>Iq5|4fbS@l5+PI<90O)5aZFv- z{-7I*`r#90Z5HrSgU=dsgpnk5?TNyom7_`TM^@+iv+q@OQnFLB3o!zOw1-FDsZ|`T zu=YA~Bw1jbF-d$SlN|kOWn5vEwm2Z>A8FZD_z+WWBPebOEjbeGD(MZ=TPSr~@YnLZU)h_#alQiZu;syu@U^WCAXKCKVZHf%!^8wGMR7*MP@UWP13nuk#~M$mU% z$uszs);TA=a{4!`8Qm`Sn+rdD>w9SLzQ0p-yTPboznqn+ASr#=Td7#J^gVESP9li^ zi{+qONJ8-4_1gZ8&pUnyeZKH;^FF?wIQ-qc-o5j=ix69oFFJQK<>#B|k#6%g^Bx5= zg}8(qIXM{t>6)*e9mylb4~qA6z6x{v$(W(tnHt&{T|3_Cyxupzb2YZJuAEW2NM+wC zy^Cm4Xp*b$U?3N6t(SESgt9ByRYOfRav2BL4L5BTyMExBieFo==ue&BT!*e)T3lo5 zDDLL`TT0PQo#}RDFM1G`iU*85$sTyH1rh6w$KbJ^jI%9xJpkZ2Ot5#RJ6l;IaAcw? zc1uS!m`LHE0YJ|nn1aRm;pt!xyf=Y_gs`91LBIr0B*Y1BrDjDz;e80`5Gvj-jfh?28eh%7933UC(#hWNXRd{2+nv*426JysnGq9kiSVeTiJk7WGWsE zSJhI%!8FvtM|D(Ta2<7RO=YmU8cYkSrU`}VsK7K3oKsT`{QH1#yiq;95Ev7)-@Z6A zB*ceKry!uvpr9btAPrSA)tiIW(SfR|L)Fz)I2tN628oUhRw2<8{#Y=<({NM*g-#%o zz*`ov9^?Qz62f8ncL+p^mDN9nNwnXI;-m~3jHN(fs%lUoaVxH0+B7-_|6dyas!g+J zQ1DO;o<-jJ7|Hhj9zgQ@T40Nl&|EJ)8M4T?#8vfJ1oXI~g0G`C@dMc;A zjqo=rI2*RN7A8ja!Tlbd0QX!*+E1x@K*^ZD{)%J_pe^QRp=+j?jCO1cZN?ryPlN&29$7&Ac>xMM*DwQ*NxtIV%NlmI`lJr2JVZ!|SUM)s{m5-r-hrCim zGEunpTX?76P{|0K32-Ym!wnJFjcNAROWZ-AL8+J1F_-(QHNzMCON{8s2|iO0D*vNr zQhflINtwvCi<$Z|n(_I*HbSmD?h6-!bQZ5=hQ8L&m)|I~)%u)gyCW_QRg`w5P~OC1 z%uCbu%`2nB5zR=>{took!+yKEDi`b>pzAf)^KDGtUM8R*t#G@mH2=PKe4(Ipz-y*c zc~Kzl;GA)s+53_RGg-}F1`$4QjX29!BLu$pn{&KmMu86HO}Y2@q{Jb7v=N}{+PQWx zHF2LIb9qiO+DI~r+eb9ubK7oh6KFdUL6e;9wKv_RvXh$HuqHw)inh2kQGM>}%G4V% zmjkEYsw}?{m%gW>#P7wTXwk}cZO--qydYul`!3w~l(JgX@=yG7|6z{6kO^>c^P;zI zAmO}-iEA~6%U7@PbJN4EXW!v;|5owjl2$w4ZZqafWPCshmRxS}7Zwlg(*rDz;hg}s SYs}WS&%*SCNx89m_ { + res.then((res) => { + if (!res) return resolve(res) + return res[0] ? reject(res[0]) : resolve(res[1]) + }); + }); + }, +}); \ No newline at end of file diff --git a/gym-manage-uniapp/uni.scss b/gym-manage-uniapp/uni.scss new file mode 100644 index 0000000..b9249e9 --- /dev/null +++ b/gym-manage-uniapp/uni.scss @@ -0,0 +1,76 @@ +/** + * 这里是uni-app内置的常用样式变量 + * + * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量 + * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App + * + */ + +/** + * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能 + * + * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件 + */ + +/* 颜色变量 */ + +/* 行为相关颜色 */ +$uni-color-primary: #007aff; +$uni-color-success: #4cd964; +$uni-color-warning: #f0ad4e; +$uni-color-error: #dd524d; + +/* 文字基本颜色 */ +$uni-text-color:#333;//基本色 +$uni-text-color-inverse:#fff;//反色 +$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息 +$uni-text-color-placeholder: #808080; +$uni-text-color-disable:#c0c0c0; + +/* 背景颜色 */ +$uni-bg-color:#ffffff; +$uni-bg-color-grey:#f8f8f8; +$uni-bg-color-hover:#f1f1f1;//点击状态颜色 +$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色 + +/* 边框颜色 */ +$uni-border-color:#c8c7cc; + +/* 尺寸变量 */ + +/* 文字尺寸 */ +$uni-font-size-sm:12px; +$uni-font-size-base:14px; +$uni-font-size-lg:16px; + +/* 图片尺寸 */ +$uni-img-size-sm:20px; +$uni-img-size-base:26px; +$uni-img-size-lg:40px; + +/* Border Radius */ +$uni-border-radius-sm: 2px; +$uni-border-radius-base: 3px; +$uni-border-radius-lg: 6px; +$uni-border-radius-circle: 50%; + +/* 水平间距 */ +$uni-spacing-row-sm: 5px; +$uni-spacing-row-base: 10px; +$uni-spacing-row-lg: 15px; + +/* 垂直间距 */ +$uni-spacing-col-sm: 4px; +$uni-spacing-col-base: 8px; +$uni-spacing-col-lg: 12px; + +/* 透明度 */ +$uni-opacity-disabled: 0.3; // 组件禁用态的透明度 + +/* 文章场景相关 */ +$uni-color-title: #2C405A; // 文章标题颜色 +$uni-font-size-title:20px; +$uni-color-subtitle: #555555; // 二级标题颜色 +$uni-font-size-subtitle:26px; +$uni-color-paragraph: #3F536E; // 文章段落颜色 +$uni-font-size-paragraph:15px; diff --git a/gym-manage-uniapp/请在此文本文档内写入使用的第三方框架.txt b/gym-manage-uniapp/请在此文本文档内写入使用的第三方框架.txt new file mode 100644 index 0000000..848ecae --- /dev/null +++ b/gym-manage-uniapp/请在此文本文档内写入使用的第三方框架.txt @@ -0,0 +1 @@ +// 任何第三方框架，包括图标库，字体等都需要写在这里，并附上网址。 \ No newline at end of file From 2b58b672d5465351481231e052bed4b5f40a10f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=B6=E8=88=9F=E5=B9=B4?= <3147056268@qq.com> Date: Sun, 31 May 2026 17:33:40 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8FAPPID=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gym-manage-uniapp/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gym-manage-uniapp/manifest.json b/gym-manage-uniapp/manifest.json index 702bf05..b801dbc 100644 --- a/gym-manage-uniapp/manifest.json +++ b/gym-manage-uniapp/manifest.json @@ -1,6 +1,6 @@ { "name" : "gym-manage-uniapp", - "appid" : "", + "appid" : "__UNI__1F1874C", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", @@ -50,7 +50,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "", + "appid" : "wx8278fdbc9f158915", "setting" : { "urlCheck" : false }, From f0d97e58d1f425cedd464ca8e6ea3f12edd2e6bd Mon Sep 17 00:00:00 2001 From: future <1360317836@qq.com> Date: Mon, 1 Jun 2026 19:57:43 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gym-manage-uniapp/App.vue | 13 +- gym-manage-uniapp/components/TabBar.vue | 99 +++ .../components/index/BannerSwiper.vue | 171 +++++ .../components/index/QuickEntry.vue | 115 +++ .../components/index/RecommendCourses.vue | 291 ++++++++ .../components/index/TodayRecommend.vue | 213 ++++++ gym-manage-uniapp/pages.json | 2 +- gym-manage-uniapp/pages/index/index.vue | 81 +-- .../uni_modules/uni-icons/changelog.md | 44 ++ .../components/uni-icons/uni-icons.uvue | 91 +++ .../components/uni-icons/uni-icons.vue | 110 +++ .../components/uni-icons/uniicons.css | 664 ++++++++++++++++++ .../components/uni-icons/uniicons.ttf | Bin 0 -> 35824 bytes .../components/uni-icons/uniicons_file.ts | 664 ++++++++++++++++++ .../components/uni-icons/uniicons_file_vue.js | 649 +++++++++++++++++ .../uni_modules/uni-icons/package.json | 111 +++ .../uni_modules/uni-icons/readme.md | 8 + .../uni_modules/uni-scss/changelog.md | 8 + .../uni_modules/uni-scss/index.scss | 1 + .../uni_modules/uni-scss/package.json | 82 +++ .../uni_modules/uni-scss/readme.md | 4 + .../uni_modules/uni-scss/styles/index.scss | 7 + .../uni-scss/styles/setting/_border.scss | 3 + .../uni-scss/styles/setting/_color.scss | 66 ++ .../uni-scss/styles/setting/_radius.scss | 55 ++ .../uni-scss/styles/setting/_space.scss | 56 ++ .../uni-scss/styles/setting/_styles.scss | 167 +++++ .../uni-scss/styles/setting/_text.scss | 24 + .../uni-scss/styles/setting/_variables.scss | 146 ++++ .../uni-scss/styles/tools/functions.scss | 19 + .../uni_modules/uni-scss/theme.scss | 31 + .../uni_modules/uni-scss/variables.scss | 62 ++ 32 files changed, 4009 insertions(+), 48 deletions(-) create mode 100644 gym-manage-uniapp/components/TabBar.vue create mode 100644 gym-manage-uniapp/components/index/BannerSwiper.vue create mode 100644 gym-manage-uniapp/components/index/QuickEntry.vue create mode 100644 gym-manage-uniapp/components/index/RecommendCourses.vue create mode 100644 gym-manage-uniapp/components/index/TodayRecommend.vue create mode 100644 gym-manage-uniapp/uni_modules/uni-icons/changelog.md create mode 100644 gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue create mode 100644 gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uni-icons.vue create mode 100644 gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons.css create mode 100644 gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons.ttf create mode 100644 gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts create mode 100644 gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js create mode 100644 gym-manage-uniapp/uni_modules/uni-icons/package.json create mode 100644 gym-manage-uniapp/uni_modules/uni-icons/readme.md create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/changelog.md create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/index.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/package.json create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/readme.md create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/styles/index.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_border.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_color.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_radius.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_space.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_styles.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_text.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_variables.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/styles/tools/functions.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/theme.scss create mode 100644 gym-manage-uniapp/uni_modules/uni-scss/variables.scss diff --git a/gym-manage-uniapp/App.vue b/gym-manage-uniapp/App.vue index 8c2b732..dabb9d5 100644 --- a/gym-manage-uniapp/App.vue +++ b/gym-manage-uniapp/App.vue @@ -10,8 +10,19 @@ console.log('App Hide') } } + - diff --git a/gym-manage-uniapp/components/TabBar.vue b/gym-manage-uniapp/components/TabBar.vue new file mode 100644 index 0000000..d341948 --- /dev/null +++ b/gym-manage-uniapp/components/TabBar.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/gym-manage-uniapp/components/index/BannerSwiper.vue b/gym-manage-uniapp/components/index/BannerSwiper.vue new file mode 100644 index 0000000..25eb838 --- /dev/null +++ b/gym-manage-uniapp/components/index/BannerSwiper.vue @@ -0,0 +1,171 @@ + + + + + diff --git a/gym-manage-uniapp/components/index/QuickEntry.vue b/gym-manage-uniapp/components/index/QuickEntry.vue new file mode 100644 index 0000000..faa9373 --- /dev/null +++ b/gym-manage-uniapp/components/index/QuickEntry.vue @@ -0,0 +1,115 @@ + + + + + diff --git a/gym-manage-uniapp/components/index/RecommendCourses.vue b/gym-manage-uniapp/components/index/RecommendCourses.vue new file mode 100644 index 0000000..2d50868 --- /dev/null +++ b/gym-manage-uniapp/components/index/RecommendCourses.vue @@ -0,0 +1,291 @@ + + + + + diff --git a/gym-manage-uniapp/components/index/TodayRecommend.vue b/gym-manage-uniapp/components/index/TodayRecommend.vue new file mode 100644 index 0000000..8e73eca --- /dev/null +++ b/gym-manage-uniapp/components/index/TodayRecommend.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/gym-manage-uniapp/pages.json b/gym-manage-uniapp/pages.json index 869105d..2f03bac 100644 --- a/gym-manage-uniapp/pages.json +++ b/gym-manage-uniapp/pages.json @@ -3,7 +3,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "uni-app" + "navigationBarTitleText": "健身房" } } ], diff --git a/gym-manage-uniapp/pages/index/index.vue b/gym-manage-uniapp/pages/index/index.vue index ec0ec26..8257a92 100644 --- a/gym-manage-uniapp/pages/index/index.vue +++ b/gym-manage-uniapp/pages/index/index.vue @@ -1,52 +1,41 @@ - - +.bottom-placeholder { + height: 40rpx; +} + \ No newline at end of file diff --git a/gym-manage-uniapp/uni_modules/uni-icons/changelog.md b/gym-manage-uniapp/uni_modules/uni-icons/changelog.md new file mode 100644 index 0000000..62e7682 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-icons/changelog.md @@ -0,0 +1,44 @@ +## 2.0.12（2025-08-26） +- 优化 uni-app x 下 size 类型问题 +## 2.0.11（2025-08-18） +- 修复 图标点击事件返回 +## 2.0.9（2024-01-12） +fix: 修复图标大小默认值错误的问题 +## 2.0.8（2023-12-14） +- 修复 项目未使用 ts 情况下，打包报错的bug +## 2.0.7（2023-12-14） +- 修复 size 属性为 string 时，不加单位导致尺寸异常的bug +## 2.0.6（2023-12-11） +- 优化 兼容老版本icon类型，如 top ，bottom 等 +## 2.0.5（2023-12-11） +- 优化 兼容老版本icon类型，如 top ，bottom 等 +## 2.0.4（2023-12-06） +- 优化 uni-app x 下示例项目图标排序 +## 2.0.3（2023-12-06） +- 修复 nvue下引入组件报错的bug +## 2.0.2（2023-12-05） +-优化 size 属性支持单位 +## 2.0.1（2023-12-05） +- 新增 uni-app x 支持定义图标 +## 1.3.5（2022-01-24） +- 优化 size 属性可以传入不带单位的字符串数值 +## 1.3.4（2022-01-24） +- 优化 size 支持其他单位 +## 1.3.3（2022-01-17） +- 修复 nvue 有些图标不显示的bug，兼容老版本图标 +## 1.3.2（2021-12-01） +- 优化 示例可复制图标名称 +## 1.3.1（2021-11-23） +- 优化 兼容旧组件 type 值 +## 1.3.0（2021-11-19） +- 新增 更多图标 +- 优化 自定义图标使用方式 +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons) +## 1.1.7（2021-11-08） +## 1.2.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.1.5（2021-05-12） +- 新增 组件示例地址 +## 1.1.4（2021-02-05） +- 调整为uni_modules目录规范 diff --git a/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue new file mode 100644 index 0000000..53eb2ea --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue @@ -0,0 +1,91 @@ + + + + + diff --git a/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uni-icons.vue new file mode 100644 index 0000000..1bd3d5e --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uni-icons.vue @@ -0,0 +1,110 @@ + + + + + \ No newline at end of file diff --git a/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons.css b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons.css new file mode 100644 index 0000000..0a6b6fe --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons.css @@ -0,0 +1,664 @@ + +.uniui-cart-filled:before { + content: "\e6d0"; +} + +.uniui-gift-filled:before { + content: "\e6c4"; +} + +.uniui-color:before { + content: "\e6cf"; +} + +.uniui-wallet:before { + content: "\e6b1"; +} + +.uniui-settings-filled:before { + content: "\e6ce"; +} + +.uniui-auth-filled:before { + content: "\e6cc"; +} + +.uniui-shop-filled:before { + content: "\e6cd"; +} + +.uniui-staff-filled:before { + content: "\e6cb"; +} + +.uniui-vip-filled:before { + content: "\e6c6"; +} + +.uniui-plus-filled:before { + content: "\e6c7"; +} + +.uniui-folder-add-filled:before { + content: "\e6c8"; +} + +.uniui-color-filled:before { + content: "\e6c9"; +} + +.uniui-tune-filled:before { + content: "\e6ca"; +} + +.uniui-calendar-filled:before { + content: "\e6c0"; +} + +.uniui-notification-filled:before { + content: "\e6c1"; +} + +.uniui-wallet-filled:before { + content: "\e6c2"; +} + +.uniui-medal-filled:before { + content: "\e6c3"; +} + +.uniui-fire-filled:before { + content: "\e6c5"; +} + +.uniui-refreshempty:before { + content: "\e6bf"; +} + +.uniui-location-filled:before { + content: "\e6af"; +} + +.uniui-person-filled:before { + content: "\e69d"; +} + +.uniui-personadd-filled:before { + content: "\e698"; +} + +.uniui-arrowthinleft:before { + content: "\e6d2"; +} + +.uniui-arrowthinup:before { + content: "\e6d3"; +} + +.uniui-arrowthindown:before { + content: "\e6d4"; +} + +.uniui-back:before { + content: "\e6b9"; +} + +.uniui-forward:before { + content: "\e6ba"; +} + +.uniui-arrow-right:before { + content: "\e6bb"; +} + +.uniui-arrow-left:before { + content: "\e6bc"; +} + +.uniui-arrow-up:before { + content: "\e6bd"; +} + +.uniui-arrow-down:before { + content: "\e6be"; +} + +.uniui-arrowthinright:before { + content: "\e6d1"; +} + +.uniui-down:before { + content: "\e6b8"; +} + +.uniui-bottom:before { + content: "\e6b8"; +} + +.uniui-arrowright:before { + content: "\e6d5"; +} + +.uniui-right:before { + content: "\e6b5"; +} + +.uniui-up:before { + content: "\e6b6"; +} + +.uniui-top:before { + content: "\e6b6"; +} + +.uniui-left:before { + content: "\e6b7"; +} + +.uniui-arrowup:before { + content: "\e6d6"; +} + +.uniui-eye:before { + content: "\e651"; +} + +.uniui-eye-filled:before { + content: "\e66a"; +} + +.uniui-eye-slash:before { + content: "\e6b3"; +} + +.uniui-eye-slash-filled:before { + content: "\e6b4"; +} + +.uniui-info-filled:before { + content: "\e649"; +} + +.uniui-reload:before { + content: "\e6b2"; +} + +.uniui-micoff-filled:before { + content: "\e6b0"; +} + +.uniui-map-pin-ellipse:before { + content: "\e6ac"; +} + +.uniui-map-pin:before { + content: "\e6ad"; +} + +.uniui-location:before { + content: "\e6ae"; +} + +.uniui-starhalf:before { + content: "\e683"; +} + +.uniui-star:before { + content: "\e688"; +} + +.uniui-star-filled:before { + content: "\e68f"; +} + +.uniui-calendar:before { + content: "\e6a0"; +} + +.uniui-fire:before { + content: "\e6a1"; +} + +.uniui-medal:before { + content: "\e6a2"; +} + +.uniui-font:before { + content: "\e6a3"; +} + +.uniui-gift:before { + content: "\e6a4"; +} + +.uniui-link:before { + content: "\e6a5"; +} + +.uniui-notification:before { + content: "\e6a6"; +} + +.uniui-staff:before { + content: "\e6a7"; +} + +.uniui-vip:before { + content: "\e6a8"; +} + +.uniui-folder-add:before { + content: "\e6a9"; +} + +.uniui-tune:before { + content: "\e6aa"; +} + +.uniui-auth:before { + content: "\e6ab"; +} + +.uniui-person:before { + content: "\e699"; +} + +.uniui-email-filled:before { + content: "\e69a"; +} + +.uniui-phone-filled:before { + content: "\e69b"; +} + +.uniui-phone:before { + content: "\e69c"; +} + +.uniui-email:before { + content: "\e69e"; +} + +.uniui-personadd:before { + content: "\e69f"; +} + +.uniui-chatboxes-filled:before { + content: "\e692"; +} + +.uniui-contact:before { + content: "\e693"; +} + +.uniui-chatbubble-filled:before { + content: "\e694"; +} + +.uniui-contact-filled:before { + content: "\e695"; +} + +.uniui-chatboxes:before { + content: "\e696"; +} + +.uniui-chatbubble:before { + content: "\e697"; +} + +.uniui-upload-filled:before { + content: "\e68e"; +} + +.uniui-upload:before { + content: "\e690"; +} + +.uniui-weixin:before { + content: "\e691"; +} + +.uniui-compose:before { + content: "\e67f"; +} + +.uniui-qq:before { + content: "\e680"; +} + +.uniui-download-filled:before { + content: "\e681"; +} + +.uniui-pyq:before { + content: "\e682"; +} + +.uniui-sound:before { + content: "\e684"; +} + +.uniui-trash-filled:before { + content: "\e685"; +} + +.uniui-sound-filled:before { + content: "\e686"; +} + +.uniui-trash:before { + content: "\e687"; +} + +.uniui-videocam-filled:before { + content: "\e689"; +} + +.uniui-spinner-cycle:before { + content: "\e68a"; +} + +.uniui-weibo:before { + content: "\e68b"; +} + +.uniui-videocam:before { + content: "\e68c"; +} + +.uniui-download:before { + content: "\e68d"; +} + +.uniui-help:before { + content: "\e679"; +} + +.uniui-navigate-filled:before { + content: "\e67a"; +} + +.uniui-plusempty:before { + content: "\e67b"; +} + +.uniui-smallcircle:before { + content: "\e67c"; +} + +.uniui-minus-filled:before { + content: "\e67d"; +} + +.uniui-micoff:before { + content: "\e67e"; +} + +.uniui-closeempty:before { + content: "\e66c"; +} + +.uniui-clear:before { + content: "\e66d"; +} + +.uniui-navigate:before { + content: "\e66e"; +} + +.uniui-minus:before { + content: "\e66f"; +} + +.uniui-image:before { + content: "\e670"; +} + +.uniui-mic:before { + content: "\e671"; +} + +.uniui-paperplane:before { + content: "\e672"; +} + +.uniui-close:before { + content: "\e673"; +} + +.uniui-help-filled:before { + content: "\e674"; +} + +.uniui-paperplane-filled:before { + content: "\e675"; +} + +.uniui-plus:before { + content: "\e676"; +} + +.uniui-mic-filled:before { + content: "\e677"; +} + +.uniui-image-filled:before { + content: "\e678"; +} + +.uniui-locked-filled:before { + content: "\e668"; +} + +.uniui-info:before { + content: "\e669"; +} + +.uniui-locked:before { + content: "\e66b"; +} + +.uniui-camera-filled:before { + content: "\e658"; +} + +.uniui-chat-filled:before { + content: "\e659"; +} + +.uniui-camera:before { + content: "\e65a"; +} + +.uniui-circle:before { + content: "\e65b"; +} + +.uniui-checkmarkempty:before { + content: "\e65c"; +} + +.uniui-chat:before { + content: "\e65d"; +} + +.uniui-circle-filled:before { + content: "\e65e"; +} + +.uniui-flag:before { + content: "\e65f"; +} + +.uniui-flag-filled:before { + content: "\e660"; +} + +.uniui-gear-filled:before { + content: "\e661"; +} + +.uniui-home:before { + content: "\e662"; +} + +.uniui-home-filled:before { + content: "\e663"; +} + +.uniui-gear:before { + content: "\e664"; +} + +.uniui-smallcircle-filled:before { + content: "\e665"; +} + +.uniui-map-filled:before { + content: "\e666"; +} + +.uniui-map:before { + content: "\e667"; +} + +.uniui-refresh-filled:before { + content: "\e656"; +} + +.uniui-refresh:before { + content: "\e657"; +} + +.uniui-cloud-upload:before { + content: "\e645"; +} + +.uniui-cloud-download-filled:before { + content: "\e646"; +} + +.uniui-cloud-download:before { + content: "\e647"; +} + +.uniui-cloud-upload-filled:before { + content: "\e648"; +} + +.uniui-redo:before { + content: "\e64a"; +} + +.uniui-images-filled:before { + content: "\e64b"; +} + +.uniui-undo-filled:before { + content: "\e64c"; +} + +.uniui-more:before { + content: "\e64d"; +} + +.uniui-more-filled:before { + content: "\e64e"; +} + +.uniui-undo:before { + content: "\e64f"; +} + +.uniui-images:before { + content: "\e650"; +} + +.uniui-paperclip:before { + content: "\e652"; +} + +.uniui-settings:before { + content: "\e653"; +} + +.uniui-search:before { + content: "\e654"; +} + +.uniui-redo-filled:before { + content: "\e655"; +} + +.uniui-list:before { + content: "\e644"; +} + +.uniui-mail-open-filled:before { + content: "\e63a"; +} + +.uniui-hand-down-filled:before { + content: "\e63c"; +} + +.uniui-hand-down:before { + content: "\e63d"; +} + +.uniui-hand-up-filled:before { + content: "\e63e"; +} + +.uniui-hand-up:before { + content: "\e63f"; +} + +.uniui-heart-filled:before { + content: "\e641"; +} + +.uniui-mail-open:before { + content: "\e643"; +} + +.uniui-heart:before { + content: "\e639"; +} + +.uniui-loop:before { + content: "\e633"; +} + +.uniui-pulldown:before { + content: "\e632"; +} + +.uniui-scan:before { + content: "\e62a"; +} + +.uniui-bars:before { + content: "\e627"; +} + +.uniui-checkbox:before { + content: "\e62b"; +} + +.uniui-checkbox-filled:before { + content: "\e62c"; +} + +.uniui-shop:before { + content: "\e62f"; +} + +.uniui-headphones:before { + content: "\e630"; +} + +.uniui-cart:before { + content: "\e631"; +} diff --git a/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons.ttf new file mode 100644 index 0000000000000000000000000000000000000000..14696d038d828073edac09ea4e5ba1dec2f58115 GIT binary patch literal 35824 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 F{2S@rCxHL} literal 0 HcmV?d00001 diff --git a/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts new file mode 100644 index 0000000..98e93aa --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts @@ -0,0 +1,664 @@ + +export type IconsData = { + id : string + name : string + font_family : string + css_prefix_text : string + description : string + glyphs : Array +} + +export type IconsDataItem = { + font_class : string + unicode : string +} + + +export const fontData = [ + { + "font_class": "arrow-down", + "unicode": "\ue6be" + }, + { + "font_class": "arrow-left", + "unicode": "\ue6bc" + }, + { + "font_class": "arrow-right", + "unicode": "\ue6bb" + }, + { + "font_class": "arrow-up", + "unicode": "\ue6bd" + }, + { + "font_class": "auth", + "unicode": "\ue6ab" + }, + { + "font_class": "auth-filled", + "unicode": "\ue6cc" + }, + { + "font_class": "back", + "unicode": "\ue6b9" + }, + { + "font_class": "bars", + "unicode": "\ue627" + }, + { + "font_class": "calendar", + "unicode": "\ue6a0" + }, + { + "font_class": "calendar-filled", + "unicode": "\ue6c0" + }, + { + "font_class": "camera", + "unicode": "\ue65a" + }, + { + "font_class": "camera-filled", + "unicode": "\ue658" + }, + { + "font_class": "cart", + "unicode": "\ue631" + }, + { + "font_class": "cart-filled", + "unicode": "\ue6d0" + }, + { + "font_class": "chat", + "unicode": "\ue65d" + }, + { + "font_class": "chat-filled", + "unicode": "\ue659" + }, + { + "font_class": "chatboxes", + "unicode": "\ue696" + }, + { + "font_class": "chatboxes-filled", + "unicode": "\ue692" + }, + { + "font_class": "chatbubble", + "unicode": "\ue697" + }, + { + "font_class": "chatbubble-filled", + "unicode": "\ue694" + }, + { + "font_class": "checkbox", + "unicode": "\ue62b" + }, + { + "font_class": "checkbox-filled", + "unicode": "\ue62c" + }, + { + "font_class": "checkmarkempty", + "unicode": "\ue65c" + }, + { + "font_class": "circle", + "unicode": "\ue65b" + }, + { + "font_class": "circle-filled", + "unicode": "\ue65e" + }, + { + "font_class": "clear", + "unicode": "\ue66d" + }, + { + "font_class": "close", + "unicode": "\ue673" + }, + { + "font_class": "closeempty", + "unicode": "\ue66c" + }, + { + "font_class": "cloud-download", + "unicode": "\ue647" + }, + { + "font_class": "cloud-download-filled", + "unicode": "\ue646" + }, + { + "font_class": "cloud-upload", + "unicode": "\ue645" + }, + { + "font_class": "cloud-upload-filled", + "unicode": "\ue648" + }, + { + "font_class": "color", + "unicode": "\ue6cf" + }, + { + "font_class": "color-filled", + "unicode": "\ue6c9" + }, + { + "font_class": "compose", + "unicode": "\ue67f" + }, + { + "font_class": "contact", + "unicode": "\ue693" + }, + { + "font_class": "contact-filled", + "unicode": "\ue695" + }, + { + "font_class": "down", + "unicode": "\ue6b8" + }, + { + "font_class": "bottom", + "unicode": "\ue6b8" + }, + { + "font_class": "download", + "unicode": "\ue68d" + }, + { + "font_class": "download-filled", + "unicode": "\ue681" + }, + { + "font_class": "email", + "unicode": "\ue69e" + }, + { + "font_class": "email-filled", + "unicode": "\ue69a" + }, + { + "font_class": "eye", + "unicode": "\ue651" + }, + { + "font_class": "eye-filled", + "unicode": "\ue66a" + }, + { + "font_class": "eye-slash", + "unicode": "\ue6b3" + }, + { + "font_class": "eye-slash-filled", + "unicode": "\ue6b4" + }, + { + "font_class": "fire", + "unicode": "\ue6a1" + }, + { + "font_class": "fire-filled", + "unicode": "\ue6c5" + }, + { + "font_class": "flag", + "unicode": "\ue65f" + }, + { + "font_class": "flag-filled", + "unicode": "\ue660" + }, + { + "font_class": "folder-add", + "unicode": "\ue6a9" + }, + { + "font_class": "folder-add-filled", + "unicode": "\ue6c8" + }, + { + "font_class": "font", + "unicode": "\ue6a3" + }, + { + "font_class": "forward", + "unicode": "\ue6ba" + }, + { + "font_class": "gear", + "unicode": "\ue664" + }, + { + "font_class": "gear-filled", + "unicode": "\ue661" + }, + { + "font_class": "gift", + "unicode": "\ue6a4" + }, + { + "font_class": "gift-filled", + "unicode": "\ue6c4" + }, + { + "font_class": "hand-down", + "unicode": "\ue63d" + }, + { + "font_class": "hand-down-filled", + "unicode": "\ue63c" + }, + { + "font_class": "hand-up", + "unicode": "\ue63f" + }, + { + "font_class": "hand-up-filled", + "unicode": "\ue63e" + }, + { + "font_class": "headphones", + "unicode": "\ue630" + }, + { + "font_class": "heart", + "unicode": "\ue639" + }, + { + "font_class": "heart-filled", + "unicode": "\ue641" + }, + { + "font_class": "help", + "unicode": "\ue679" + }, + { + "font_class": "help-filled", + "unicode": "\ue674" + }, + { + "font_class": "home", + "unicode": "\ue662" + }, + { + "font_class": "home-filled", + "unicode": "\ue663" + }, + { + "font_class": "image", + "unicode": "\ue670" + }, + { + "font_class": "image-filled", + "unicode": "\ue678" + }, + { + "font_class": "images", + "unicode": "\ue650" + }, + { + "font_class": "images-filled", + "unicode": "\ue64b" + }, + { + "font_class": "info", + "unicode": "\ue669" + }, + { + "font_class": "info-filled", + "unicode": "\ue649" + }, + { + "font_class": "left", + "unicode": "\ue6b7" + }, + { + "font_class": "link", + "unicode": "\ue6a5" + }, + { + "font_class": "list", + "unicode": "\ue644" + }, + { + "font_class": "location", + "unicode": "\ue6ae" + }, + { + "font_class": "location-filled", + "unicode": "\ue6af" + }, + { + "font_class": "locked", + "unicode": "\ue66b" + }, + { + "font_class": "locked-filled", + "unicode": "\ue668" + }, + { + "font_class": "loop", + "unicode": "\ue633" + }, + { + "font_class": "mail-open", + "unicode": "\ue643" + }, + { + "font_class": "mail-open-filled", + "unicode": "\ue63a" + }, + { + "font_class": "map", + "unicode": "\ue667" + }, + { + "font_class": "map-filled", + "unicode": "\ue666" + }, + { + "font_class": "map-pin", + "unicode": "\ue6ad" + }, + { + "font_class": "map-pin-ellipse", + "unicode": "\ue6ac" + }, + { + "font_class": "medal", + "unicode": "\ue6a2" + }, + { + "font_class": "medal-filled", + "unicode": "\ue6c3" + }, + { + "font_class": "mic", + "unicode": "\ue671" + }, + { + "font_class": "mic-filled", + "unicode": "\ue677" + }, + { + "font_class": "micoff", + "unicode": "\ue67e" + }, + { + "font_class": "micoff-filled", + "unicode": "\ue6b0" + }, + { + "font_class": "minus", + "unicode": "\ue66f" + }, + { + "font_class": "minus-filled", + "unicode": "\ue67d" + }, + { + "font_class": "more", + "unicode": "\ue64d" + }, + { + "font_class": "more-filled", + "unicode": "\ue64e" + }, + { + "font_class": "navigate", + "unicode": "\ue66e" + }, + { + "font_class": "navigate-filled", + "unicode": "\ue67a" + }, + { + "font_class": "notification", + "unicode": "\ue6a6" + }, + { + "font_class": "notification-filled", + "unicode": "\ue6c1" + }, + { + "font_class": "paperclip", + "unicode": "\ue652" + }, + { + "font_class": "paperplane", + "unicode": "\ue672" + }, + { + "font_class": "paperplane-filled", + "unicode": "\ue675" + }, + { + "font_class": "person", + "unicode": "\ue699" + }, + { + "font_class": "person-filled", + "unicode": "\ue69d" + }, + { + "font_class": "personadd", + "unicode": "\ue69f" + }, + { + "font_class": "personadd-filled", + "unicode": "\ue698" + }, + { + "font_class": "personadd-filled-copy", + "unicode": "\ue6d1" + }, + { + "font_class": "phone", + "unicode": "\ue69c" + }, + { + "font_class": "phone-filled", + "unicode": "\ue69b" + }, + { + "font_class": "plus", + "unicode": "\ue676" + }, + { + "font_class": "plus-filled", + "unicode": "\ue6c7" + }, + { + "font_class": "plusempty", + "unicode": "\ue67b" + }, + { + "font_class": "pulldown", + "unicode": "\ue632" + }, + { + "font_class": "pyq", + "unicode": "\ue682" + }, + { + "font_class": "qq", + "unicode": "\ue680" + }, + { + "font_class": "redo", + "unicode": "\ue64a" + }, + { + "font_class": "redo-filled", + "unicode": "\ue655" + }, + { + "font_class": "refresh", + "unicode": "\ue657" + }, + { + "font_class": "refresh-filled", + "unicode": "\ue656" + }, + { + "font_class": "refreshempty", + "unicode": "\ue6bf" + }, + { + "font_class": "reload", + "unicode": "\ue6b2" + }, + { + "font_class": "right", + "unicode": "\ue6b5" + }, + { + "font_class": "scan", + "unicode": "\ue62a" + }, + { + "font_class": "search", + "unicode": "\ue654" + }, + { + "font_class": "settings", + "unicode": "\ue653" + }, + { + "font_class": "settings-filled", + "unicode": "\ue6ce" + }, + { + "font_class": "shop", + "unicode": "\ue62f" + }, + { + "font_class": "shop-filled", + "unicode": "\ue6cd" + }, + { + "font_class": "smallcircle", + "unicode": "\ue67c" + }, + { + "font_class": "smallcircle-filled", + "unicode": "\ue665" + }, + { + "font_class": "sound", + "unicode": "\ue684" + }, + { + "font_class": "sound-filled", + "unicode": "\ue686" + }, + { + "font_class": "spinner-cycle", + "unicode": "\ue68a" + }, + { + "font_class": "staff", + "unicode": "\ue6a7" + }, + { + "font_class": "staff-filled", + "unicode": "\ue6cb" + }, + { + "font_class": "star", + "unicode": "\ue688" + }, + { + "font_class": "star-filled", + "unicode": "\ue68f" + }, + { + "font_class": "starhalf", + "unicode": "\ue683" + }, + { + "font_class": "trash", + "unicode": "\ue687" + }, + { + "font_class": "trash-filled", + "unicode": "\ue685" + }, + { + "font_class": "tune", + "unicode": "\ue6aa" + }, + { + "font_class": "tune-filled", + "unicode": "\ue6ca" + }, + { + "font_class": "undo", + "unicode": "\ue64f" + }, + { + "font_class": "undo-filled", + "unicode": "\ue64c" + }, + { + "font_class": "up", + "unicode": "\ue6b6" + }, + { + "font_class": "top", + "unicode": "\ue6b6" + }, + { + "font_class": "upload", + "unicode": "\ue690" + }, + { + "font_class": "upload-filled", + "unicode": "\ue68e" + }, + { + "font_class": "videocam", + "unicode": "\ue68c" + }, + { + "font_class": "videocam-filled", + "unicode": "\ue689" + }, + { + "font_class": "vip", + "unicode": "\ue6a8" + }, + { + "font_class": "vip-filled", + "unicode": "\ue6c6" + }, + { + "font_class": "wallet", + "unicode": "\ue6b1" + }, + { + "font_class": "wallet-filled", + "unicode": "\ue6c2" + }, + { + "font_class": "weibo", + "unicode": "\ue68b" + }, + { + "font_class": "weixin", + "unicode": "\ue691" + } +] as IconsDataItem[] + +// export const fontData = JSON.parse(fontDataJson) diff --git a/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js new file mode 100644 index 0000000..1cd11e1 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js @@ -0,0 +1,649 @@ + +export const fontData = [ + { + "font_class": "arrow-down", + "unicode": "\ue6be" + }, + { + "font_class": "arrow-left", + "unicode": "\ue6bc" + }, + { + "font_class": "arrow-right", + "unicode": "\ue6bb" + }, + { + "font_class": "arrow-up", + "unicode": "\ue6bd" + }, + { + "font_class": "auth", + "unicode": "\ue6ab" + }, + { + "font_class": "auth-filled", + "unicode": "\ue6cc" + }, + { + "font_class": "back", + "unicode": "\ue6b9" + }, + { + "font_class": "bars", + "unicode": "\ue627" + }, + { + "font_class": "calendar", + "unicode": "\ue6a0" + }, + { + "font_class": "calendar-filled", + "unicode": "\ue6c0" + }, + { + "font_class": "camera", + "unicode": "\ue65a" + }, + { + "font_class": "camera-filled", + "unicode": "\ue658" + }, + { + "font_class": "cart", + "unicode": "\ue631" + }, + { + "font_class": "cart-filled", + "unicode": "\ue6d0" + }, + { + "font_class": "chat", + "unicode": "\ue65d" + }, + { + "font_class": "chat-filled", + "unicode": "\ue659" + }, + { + "font_class": "chatboxes", + "unicode": "\ue696" + }, + { + "font_class": "chatboxes-filled", + "unicode": "\ue692" + }, + { + "font_class": "chatbubble", + "unicode": "\ue697" + }, + { + "font_class": "chatbubble-filled", + "unicode": "\ue694" + }, + { + "font_class": "checkbox", + "unicode": "\ue62b" + }, + { + "font_class": "checkbox-filled", + "unicode": "\ue62c" + }, + { + "font_class": "checkmarkempty", + "unicode": "\ue65c" + }, + { + "font_class": "circle", + "unicode": "\ue65b" + }, + { + "font_class": "circle-filled", + "unicode": "\ue65e" + }, + { + "font_class": "clear", + "unicode": "\ue66d" + }, + { + "font_class": "close", + "unicode": "\ue673" + }, + { + "font_class": "closeempty", + "unicode": "\ue66c" + }, + { + "font_class": "cloud-download", + "unicode": "\ue647" + }, + { + "font_class": "cloud-download-filled", + "unicode": "\ue646" + }, + { + "font_class": "cloud-upload", + "unicode": "\ue645" + }, + { + "font_class": "cloud-upload-filled", + "unicode": "\ue648" + }, + { + "font_class": "color", + "unicode": "\ue6cf" + }, + { + "font_class": "color-filled", + "unicode": "\ue6c9" + }, + { + "font_class": "compose", + "unicode": "\ue67f" + }, + { + "font_class": "contact", + "unicode": "\ue693" + }, + { + "font_class": "contact-filled", + "unicode": "\ue695" + }, + { + "font_class": "down", + "unicode": "\ue6b8" + }, + { + "font_class": "bottom", + "unicode": "\ue6b8" + }, + { + "font_class": "download", + "unicode": "\ue68d" + }, + { + "font_class": "download-filled", + "unicode": "\ue681" + }, + { + "font_class": "email", + "unicode": "\ue69e" + }, + { + "font_class": "email-filled", + "unicode": "\ue69a" + }, + { + "font_class": "eye", + "unicode": "\ue651" + }, + { + "font_class": "eye-filled", + "unicode": "\ue66a" + }, + { + "font_class": "eye-slash", + "unicode": "\ue6b3" + }, + { + "font_class": "eye-slash-filled", + "unicode": "\ue6b4" + }, + { + "font_class": "fire", + "unicode": "\ue6a1" + }, + { + "font_class": "fire-filled", + "unicode": "\ue6c5" + }, + { + "font_class": "flag", + "unicode": "\ue65f" + }, + { + "font_class": "flag-filled", + "unicode": "\ue660" + }, + { + "font_class": "folder-add", + "unicode": "\ue6a9" + }, + { + "font_class": "folder-add-filled", + "unicode": "\ue6c8" + }, + { + "font_class": "font", + "unicode": "\ue6a3" + }, + { + "font_class": "forward", + "unicode": "\ue6ba" + }, + { + "font_class": "gear", + "unicode": "\ue664" + }, + { + "font_class": "gear-filled", + "unicode": "\ue661" + }, + { + "font_class": "gift", + "unicode": "\ue6a4" + }, + { + "font_class": "gift-filled", + "unicode": "\ue6c4" + }, + { + "font_class": "hand-down", + "unicode": "\ue63d" + }, + { + "font_class": "hand-down-filled", + "unicode": "\ue63c" + }, + { + "font_class": "hand-up", + "unicode": "\ue63f" + }, + { + "font_class": "hand-up-filled", + "unicode": "\ue63e" + }, + { + "font_class": "headphones", + "unicode": "\ue630" + }, + { + "font_class": "heart", + "unicode": "\ue639" + }, + { + "font_class": "heart-filled", + "unicode": "\ue641" + }, + { + "font_class": "help", + "unicode": "\ue679" + }, + { + "font_class": "help-filled", + "unicode": "\ue674" + }, + { + "font_class": "home", + "unicode": "\ue662" + }, + { + "font_class": "home-filled", + "unicode": "\ue663" + }, + { + "font_class": "image", + "unicode": "\ue670" + }, + { + "font_class": "image-filled", + "unicode": "\ue678" + }, + { + "font_class": "images", + "unicode": "\ue650" + }, + { + "font_class": "images-filled", + "unicode": "\ue64b" + }, + { + "font_class": "info", + "unicode": "\ue669" + }, + { + "font_class": "info-filled", + "unicode": "\ue649" + }, + { + "font_class": "left", + "unicode": "\ue6b7" + }, + { + "font_class": "link", + "unicode": "\ue6a5" + }, + { + "font_class": "list", + "unicode": "\ue644" + }, + { + "font_class": "location", + "unicode": "\ue6ae" + }, + { + "font_class": "location-filled", + "unicode": "\ue6af" + }, + { + "font_class": "locked", + "unicode": "\ue66b" + }, + { + "font_class": "locked-filled", + "unicode": "\ue668" + }, + { + "font_class": "loop", + "unicode": "\ue633" + }, + { + "font_class": "mail-open", + "unicode": "\ue643" + }, + { + "font_class": "mail-open-filled", + "unicode": "\ue63a" + }, + { + "font_class": "map", + "unicode": "\ue667" + }, + { + "font_class": "map-filled", + "unicode": "\ue666" + }, + { + "font_class": "map-pin", + "unicode": "\ue6ad" + }, + { + "font_class": "map-pin-ellipse", + "unicode": "\ue6ac" + }, + { + "font_class": "medal", + "unicode": "\ue6a2" + }, + { + "font_class": "medal-filled", + "unicode": "\ue6c3" + }, + { + "font_class": "mic", + "unicode": "\ue671" + }, + { + "font_class": "mic-filled", + "unicode": "\ue677" + }, + { + "font_class": "micoff", + "unicode": "\ue67e" + }, + { + "font_class": "micoff-filled", + "unicode": "\ue6b0" + }, + { + "font_class": "minus", + "unicode": "\ue66f" + }, + { + "font_class": "minus-filled", + "unicode": "\ue67d" + }, + { + "font_class": "more", + "unicode": "\ue64d" + }, + { + "font_class": "more-filled", + "unicode": "\ue64e" + }, + { + "font_class": "navigate", + "unicode": "\ue66e" + }, + { + "font_class": "navigate-filled", + "unicode": "\ue67a" + }, + { + "font_class": "notification", + "unicode": "\ue6a6" + }, + { + "font_class": "notification-filled", + "unicode": "\ue6c1" + }, + { + "font_class": "paperclip", + "unicode": "\ue652" + }, + { + "font_class": "paperplane", + "unicode": "\ue672" + }, + { + "font_class": "paperplane-filled", + "unicode": "\ue675" + }, + { + "font_class": "person", + "unicode": "\ue699" + }, + { + "font_class": "person-filled", + "unicode": "\ue69d" + }, + { + "font_class": "personadd", + "unicode": "\ue69f" + }, + { + "font_class": "personadd-filled", + "unicode": "\ue698" + }, + { + "font_class": "personadd-filled-copy", + "unicode": "\ue6d1" + }, + { + "font_class": "phone", + "unicode": "\ue69c" + }, + { + "font_class": "phone-filled", + "unicode": "\ue69b" + }, + { + "font_class": "plus", + "unicode": "\ue676" + }, + { + "font_class": "plus-filled", + "unicode": "\ue6c7" + }, + { + "font_class": "plusempty", + "unicode": "\ue67b" + }, + { + "font_class": "pulldown", + "unicode": "\ue632" + }, + { + "font_class": "pyq", + "unicode": "\ue682" + }, + { + "font_class": "qq", + "unicode": "\ue680" + }, + { + "font_class": "redo", + "unicode": "\ue64a" + }, + { + "font_class": "redo-filled", + "unicode": "\ue655" + }, + { + "font_class": "refresh", + "unicode": "\ue657" + }, + { + "font_class": "refresh-filled", + "unicode": "\ue656" + }, + { + "font_class": "refreshempty", + "unicode": "\ue6bf" + }, + { + "font_class": "reload", + "unicode": "\ue6b2" + }, + { + "font_class": "right", + "unicode": "\ue6b5" + }, + { + "font_class": "scan", + "unicode": "\ue62a" + }, + { + "font_class": "search", + "unicode": "\ue654" + }, + { + "font_class": "settings", + "unicode": "\ue653" + }, + { + "font_class": "settings-filled", + "unicode": "\ue6ce" + }, + { + "font_class": "shop", + "unicode": "\ue62f" + }, + { + "font_class": "shop-filled", + "unicode": "\ue6cd" + }, + { + "font_class": "smallcircle", + "unicode": "\ue67c" + }, + { + "font_class": "smallcircle-filled", + "unicode": "\ue665" + }, + { + "font_class": "sound", + "unicode": "\ue684" + }, + { + "font_class": "sound-filled", + "unicode": "\ue686" + }, + { + "font_class": "spinner-cycle", + "unicode": "\ue68a" + }, + { + "font_class": "staff", + "unicode": "\ue6a7" + }, + { + "font_class": "staff-filled", + "unicode": "\ue6cb" + }, + { + "font_class": "star", + "unicode": "\ue688" + }, + { + "font_class": "star-filled", + "unicode": "\ue68f" + }, + { + "font_class": "starhalf", + "unicode": "\ue683" + }, + { + "font_class": "trash", + "unicode": "\ue687" + }, + { + "font_class": "trash-filled", + "unicode": "\ue685" + }, + { + "font_class": "tune", + "unicode": "\ue6aa" + }, + { + "font_class": "tune-filled", + "unicode": "\ue6ca" + }, + { + "font_class": "undo", + "unicode": "\ue64f" + }, + { + "font_class": "undo-filled", + "unicode": "\ue64c" + }, + { + "font_class": "up", + "unicode": "\ue6b6" + }, + { + "font_class": "top", + "unicode": "\ue6b6" + }, + { + "font_class": "upload", + "unicode": "\ue690" + }, + { + "font_class": "upload-filled", + "unicode": "\ue68e" + }, + { + "font_class": "videocam", + "unicode": "\ue68c" + }, + { + "font_class": "videocam-filled", + "unicode": "\ue689" + }, + { + "font_class": "vip", + "unicode": "\ue6a8" + }, + { + "font_class": "vip-filled", + "unicode": "\ue6c6" + }, + { + "font_class": "wallet", + "unicode": "\ue6b1" + }, + { + "font_class": "wallet-filled", + "unicode": "\ue6c2" + }, + { + "font_class": "weibo", + "unicode": "\ue68b" + }, + { + "font_class": "weixin", + "unicode": "\ue691" + } +] + +// export const fontData = JSON.parse(fontDataJson) diff --git a/gym-manage-uniapp/uni_modules/uni-icons/package.json b/gym-manage-uniapp/uni_modules/uni-icons/package.json new file mode 100644 index 0000000..60e45f0 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-icons/package.json @@ -0,0 +1,111 @@ +{ + "id": "uni-icons", + "displayName": "uni-icons 图标", + "version": "2.0.12", + "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。", + "keywords": [ + "uni-ui", + "uniui", + "icon", + "图标" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "^3.2.14", + "uni-app": "^4.08", + "uni-app-x": "^4.61" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue", + "darkmode": "x", + "i18n": "x", + "widescreen": "x" + }, + "uni_modules": { + "dependencies": [ + "uni-scss" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "x", + "aliyun": "x", + "alipay": "x" + }, + "client": { + "uni-app": { + "vue": { + "vue2": "√", + "vue3": "√" + }, + "web": { + "safari": "√", + "chrome": "√" + }, + "app": { + "vue": "√", + "nvue": "-", + "android": { + "extVersion": "", + "minVersion": "29" + }, + "ios": "√", + "harmony": "√" + }, + "mp": { + "weixin": "√", + "alipay": "√", + "toutiao": "√", + "baidu": "√", + "kuaishou": "-", + "jd": "-", + "harmony": "-", + "qq": "√", + "lark": "-" + }, + "quickapp": { + "huawei": "√", + "union": "√" + } + }, + "uni-app-x": { + "web": { + "safari": "√", + "chrome": "√" + }, + "app": { + "android": { + "extVersion": "", + "minVersion": "29" + }, + "ios": "√", + "harmony": "√" + }, + "mp": { + "weixin": "√" + } + } + } + } + } +} \ No newline at end of file diff --git a/gym-manage-uniapp/uni_modules/uni-icons/readme.md b/gym-manage-uniapp/uni_modules/uni-icons/readme.md new file mode 100644 index 0000000..86234ba --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-icons/readme.md @@ -0,0 +1,8 @@ +## Icons 图标 +> **组件名：uni-icons** +> 代码块： `uIcons` + +用于展示 icons 图标 。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 diff --git a/gym-manage-uniapp/uni_modules/uni-scss/changelog.md b/gym-manage-uniapp/uni_modules/uni-scss/changelog.md new file mode 100644 index 0000000..b863bb0 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/changelog.md @@ -0,0 +1,8 @@ +## 1.0.3（2022-01-21） +- 优化 组件示例 +## 1.0.2（2021-11-22） +- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题 +## 1.0.1（2021-11-22） +- 修复 vue3中scss语法兼容问题 +## 1.0.0（2021-11-18） +- init diff --git a/gym-manage-uniapp/uni_modules/uni-scss/index.scss b/gym-manage-uniapp/uni_modules/uni-scss/index.scss new file mode 100644 index 0000000..1744a5f --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/index.scss @@ -0,0 +1 @@ +@import './styles/index.scss'; diff --git a/gym-manage-uniapp/uni_modules/uni-scss/package.json b/gym-manage-uniapp/uni_modules/uni-scss/package.json new file mode 100644 index 0000000..7cc0ccb --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/package.json @@ -0,0 +1,82 @@ +{ + "id": "uni-scss", + "displayName": "uni-scss 辅助样式", + "version": "1.0.3", + "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。", + "keywords": [ + "uni-scss", + "uni-ui", + "辅助样式" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "^3.1.0" + }, + "dcloudext": { + "category": [ + "JS SDK", + "通用 SDK" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "u" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "n", + "联盟": "n" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/gym-manage-uniapp/uni_modules/uni-scss/readme.md b/gym-manage-uniapp/uni_modules/uni-scss/readme.md new file mode 100644 index 0000000..b7d1c25 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/readme.md @@ -0,0 +1,4 @@ +`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 \ No newline at end of file diff --git a/gym-manage-uniapp/uni_modules/uni-scss/styles/index.scss b/gym-manage-uniapp/uni_modules/uni-scss/styles/index.scss new file mode 100644 index 0000000..ffac4fe --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/styles/index.scss @@ -0,0 +1,7 @@ +@import './setting/_variables.scss'; +@import './setting/_border.scss'; +@import './setting/_color.scss'; +@import './setting/_space.scss'; +@import './setting/_radius.scss'; +@import './setting/_text.scss'; +@import './setting/_styles.scss'; diff --git a/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_border.scss b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_border.scss new file mode 100644 index 0000000..12a11c3 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_border.scss @@ -0,0 +1,3 @@ +.uni-border { + border: 1px $uni-border-1 solid; +} \ No newline at end of file diff --git a/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_color.scss b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_color.scss new file mode 100644 index 0000000..1ededd9 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_color.scss @@ -0,0 +1,66 @@ + +// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐 +// @mixin get-styles($k,$c) { +// @if $k == size or $k == weight{ +// font-#{$k}:#{$c} +// }@else{ +// #{$k}:#{$c} +// } +// } +$uni-ui-color:( + // 主色 + primary: $uni-primary, + primary-disable: $uni-primary-disable, + primary-light: $uni-primary-light, + // 辅助色 + success: $uni-success, + success-disable: $uni-success-disable, + success-light: $uni-success-light, + warning: $uni-warning, + warning-disable: $uni-warning-disable, + warning-light: $uni-warning-light, + error: $uni-error, + error-disable: $uni-error-disable, + error-light: $uni-error-light, + info: $uni-info, + info-disable: $uni-info-disable, + info-light: $uni-info-light, + // 中性色 + main-color: $uni-main-color, + base-color: $uni-base-color, + secondary-color: $uni-secondary-color, + extra-color: $uni-extra-color, + // 背景色 + bg-color: $uni-bg-color, + // 边框颜色 + border-1: $uni-border-1, + border-2: $uni-border-2, + border-3: $uni-border-3, + border-4: $uni-border-4, + // 黑色 + black:$uni-black, + // 白色 + white:$uni-white, + // 透明 + transparent:$uni-transparent +) !default; +@each $key, $child in $uni-ui-color { + .uni-#{"" + $key} { + color: $child; + } + .uni-#{"" + $key}-bg { + background-color: $child; + } +} +.uni-shadow-sm { + box-shadow: $uni-shadow-sm; +} +.uni-shadow-base { + box-shadow: $uni-shadow-base; +} +.uni-shadow-lg { + box-shadow: $uni-shadow-lg; +} +.uni-mask { + background-color:$uni-mask; +} diff --git a/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_radius.scss b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_radius.scss new file mode 100644 index 0000000..9a0428b --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_radius.scss @@ -0,0 +1,55 @@ +@mixin radius($r,$d:null ,$important: false){ + $radius-value:map-get($uni-radius, $r) if($important, !important, null); + // Key exists within the $uni-radius variable + @if (map-has-key($uni-radius, $r) and $d){ + @if $d == t { + border-top-left-radius:$radius-value; + border-top-right-radius:$radius-value; + }@else if $d == r { + border-top-right-radius:$radius-value; + border-bottom-right-radius:$radius-value; + }@else if $d == b { + border-bottom-left-radius:$radius-value; + border-bottom-right-radius:$radius-value; + }@else if $d == l { + border-top-left-radius:$radius-value; + border-bottom-left-radius:$radius-value; + }@else if $d == tl { + border-top-left-radius:$radius-value; + }@else if $d == tr { + border-top-right-radius:$radius-value; + }@else if $d == br { + border-bottom-right-radius:$radius-value; + }@else if $d == bl { + border-bottom-left-radius:$radius-value; + } + }@else{ + border-radius:$radius-value; + } +} + +@each $key, $child in $uni-radius { + @if($key){ + .uni-radius-#{"" + $key} { + @include radius($key) + } + }@else{ + .uni-radius { + @include radius($key) + } + } +} + +@each $direction in t, r, b, l,tl, tr, br, bl { + @each $key, $child in $uni-radius { + @if($key){ + .uni-radius-#{"" + $direction}-#{"" + $key} { + @include radius($key,$direction,false) + } + }@else{ + .uni-radius-#{$direction} { + @include radius($key,$direction,false) + } + } + } +} diff --git a/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_space.scss b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_space.scss new file mode 100644 index 0000000..3c89528 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_space.scss @@ -0,0 +1,56 @@ + +@mixin fn($space,$direction,$size,$n) { + @if $n { + #{$space}-#{$direction}: #{$size*$uni-space-root}px + } @else { + #{$space}-#{$direction}: #{-$size*$uni-space-root}px + } +} +@mixin get-styles($direction,$i,$space,$n){ + @if $direction == t { + @include fn($space, top,$i,$n); + } + @if $direction == r { + @include fn($space, right,$i,$n); + } + @if $direction == b { + @include fn($space, bottom,$i,$n); + } + @if $direction == l { + @include fn($space, left,$i,$n); + } + @if $direction == x { + @include fn($space, left,$i,$n); + @include fn($space, right,$i,$n); + } + @if $direction == y { + @include fn($space, top,$i,$n); + @include fn($space, bottom,$i,$n); + } + @if $direction == a { + @if $n { + #{$space}:#{$i*$uni-space-root}px; + } @else { + #{$space}:#{-$i*$uni-space-root}px; + } + } +} + +@each $orientation in m,p { + $space: margin; + @if $orientation == m { + $space: margin; + } @else { + $space: padding; + } + @for $i from 0 through 16 { + @each $direction in t, r, b, l, x, y, a { + .uni-#{$orientation}#{$direction}-#{$i} { + @include get-styles($direction,$i,$space,true); + } + .uni-#{$orientation}#{$direction}-n#{$i} { + @include get-styles($direction,$i,$space,false); + } + } + } +} \ No newline at end of file diff --git a/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_styles.scss b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_styles.scss new file mode 100644 index 0000000..689afec --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_styles.scss @@ -0,0 +1,167 @@ +/* #ifndef APP-NVUE */ + +$-color-white:#fff; +$-color-black:#000; +@mixin base-style($color) { + color: #fff; + background-color: $color; + border-color: mix($-color-black, $color, 8%); + &:not([hover-class]):active { + background: mix($-color-black, $color, 10%); + border-color: mix($-color-black, $color, 20%); + color: $-color-white; + outline: none; + } +} +@mixin is-color($color) { + @include base-style($color); + &[loading] { + @include base-style($color); + &::before { + margin-right:5px; + } + } + &[disabled] { + &, + &[loading], + &:not([hover-class]):active { + color: $-color-white; + border-color: mix(darken($color,10%), $-color-white); + background-color: mix($color, $-color-white); + } + } + +} +@mixin base-plain-style($color) { + color:$color; + background-color: mix($-color-white, $color, 90%); + border-color: mix($-color-white, $color, 70%); + &:not([hover-class]):active { + background: mix($-color-white, $color, 80%); + color: $color; + outline: none; + border-color: mix($-color-white, $color, 50%); + } +} +@mixin is-plain($color){ + &[plain] { + @include base-plain-style($color); + &[loading] { + @include base-plain-style($color); + &::before { + margin-right:5px; + } + } + &[disabled] { + &, + &:active { + color: mix($-color-white, $color, 40%); + background-color: mix($-color-white, $color, 90%); + border-color: mix($-color-white, $color, 80%); + } + } + } +} + + +.uni-btn { + margin: 5px; + color: #393939; + border:1px solid #ccc; + font-size: 16px; + font-weight: 200; + background-color: #F9F9F9; + // TODO 暂时处理边框隐藏一边的问题 + overflow: visible; + &::after{ + border: none; + } + + &:not([type]),&[type=default] { + color: #999; + &[loading] { + background: none; + &::before { + margin-right:5px; + } + } + + + + &[disabled]{ + color: mix($-color-white, #999, 60%); + &, + &[loading], + &:active { + color: mix($-color-white, #999, 60%); + background-color: mix($-color-white,$-color-black , 98%); + border-color: mix($-color-white, #999, 85%); + } + } + + &[plain] { + color: #999; + background: none; + border-color: $uni-border-1; + &:not([hover-class]):active { + background: none; + color: mix($-color-white, $-color-black, 80%); + border-color: mix($-color-white, $-color-black, 90%); + outline: none; + } + &[disabled]{ + &, + &[loading], + &:active { + background: none; + color: mix($-color-white, #999, 60%); + border-color: mix($-color-white, #999, 85%); + } + } + } + } + + &:not([hover-class]):active { + color: mix($-color-white, $-color-black, 50%); + } + + &[size=mini] { + font-size: 16px; + font-weight: 200; + border-radius: 8px; + } + + + + &.uni-btn-small { + font-size: 14px; + } + &.uni-btn-mini { + font-size: 12px; + } + + &.uni-btn-radius { + border-radius: 999px; + } + &[type=primary] { + @include is-color($uni-primary); + @include is-plain($uni-primary) + } + &[type=success] { + @include is-color($uni-success); + @include is-plain($uni-success) + } + &[type=error] { + @include is-color($uni-error); + @include is-plain($uni-error) + } + &[type=warning] { + @include is-color($uni-warning); + @include is-plain($uni-warning) + } + &[type=info] { + @include is-color($uni-info); + @include is-plain($uni-info) + } +} +/* #endif */ diff --git a/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_text.scss b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_text.scss new file mode 100644 index 0000000..a34d08f --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_text.scss @@ -0,0 +1,24 @@ +@mixin get-styles($k,$c) { + @if $k == size or $k == weight{ + font-#{$k}:#{$c} + }@else{ + #{$k}:#{$c} + } +} + +@each $key, $child in $uni-headings { + /* #ifndef APP-NVUE */ + .uni-#{$key} { + @each $k, $c in $child { + @include get-styles($k,$c) + } + } + /* #endif */ + /* #ifdef APP-NVUE */ + .container .uni-#{$key} { + @each $k, $c in $child { + @include get-styles($k,$c) + } + } + /* #endif */ +} diff --git a/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_variables.scss b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_variables.scss new file mode 100644 index 0000000..557d3d7 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/styles/setting/_variables.scss @@ -0,0 +1,146 @@ +// @use "sass:math"; +@import '../tools/functions.scss'; +// 间距基础倍数 +$uni-space-root: 2 !default; +// 边框半径默认值 +$uni-radius-root:5px !default; +$uni-radius: () !default; +// 边框半径断点 +$uni-radius: map-deep-merge( + ( + 0: 0, + // TODO 当前版本暂时不支持 sm 属性 + // 'sm': math.div($uni-radius-root, 2), + null: $uni-radius-root, + 'lg': $uni-radius-root * 2, + 'xl': $uni-radius-root * 6, + 'pill': 9999px, + 'circle': 50% + ), + $uni-radius +); +// 字体家族 +$body-font-family: 'Roboto', sans-serif !default; +// 文本 +$heading-font-family: $body-font-family !default; +$uni-headings: () !default; +$letterSpacing: -0.01562em; +$uni-headings: map-deep-merge( + ( + 'h1': ( + size: 32px, + weight: 300, + line-height: 50px, + // letter-spacing:-0.01562em + ), + 'h2': ( + size: 28px, + weight: 300, + line-height: 40px, + // letter-spacing: -0.00833em + ), + 'h3': ( + size: 24px, + weight: 400, + line-height: 32px, + // letter-spacing: normal + ), + 'h4': ( + size: 20px, + weight: 400, + line-height: 30px, + // letter-spacing: 0.00735em + ), + 'h5': ( + size: 16px, + weight: 400, + line-height: 24px, + // letter-spacing: normal + ), + 'h6': ( + size: 14px, + weight: 500, + line-height: 18px, + // letter-spacing: 0.0125em + ), + 'subtitle': ( + size: 12px, + weight: 400, + line-height: 20px, + // letter-spacing: 0.00937em + ), + 'body': ( + font-size: 14px, + font-weight: 400, + line-height: 22px, + // letter-spacing: 0.03125em + ), + 'caption': ( + 'size': 12px, + 'weight': 400, + 'line-height': 20px, + // 'letter-spacing': 0.03333em, + // 'text-transform': false + ) + ), + $uni-headings +); + + + +// 主色 +$uni-primary: #2979ff !default; +$uni-primary-disable:lighten($uni-primary,20%) !default; +$uni-primary-light: lighten($uni-primary,25%) !default; + +// 辅助色 +// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。 +$uni-success: #18bc37 !default; +$uni-success-disable:lighten($uni-success,20%) !default; +$uni-success-light: lighten($uni-success,25%) !default; + +$uni-warning: #f3a73f !default; +$uni-warning-disable:lighten($uni-warning,20%) !default; +$uni-warning-light: lighten($uni-warning,25%) !default; + +$uni-error: #e43d33 !default; +$uni-error-disable:lighten($uni-error,20%) !default; +$uni-error-light: lighten($uni-error,25%) !default; + +$uni-info: #8f939c !default; +$uni-info-disable:lighten($uni-info,20%) !default; +$uni-info-light: lighten($uni-info,25%) !default; + +// 中性色 +// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。 +$uni-main-color: #3a3a3a !default; // 主要文字 +$uni-base-color: #6a6a6a !default; // 常规文字 +$uni-secondary-color: #909399 !default; // 次要文字 +$uni-extra-color: #c7c7c7 !default; // 辅助说明 + +// 边框颜色 +$uni-border-1: #F0F0F0 !default; +$uni-border-2: #EDEDED !default; +$uni-border-3: #DCDCDC !default; +$uni-border-4: #B9B9B9 !default; + +// 常规色 +$uni-black: #000000 !default; +$uni-white: #ffffff !default; +$uni-transparent: rgba($color: #000000, $alpha: 0) !default; + +// 背景色 +$uni-bg-color: #f7f7f7 !default; + +/* 水平间距 */ +$uni-spacing-sm: 8px !default; +$uni-spacing-base: 15px !default; +$uni-spacing-lg: 30px !default; + +// 阴影 +$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default; +$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default; +$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default; + +// 蒙版 +$uni-mask: rgba($color: #000000, $alpha: 0.4) !default; diff --git a/gym-manage-uniapp/uni_modules/uni-scss/styles/tools/functions.scss b/gym-manage-uniapp/uni_modules/uni-scss/styles/tools/functions.scss new file mode 100644 index 0000000..ac6f63e --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/styles/tools/functions.scss @@ -0,0 +1,19 @@ +// 合并 map +@function map-deep-merge($parent-map, $child-map){ + $result: $parent-map; + @each $key, $child in $child-map { + $parent-has-key: map-has-key($result, $key); + $parent-value: map-get($result, $key); + $parent-type: type-of($parent-value); + $child-type: type-of($child); + $parent-is-map: $parent-type == map; + $child-is-map: $child-type == map; + + @if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){ + $result: map-merge($result, ( $key: $child )); + }@else { + $result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) )); + } + } + @return $result; +}; diff --git a/gym-manage-uniapp/uni_modules/uni-scss/theme.scss b/gym-manage-uniapp/uni_modules/uni-scss/theme.scss new file mode 100644 index 0000000..80ee62f --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/theme.scss @@ -0,0 +1,31 @@ +// 间距基础倍数 +$uni-space-root: 2; +// 边框半径默认值 +$uni-radius-root:5px; +// 主色 +$uni-primary: #2979ff; +// 辅助色 +$uni-success: #4cd964; +// 警告色 +$uni-warning: #f0ad4e; +// 错误色 +$uni-error: #dd524d; +// 描述色 +$uni-info: #909399; +// 中性色 +$uni-main-color: #303133; +$uni-base-color: #606266; +$uni-secondary-color: #909399; +$uni-extra-color: #C0C4CC; +// 背景色 +$uni-bg-color: #f5f5f5; +// 边框颜色 +$uni-border-1: #DCDFE6; +$uni-border-2: #E4E7ED; +$uni-border-3: #EBEEF5; +$uni-border-4: #F2F6FC; + +// 常规色 +$uni-black: #000000; +$uni-white: #ffffff; +$uni-transparent: rgba($color: #000000, $alpha: 0); diff --git a/gym-manage-uniapp/uni_modules/uni-scss/variables.scss b/gym-manage-uniapp/uni_modules/uni-scss/variables.scss new file mode 100644 index 0000000..1c062d4 --- /dev/null +++ b/gym-manage-uniapp/uni_modules/uni-scss/variables.scss @@ -0,0 +1,62 @@ +@import './styles/setting/_variables.scss'; +// 间距基础倍数 +$uni-space-root: 2; +// 边框半径默认值 +$uni-radius-root:5px; + +// 主色 +$uni-primary: #2979ff; +$uni-primary-disable:mix(#fff,$uni-primary,50%); +$uni-primary-light: mix(#fff,$uni-primary,80%); + +// 辅助色 +// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。 +$uni-success: #18bc37; +$uni-success-disable:mix(#fff,$uni-success,50%); +$uni-success-light: mix(#fff,$uni-success,80%); + +$uni-warning: #f3a73f; +$uni-warning-disable:mix(#fff,$uni-warning,50%); +$uni-warning-light: mix(#fff,$uni-warning,80%); + +$uni-error: #e43d33; +$uni-error-disable:mix(#fff,$uni-error,50%); +$uni-error-light: mix(#fff,$uni-error,80%); + +$uni-info: #8f939c; +$uni-info-disable:mix(#fff,$uni-info,50%); +$uni-info-light: mix(#fff,$uni-info,80%); + +// 中性色 +// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。 +$uni-main-color: #3a3a3a; // 主要文字 +$uni-base-color: #6a6a6a; // 常规文字 +$uni-secondary-color: #909399; // 次要文字 +$uni-extra-color: #c7c7c7; // 辅助说明 + +// 边框颜色 +$uni-border-1: #F0F0F0; +$uni-border-2: #EDEDED; +$uni-border-3: #DCDCDC; +$uni-border-4: #B9B9B9; + +// 常规色 +$uni-black: #000000; +$uni-white: #ffffff; +$uni-transparent: rgba($color: #000000, $alpha: 0); + +// 背景色 +$uni-bg-color: #f7f7f7; + +/* 水平间距 */ +$uni-spacing-sm: 8px; +$uni-spacing-base: 15px; +$uni-spacing-lg: 30px; + +// 阴影 +$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5); +$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2); +$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5); + +// 蒙版 +$uni-mask: rgba($color: #000000, $alpha: 0.4); From 14a0fe8d4f199257fcc5e7d827817de547a05009 Mon Sep 17 00:00:00 2001 From: future <1360317836@qq.com> Date: Wed, 3 Jun 2026 16:26:44 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E5=8A=9F=E8=83=BD=E5=92=8C=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gym-manage-uniapp/api/index.js | 3 +- gym-manage-uniapp/api/main.js | 152 +++ .../components/QRCode/StatusCard.vue | 97 ++ .../components/index/QuickEntry.vue | 16 +- gym-manage-uniapp/manifest.json | 2 +- gym-manage-uniapp/pages.json | 6 + gym-manage-uniapp/pages/checkIn/checkIn.vue | 979 ++++++++++++++++++ gym-manage-uniapp/utils/request.js | 215 ++++ gym-manage-uniapp/vite.config.js | 24 + 9 files changed, 1488 insertions(+), 6 deletions(-) create mode 100644 gym-manage-uniapp/api/main.js create mode 100644 gym-manage-uniapp/components/QRCode/StatusCard.vue create mode 100644 gym-manage-uniapp/pages/checkIn/checkIn.vue create mode 100644 gym-manage-uniapp/utils/request.js create mode 100644 gym-manage-uniapp/vite.config.js diff --git a/gym-manage-uniapp/api/index.js b/gym-manage-uniapp/api/index.js index f29ddad..2b915c6 100644 --- a/gym-manage-uniapp/api/index.js +++ b/gym-manage-uniapp/api/index.js @@ -1,4 +1,5 @@ -const BASE_URL = 'http://localhost:8080/api' +// const BASE_URL = 'http://localhost:8080/api' +const BASE_URL = '/api' export const request = (options) => { return new Promise((resolve, reject) => { diff --git a/gym-manage-uniapp/api/main.js b/gym-manage-uniapp/api/main.js new file mode 100644 index 0000000..82e695a --- /dev/null +++ b/gym-manage-uniapp/api/main.js @@ -0,0 +1,152 @@ +import { request, setToken, clearToken, clearAllCache, clearCache } from '@/utils/request.js' + +// ========== 登录相关API ========== + +/** + * 微信小程序登录 + * @param {object} data - 登录参数 + * @param {string} data.code - 微信登录code + * @param {string} [data.encryptedData] - 加密数据 + * @param {string} [data.iv] - 加密向量 + * @returns {Promise} 登录结果 + */ +export const login = (data) => { + return request({ + url: '/member/auth/miniapp/login', + method: 'POST', + data: data, + needToken: false // 登录请求不需要token + }).then(res => { + // 登录成功，保存token + if (res.data && res.data.token) { + setToken(res.data.token) + } + return res + }) +} + +/** + * 退出登录 + * @returns {Promise} 退出结果 + */ +export const logout = () => { + return request({ + url: '/member/auth/logout', + method: 'POST' + }).then(res => { + // 退出成功，清除token和缓存 + clearToken() + clearAllCache() + return res + }).catch(err => { + // 即使请求失败，也清除本地token + clearToken() + clearAllCache() + throw err + }) +} + +// ========== 签到相关API ========== + +/** + * 获取签到二维码 + * @param {boolean} [cache=true] - 是否启用缓存 + * @returns {Promise} 二维码数据 + */ +export const getQRCode = (cache = true) => { + return request({ + url: '/checkIn/qrcode', + method: 'GET', + cache: cache, + cacheTime: 5 * 60 * 1000 // 5分钟缓存 + }) +} + +/** + * 扫码签到 + * @param {string} qrContent - 二维码内容 + * @returns {Promise} 签到结果 + */ +export const checkIn = (qrContent) => { + return request({ + url: '/checkIn/scan', + method: 'POST', + data: { qrContent } + }) +} + +// ========== 用户相关API ========== + +/** + * 获取用户信息 + * @param {boolean} [cache=true] - 是否启用缓存 + * @returns {Promise} 用户信息 + */ +export const getUserInfo = (cache = true) => { + return request({ + url: '/member/info', + method: 'GET', + cache: cache, + cacheTime: 30 * 60 * 1000 // 30分钟缓存 + }) +} + +/** + * 更新用户信息 + * @param {object} data - 用户信息 + * @returns {Promise} 更新结果 + */ +export const updateUserInfo = (data) => { + return request({ + url: '/member/info', + method: 'PUT', + data: data + }).then(res => { + // 更新成功，清除用户信息缓存 + const cacheKey = `GET_/member/info_{}` + clearCache(cacheKey) + return res + }) +} + +// ========== 课程相关API ========== + +/** + * 获取推荐课程列表 + * @param {boolean} [cache=true] - 是否启用缓存 + * @returns {Promise} 课程列表 + */ +export const getRecommendCourses = (cache = true) => { + return request({ + url: '/course/recommend', + method: 'GET', + cache: cache, + cacheTime: 10 * 60 * 1000 // 10分钟缓存 + }) +} + +/** + * 获取课程详情 + * @param {number} id - 课程ID + * @param {boolean} [cache=true] - 是否启用缓存 + * @returns {Promise} 课程详情 + */ +export const getCourseDetail = (id, cache = true) => { + return request({ + url: `/course/${id}`, + method: 'GET', + cache: cache, + cacheTime: 15 * 60 * 1000 // 15分钟缓存 + }) +} + +export default { + login, + logout, + getQRCode, + checkIn, + getUserInfo, + updateUserInfo, + getRecommendCourses, + getCourseDetail +} diff --git a/gym-manage-uniapp/components/QRCode/StatusCard.vue b/gym-manage-uniapp/components/QRCode/StatusCard.vue new file mode 100644 index 0000000..3eb316f --- /dev/null +++ b/gym-manage-uniapp/components/QRCode/StatusCard.vue @@ -0,0 +1,97 @@ + + + + + \ No newline at end of file diff --git a/gym-manage-uniapp/components/index/QuickEntry.vue b/gym-manage-uniapp/components/index/QuickEntry.vue index faa9373..dad233c 100644 --- a/gym-manage-uniapp/components/index/QuickEntry.vue +++ b/gym-manage-uniapp/components/index/QuickEntry.vue @@ -6,6 +6,7 @@ v-for="(item, index) in entries" :key="index" class="entry-item" + @tap="QEClick(item.path)" > @@ -21,37 +22,44 @@ diff --git a/gym-manage-uniapp/manifest.json b/gym-manage-uniapp/manifest.json index b801dbc..f6e57db 100644 --- a/gym-manage-uniapp/manifest.json +++ b/gym-manage-uniapp/manifest.json @@ -50,7 +50,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx8278fdbc9f158915", + "appid" : "wx8f0d644d1d8985f6", "setting" : { "urlCheck" : false }, diff --git a/gym-manage-uniapp/pages.json b/gym-manage-uniapp/pages.json index 2f03bac..dacfc0c 100644 --- a/gym-manage-uniapp/pages.json +++ b/gym-manage-uniapp/pages.json @@ -5,6 +5,12 @@ "style": { "navigationBarTitleText": "健身房" } + }, + { + "path": "pages/checkIn/checkIn", + "style": { + "navigationBarTitleText": "会员签到" + } } ], "globalStyle": { diff --git a/gym-manage-uniapp/pages/checkIn/checkIn.vue b/gym-manage-uniapp/pages/checkIn/checkIn.vue new file mode 100644 index 0000000..cf7dc07 --- /dev/null +++ b/gym-manage-uniapp/pages/checkIn/checkIn.vue @@ -0,0 +1,979 @@ + + + + + \ No newline at end of file diff --git a/gym-manage-uniapp/utils/request.js b/gym-manage-uniapp/utils/request.js new file mode 100644 index 0000000..7fed2bf --- /dev/null +++ b/gym-manage-uniapp/utils/request.js @@ -0,0 +1,215 @@ +const BASE_URL = 'http://192.168.43.89:8084/api' + +// 缓存相关常量 +const CACHE_PREFIX = 'API_CACHE_' +const CACHE_EXPIRE_TIME = 5 * 60 * 1000 // 默认缓存时间5分钟 + +/** + * 获取缓存数据 + * @param {string} key - 缓存键名 + * @returns {any} 缓存数据（过期返回null） + */ +export const getCache = (key) => { + try { + const cacheData = uni.getStorageSync(CACHE_PREFIX + key) + if (cacheData && cacheData.expireTime && Date.now() < cacheData.expireTime) { + return cacheData.data + } + // 缓存过期，清除 + uni.removeStorageSync(CACHE_PREFIX + key) + return null + } catch (e) { + console.error('获取缓存失败:', e) + return null + } +} + +/** + * 设置缓存数据 + * @param {string} key - 缓存键名 + * @param {any} data - 要缓存的数据 + * @param {number} expireTime - 过期时间（毫秒），默认5分钟 + */ +export const setCache = (key, data, expireTime = CACHE_EXPIRE_TIME) => { + try { + const cacheData = { + data: data, + expireTime: Date.now() + expireTime + } + uni.setStorageSync(CACHE_PREFIX + key, cacheData) + } catch (e) { + console.error('设置缓存失败:', e) + } +} + +/** + * 清除指定缓存 + * @param {string} key - 缓存键名 + */ +export const clearCache = (key) => { + try { + uni.removeStorageSync(CACHE_PREFIX + key) + } catch (e) { + console.error('清除缓存失败:', e) + } +} + +/** + * 清除所有API缓存 + */ +export const clearAllCache = () => { + try { + const keys = uni.getStorageInfoSync().keys || [] + for (const key of keys) { + if (key.startsWith(CACHE_PREFIX)) { + uni.removeStorageSync(key) + } + } + } catch (e) { + console.error('清除所有缓存失败:', e) + } +} + +/** + * 获取token + * @returns {string|null} token + */ +export const getToken = () => { + try { + return uni.getStorageSync('token') || null + } catch (e) { + console.error('获取token失败:', e) + return null + } +} + +/** + * 设置token + * @param {string} token - token值 + */ +export const setToken = (token) => { + try { + uni.setStorageSync('token', token) + } catch (e) { + console.error('设置token失败:', e) + } +} + +/** + * 清除token + */ +export const clearToken = () => { + try { + uni.removeStorageSync('token') + } catch (e) { + console.error('清除token失败:', e) + } +} + +/** + * 生成请求缓存键名 + * @param {string} url - 请求URL + * @param {object} data - 请求参数 + * @param {string} method - 请求方法 + * @returns {string} 缓存键名 + */ +const generateCacheKey = (url, data, method) => { + const params = JSON.stringify(data || {}) + return `${method}_${url}_${params}` +} + +/** + * 通用请求函数 + * @param {object} options - 请求配置 + * @param {string} options.url - 请求URL + * @param {string} [options.method='GET'] - 请求方法 + * @param {object} [options.data={}] - 请求参数 + * @param {object} [options.header={}] - 请求头 + * @param {boolean} [options.cache=false] - 是否启用缓存 + * @param {number} [options.cacheTime] - 缓存时间（毫秒） + * @param {boolean} [options.needToken=true] - 是否需要token + * @returns {Promise} 请求Promise + */ +export const request = (options) => { + return new Promise((resolve, reject) => { + const { + url, + method = 'GET', + data = {}, + header = {}, + cache = false, + cacheTime, + needToken = true + } = options + + // 生成缓存键名 + const cacheKey = cache ? generateCacheKey(url, data, method) : null + + // 如果启用缓存且存在有效缓存，直接返回缓存数据 + if (cache && cacheKey) { + const cachedData = getCache(cacheKey) + if (cachedData !== null) { + console.log(`[API] 命中缓存: ${url}`) + resolve(cachedData) + return + } + } + + // 构建请求头 + const requestHeader = { + 'Content-Type': 'application/json', + ...header + } + + // 如果需要token，自动添加到请求头 + if (needToken) { + const token = getToken() + if (token) { + requestHeader['Authorization'] = `Bearer ${token}` + } + } + + uni.request({ + url: BASE_URL + url, + method: method, + data: data, + header: requestHeader, + success: (res) => { + if (res.statusCode === 200) { + // 如果启用缓存，保存响应数据 + if (cache && cacheKey && res.data) { + setCache(cacheKey, res.data, cacheTime) + } + resolve(res.data) + } else if (res.statusCode === 401) { + // token过期，清除token并提示重新登录 + clearToken() + uni.showToast({ + title: '登录已过期，请重新登录', + icon: 'none' + }) + reject({ code: 401, message: '登录已过期' }) + } else { + reject({ code: res.statusCode, message: res.data?.message || '请求失败' }) + } + }, + fail: (err) => { + console.error(`[API] 请求失败: ${url}`, err) + reject({ code: -1, message: '网络请求失败', error: err }) + } + }) + }) +} + +// 工具函数导出 +export const requestUtils = { + getToken, + setToken, + clearToken, + getCache, + setCache, + clearCache, + clearAllCache +} + +export default request diff --git a/gym-manage-uniapp/vite.config.js b/gym-manage-uniapp/vite.config.js new file mode 100644 index 0000000..e15bb3b --- /dev/null +++ b/gym-manage-uniapp/vite.config.js @@ -0,0 +1,24 @@ +import { defineConfig } from 'vite' +import uni from '@dcloudio/vite-plugin-uni' +import path from 'path' + +// 用来匹配地址,解决跨域问题 +export default defineConfig({ + plugins: [uni()], + resolve: { + alias: { + '@': path.resolve(__dirname, 'src') + }, + }, + server: { + proxy: { + // 匹配所有 /api 开头的请求 + '/api': { + target: 'http://192.168.43.89:8084', // 你的后端SpringBoot地址 + changeOrigin: true, // 开启跨域伪装 + // rewrite: (path) => path.replace(/^\/areyouok/, '') + // 举例：前端请求 /api/login → 代理成 http://localhost:8088/login + } + } + } +}) \ No newline at end of file From 2357dcfc6768fe098fcc5d08dd9a7e7e59ba97f1 Mon Sep 17 00:00:00 2001 From: liwentao Date: Thu, 4 Jun 2026 13:05:26 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9B=A2=E8=AF=BE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=9F=BA=E7=A1=80=E4=BA=A4=E4=BA=92=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gym-manage-uniapp/api/envConfig.js | 13 + gym-manage-uniapp/api/groupCourse.mock.js | 407 ++++++++++ .../common/style/font/iconfont_courseCard.ttf | Bin 0 -> 2168 bytes .../style/font/iconfont_time_select.ttf | Bin 0 -> 2344 bytes .../common/style/iconfont_courseCard.css | 25 + .../common/style/iconfont_time_select.css | 29 + .../components/groupCourse/CourseCard.vue | 487 ++++++++++++ .../components/groupCourse/FilterSection.vue | 202 +++++ .../components/groupCourse/SearchBar.vue | 165 ++++ .../groupCourse/TimePeriodSelector.vue | 191 +++++ .../groupCourse/TimeRangePicker.vue | 728 ++++++++++++++++++ gym-manage-uniapp/docs/api-documentation.md | 234 ++++++ gym-manage-uniapp/pages/groupCourse/list.vue | 172 +++++ 13 files changed, 2653 insertions(+) create mode 100644 gym-manage-uniapp/api/envConfig.js create mode 100644 gym-manage-uniapp/api/groupCourse.mock.js create mode 100644 gym-manage-uniapp/common/style/font/iconfont_courseCard.ttf create mode 100644 gym-manage-uniapp/common/style/font/iconfont_time_select.ttf create mode 100644 gym-manage-uniapp/common/style/iconfont_courseCard.css create mode 100644 gym-manage-uniapp/common/style/iconfont_time_select.css create mode 100644 gym-manage-uniapp/components/groupCourse/CourseCard.vue create mode 100644 gym-manage-uniapp/components/groupCourse/FilterSection.vue create mode 100644 gym-manage-uniapp/components/groupCourse/SearchBar.vue create mode 100644 gym-manage-uniapp/components/groupCourse/TimePeriodSelector.vue create mode 100644 gym-manage-uniapp/components/groupCourse/TimeRangePicker.vue create mode 100644 gym-manage-uniapp/docs/api-documentation.md create mode 100644 gym-manage-uniapp/pages/groupCourse/list.vue diff --git a/gym-manage-uniapp/api/envConfig.js b/gym-manage-uniapp/api/envConfig.js new file mode 100644 index 0000000..5fb6881 --- /dev/null +++ b/gym-manage-uniapp/api/envConfig.js @@ -0,0 +1,13 @@ +/** + * 环境配置文件 + * 当前仅使用模拟数据（开发模式） + */ + +import { groupCourseMockApi } from './groupCourse.mock.js' + +/** + * 团课服务（仅使用模拟数据） + */ +export const groupCourseService = groupCourseMockApi + +export default groupCourseService diff --git a/gym-manage-uniapp/api/groupCourse.mock.js b/gym-manage-uniapp/api/groupCourse.mock.js new file mode 100644 index 0000000..1f0aa29 --- /dev/null +++ b/gym-manage-uniapp/api/groupCourse.mock.js @@ -0,0 +1,407 @@ +/** + * 团课模拟数据（测试环境使用） + * 数据格式与后端返回格式保持一致 + */ + +// 模拟团课列表数据（与后端返回格式一致） +const mockCourseList = [ + { + "id": "1", + "createBy": "admin", + "updateBy": null, + "createdAt": "2026-06-01T11:00:00", + "updatedAt": "2026-06-01T11:00:00", + "deletedAt": null, + "courseName": "极速燃脂单车", + "coachId": "104", + "courseType": "2", + "startTime": "2026-06-02T16:45:00", + "endTime": "2026-06-15T20:20:00", + "maxMembers": 25, + "currentMembers": 0, + "status": "0", + "location": "单车房", + "coverImage": "https://picsum.photos/seed/spinning/640/360", + "description": "跟随音乐节奏变换阻力和速度，体验爬坡与冲刺的快感，一节课消耗800大卡。支持次数卡(1次)或储值卡(50元)支付。", + "pointCardAmount": 0, + "storedValueAmount": 0 + }, + { + "id": "3", + "createBy": "coach_zhang", + "updateBy": null, + "createdAt": "2026-06-01T14:30:00", + "updatedAt": "2026-06-01T14:30:00", + "deletedAt": null, + "courseName": "燃脂搏击", + "coachId": "102", + "courseType": "2", + "startTime": "2026-06-10T18:30:00", + "endTime": "2026-06-10T19:30:00", + "maxMembers": 20, + "currentMembers": 20, + "status": "0", + "location": "综合训练区", + "coverImage": "https://picsum.photos/seed/kickboxing/640/360", + "description": "高强度间歇训练，配合音乐快速燃脂，释放压力。名额已满，无法预约。支持次数卡(1次)或储值卡(60元)支付。", + "pointCardAmount": 1, + "storedValueAmount": 60 + }, + { + "id": "4", + "createBy": "coach_li", + "updateBy": null, + "createdAt": "2026-06-01T08:00:00", + "updatedAt": "2026-06-01T08:00:00", + "deletedAt": null, + "courseName": "哈他瑜伽", + "coachId": "101", + "courseType": "1", + "startTime": "2026-06-01T15:20:00", + "endTime": "2026-06-01T16:50:00", + "maxMembers": 12, + "currentMembers": 3, + "status": "0", + "location": "瑜伽教室B", + "coverImage": "https://picsum.photos/seed/yoga/640/360", + "description": "基础哈他瑜伽，适合所有级别。距开始不足30分钟，已停止预约。支持次数卡(1次)或储值卡(40元)支付。", + "pointCardAmount": 1, + "storedValueAmount": 40 + }, + { + "id": "5", + "createBy": "coach_wang", + "updateBy": null, + "createdAt": "2026-05-28T08:00:00", + "updatedAt": "2026-05-28T08:00:00", + "deletedAt": null, + "courseName": "周末冥想修复", + "coachId": "101", + "courseType": "1", + "startTime": "2026-06-20T15:00:00", + "endTime": "2026-06-20T16:00:00", + "maxMembers": 12, + "currentMembers": 3, + "status": "1", + "location": "冥想室", + "coverImage": "https://picsum.photos/seed/meditation/640/360", + "description": "通过呼吸和正念冥想，深度放松身心。该课程已被取消。支持次数卡(1次)或储值卡(30元)支付。", + "pointCardAmount": 1, + "storedValueAmount": 30 + }, + { + "id": "6", + "createBy": "coach_li", + "updateBy": null, + "createdAt": "2026-05-20T09:15:00", + "updatedAt": "2026-05-20T09:15:00", + "deletedAt": null, + "courseName": "蜜桃臀塑造", + "coachId": "103", + "courseType": "3", + "startTime": "2026-05-30T19:00:00", + "endTime": "2026-05-30T20:00:00", + "maxMembers": 10, + "currentMembers": 8, + "status": "2", + "location": "私教专区", + "coverImage": "https://picsum.photos/seed/glute/640/360", + "description": "针对性训练臀部肌肉群，课程已于5月30日结束，无法预约。支持次数卡(1次)或储值卡(80元)支付。", + "pointCardAmount": 1, + "storedValueAmount": 80 + }, + { + "id": "7", + "createBy": "admin", + "updateBy": null, + "createdAt": "2026-05-25T09:00:00", + "updatedAt": "2026-05-25T09:00:00", + "deletedAt": null, + "courseName": "午间冥想放松", + "coachId": "101", + "courseType": "1", + "startTime": "2026-05-31T12:00:00", + "endTime": "2026-05-31T13:00:00", + "maxMembers": 15, + "currentMembers": 6, + "status": "2", + "location": "冥想室", + "coverImage": "https://picsum.photos/seed/noonmeditation/640/360", + "description": "午间冥想课程，已于5月31日结束。支持次数卡(1次)或储值卡(25元)支付。", + "pointCardAmount": 1, + "storedValueAmount": 25 + }, + { + "id": "8", + "createBy": "admin", + "updateBy": null, + "createdAt": "2026-06-01T10:00:00", + "updatedAt": "2026-06-01T10:00:00", + "deletedAt": null, + "courseName": "燃脂搏击_次数卡课程", + "coachId": "102", + "courseType": "2", + "startTime": "2026-06-10T19:30:00", + "endTime": "2026-06-10T20:30:00", + "maxMembers": 20, + "currentMembers": 0, + "status": "0", + "location": "综合训练区", + "coverImage": null, + "description": "高强度间歇训练，配合音乐快速燃脂，消耗1次", + "pointCardAmount": 1, + "storedValueAmount": 0 + }, + { + "id": "9", + "createBy": "admin", + "updateBy": null, + "createdAt": "2026-06-01T10:00:00", + "updatedAt": "2026-06-01T10:00:00", + "deletedAt": null, + "courseName": "高端普拉提_储值卡课程", + "coachId": "103", + "courseType": "1", + "startTime": "2026-06-11T19:00:00", + "endTime": "2026-06-11T20:00:00", + "maxMembers": 15, + "currentMembers": 0, + "status": "0", + "location": "普拉提教室", + "coverImage": null, + "description": "精准训练核心肌群，消耗储值50元", + "pointCardAmount": 0, + "storedValueAmount": 20 + }, + { + "id": "11", + "createBy": "admin", + "updateBy": null, + "createdAt": "2026-06-02T10:00:00", + "updatedAt": "2026-06-02T10:00:00", + "deletedAt": null, + "courseName": "时间冲突测试_A_13点-15点", + "coachId": "102", + "courseType": "2", + "startTime": "2026-06-15T13:00:00", + "endTime": "2026-06-15T15:00:00", + "maxMembers": 20, + "currentMembers": 0, + "status": "0", + "location": "综合训练区", + "coverImage": null, + "description": "测试用团课A，用于验证时间冲突检测。支持次数卡(1次)或储值卡(50元)支付。", + "pointCardAmount": 1, + "storedValueAmount": 50 + }, + { + "id": "12", + "createBy": "admin", + "updateBy": null, + "createdAt": "2026-06-02T10:00:00", + "updatedAt": "2026-06-02T10:00:00", + "deletedAt": null, + "courseName": "时间冲突测试_B_14点-16点", + "coachId": "103", + "courseType": "1", + "startTime": "2026-06-15T14:00:00", + "endTime": "2026-06-15T16:00:00", + "maxMembers": 15, + "currentMembers": 0, + "status": "0", + "location": "普拉提教室", + "coverImage": null, + "description": "测试用团课B，与团课A时间重叠（14:00-15:00）。支持次数卡(1次)或储值卡(50元)支付。", + "pointCardAmount": 1, + "storedValueAmount": 50 + }, + { + "id": "13", + "createBy": "admin", + "updateBy": null, + "createdAt": "2026-06-02T10:00:00", + "updatedAt": "2026-06-02T10:00:00", + "deletedAt": null, + "courseName": "时间冲突测试_C_10点-12点", + "coachId": "101", + "courseType": "1", + "startTime": "2026-06-15T10:00:00", + "endTime": "2026-06-15T12:00:00", + "maxMembers": 15, + "currentMembers": 0, + "status": "0", + "location": "瑜伽教室", + "coverImage": null, + "description": "测试用团课C，与团课A/B不冲突。支持次数卡(1次)或储值卡(50元)支付。", + "pointCardAmount": 1, + "storedValueAmount": 50 + }, + { + "id": "14", + "createBy": "system", + "updateBy": "system", + "createdAt": "2026-06-02T17:32:50.532336", + "updatedAt": "2026-06-02T17:32:50.532336", + "deletedAt": null, + "courseName": "动感单车aaa", + "coachId": "2", + "courseType": "2", + "startTime": "2026-06-05T18:00:00", + "endTime": "2026-06-05T19:00:00", + "maxMembers": 25, + "currentMembers": 0, + "status": "0", + "location": "健身房B区", + "coverImage": "https://example.com/spinning.jpg", + "description": "高强度有氧运动课程", + "pointCardAmount": 1, + "storedValueAmount": 50 + }, + { + "id": "2", + "createBy": "admin", + "updateBy": null, + "createdAt": "2026-06-01T10:00:00", + "updatedAt": "2026-06-02T17:35:35.155616", + "deletedAt": null, + "courseName": "清晨流瑜伽", + "coachId": "101", + "courseType": "1", + "startTime": "2026-06-12T09:00:00", + "endTime": "2026-06-12T10:30:00", + "maxMembers": 15, + "currentMembers": 6, + "status": "0", + "location": "A座3楼瑜伽教室", + "coverImage": "https://picsum.photos/seed/yogaflow/640/360", + "description": "适合有一定基础的学员，通过流畅的体式连接呼吸，唤醒身体能量。支持次数卡(1次)或储值卡(45元)支付。", + "pointCardAmount": 1, + "storedValueAmount": 45 + }, + { + "id": "15", + "createBy": "system", + "updateBy": "system", + "createdAt": "2026-06-02T17:57:27.483488", + "updatedAt": "2026-06-02T17:57:27.483488", + "deletedAt": null, + "courseName": "动感单车", + "coachId": "2", + "courseType": "2", + "startTime": "2026-06-05T18:00:00", + "endTime": "2026-06-05T19:00:00", + "maxMembers": 25, + "currentMembers": 0, + "status": "0", + "location": "健身房B区", + "coverImage": "https://example.com/spinning.jpg", + "description": "高强度有氧运动课程", + "pointCardAmount": 1, + "storedValueAmount": 50 + } +] + +/** + * 模拟团课API（测试环境） + * 接口签名与真实API保持一致 + */ +export const groupCourseMockApi = { + /** + * 获取团课列表（支持分页） + * @param {Object} params - 查询参数 + * @param {number} params.pageNum - 页码（从1开始） + * @param {number} params.pageSize - 每页数量 + * @returns {Promise} - 分页团课列表数据 + */ + getList: (params = {}) => { + return new Promise((resolve) => { + setTimeout(() => { + const pageNum = params.pageNum || 1 + const pageSize = params.pageSize || 10 + + const total = mockCourseList.length + const startIndex = (pageNum - 1) * pageSize + const endIndex = startIndex + pageSize + const list = mockCourseList.slice(startIndex, endIndex) + + console.log('[groupCourse.mock.js] 模拟获取团课列表（分页）:', { + pageNum, + pageSize, + total, + listCount: list.length + }) + + resolve({ + code: 0, + message: 'success', + data: { + list, + total, + pageNum, + pageSize, + totalPages: Math.ceil(total / pageSize) + } + }) + }, 500) + }) + }, + + /** + * 获取团课详情 + * @param {string} id - 课程ID + * @returns {Promise} - 团课详情数据 + */ + getDetail: (id) => { + return new Promise((resolve, reject) => { + setTimeout(() => { + console.log('[groupCourse.mock.js] 模拟获取团课详情:', id) + const course = mockCourseList.find(item => item.id === id) + if (course) { + resolve(course) + } else { + reject({ code: -1, message: '课程不存在' }) + } + }, 300) + }) + }, + + /** + * 预约团课 + * @param {Object} data - 预约数据 + * @param {string} data.courseId - 课程ID + * @param {string} data.memberId - 会员ID + * @returns {Promise} - 预约结果 + */ + book: (data) => { + return new Promise((resolve) => { + setTimeout(() => { + console.log('[groupCourse.mock.js] 模拟预约团课:', data) + resolve({ + code: 0, + message: '预约成功', + data: { bookingId: `BK${Date.now()}` } + }) + }, 400) + }) + }, + + /** + * 取消预约 + * @param {string} id - 预约记录ID + * @returns {Promise} - 取消结果 + */ + cancelBooking: (id) => { + return new Promise((resolve) => { + setTimeout(() => { + console.log('[groupCourse.mock.js] 模拟取消预约:', id) + resolve({ + code: 0, + message: '取消成功', + data: null + }) + }, 300) + }) + } +} + +export default groupCourseMockApi diff --git a/gym-manage-uniapp/common/style/font/iconfont_courseCard.ttf b/gym-manage-uniapp/common/style/font/iconfont_courseCard.ttf new file mode 100644 index 0000000000000000000000000000000000000000..3e233cbcaaadade29cc21c3e138631c433669f43 GIT binary patch literal 2168 zcmd^AOK%%h6h3#xkHmQp)s7pC5?OBJB(-sp@i-upSShLP#zF$xI&q|^;Mn6wTf;9BvB#l3_w?CuX?h~@FytM`&u7Z%+LyaS*CGFd z{$9ScnfvaOZ(~H_M?}K$f|AaTf0lHDdk1~00EP9o_$u%>=*J6Xb)ydewtrygD^)XT zwnaB!|1M-(IlWP1N9b9s4?uQT(q*OZ!|5-G%s;|^zE*9hw?22iPt-Ai^%x;`al5rm z%O;3K7w{EQfvQY-qyXn$9 zuW@rw@BAG0=Jjs8g(bRy`=A|K>!SD)-q3F9r%5`6x_Ww31A;;sIsqG3{a25w8%ExghbSeup5CKjHT$Qhe|aheC-^h$Vx;Wa_8X zf)t#UQq%E{0oOoBd^#n~?(bMEZ(s9`#pgerkDc&c6Lx)xMQ*v6@ck{rG$EhNr4}Y- zd2%6@OI*rdUOsQ@?zWv@zMQ|bZ}059$tL5;)A2DMe4I|k_kZSDwr+~M;z>G&n?x+a zLdXW0^*fwLdl`}l9*8$6j|A9=C&1(glZKe1mkC!wk?8uH>(NMPX~#P{8wxHi{j#(e z49$*ucbalamQw{juvO26x#)Tnzqt#Z!L4L!rNC*NUsy>cw}J){Y<@^MiPrbx*J79) zG)7@wZC+BXq7pBlR%WYKMh9Q<@Um;6+C#F}V;N))=M$*B>^&yXMm`&!nF(j}f40F! zK9!VYS>lB@z-xAw-80bavD#R+e^e1`t9fc zFm?kAWTi(8EJE)wunG8tfz9|DNCvh*KVx7U`S5S3`|N_p8mh!ho!G}quNat7A6+-F zK)v*pfko(lFt7>uR|A{LNqYviK>x3SZM4984BSOtmYJ(7X;sO(S2o?nOtq4$R@C-< zM#-<0()G63o)?sQqgbuDCj%30Ra~hk^|qVFdR|i1oI6*qmfbPBRDj79U zP}N#^e4OvY^?^*aOmkExh0>&A%#xc{XcJ?RGE}7s<+M?~Pd)>7p4O-Y%ldt*hpiXD zu2Ta%?$eE{9>B#o%!-3m(U^y$Y0x@$lMthdh}`IPcq#+MjQA8pQUZ440QuS~{A9om zP(ib*;dLL!)6S>O4`_Lo`A0}^{9E{-W?}*pnTeUnk}YP7=}Ko^sl2fEC`N0eP+WzE GoBaoxxl`Q$ literal 0 HcmV?d00001 diff --git a/gym-manage-uniapp/common/style/font/iconfont_time_select.ttf b/gym-manage-uniapp/common/style/font/iconfont_time_select.ttf new file mode 100644 index 0000000000000000000000000000000000000000..c1d24b12f6859ee5f65c7f5ea94ce97856396e79 GIT binary patch literal 2344 zcmd^B-%ne06hG(Q_TEA(wxcV8tZQj$S=(LMrL<|vyri3GI8@#E-hPsS;{tM z#z>qdX3M}BUwq&}UuNQi55}n315eJFCBCUKx)~o>)cInv2V-bG-+OPf$@U+3+VA)K zIX}PWobR{y77zfeunIi%j7^<*-gC9{A^<)|(&I;`y5)g)XTK%>8u72D^GfNnPXCVp z9I<#KlUtr2TR-_G0RJh;Ze~?wuKVNRJSl&n5zCT5yu-gm_$Cd1Heb2mBtX9RX>#U@ zX$4PlUF3g*cw1h%P(mlXO!{Yt_Y{=8YX5NH69Az^@iV33V&(pXa2mk!1L=b6^>mp^BQ`dZsG0Y6BrMJtUdSR^wXrNM|5 z+(;jQ8e@r=z7cvL3Ear&i^riUr&J2i#*)y8=^w?ITgWIBU-v}PF)fk=K`^8y6W}`A zk$aoFO|mt8#Xmqs^5nqGlk^ERIiH$?&8?MMP3s5nKfx-Qu^b)}$2QzKNW>~+aU;4K zvxeU+Nm+yltyDS5O%NmAqIYR)W$W&}D>drJLquA=CT7Dn<5&b__5I(;rZr&DXagO? z)`~vZk!;=72fJtYuIPh0hjiQ6(9Z{8628GEJf)o$@c(dGXazsrK|r5`!9Xz3Aqrv> zioOoP>FV{$v1kD07B{wdlNgVo_o0~Iy3R$Vp2X0#p+t`q<*ql_Yz_QvnyZe<)W{US z{Q*BUlER^?+hVg>@K>7AlDZ`Kw(r@~-YZ{9*&H_dVm!2O?Zk<-eW7Ynm#_lqM%6a? zO@0uZupbV>2>n(8S#pB2#ns}H^ z$P#DOh@Exh<6wC~?N227)rG(6;QiR>_{R8X&P|j{9o{&c(qQ%HCQrM=FZ&(8wfTI# zK3^NY-sJE z^hYB7+r3;@Xm9oG-VhFO-))CB{K?KPlRP;yDVw6z0rJ4~{$b%yad@S=><)+BUnN-Y z=?2vv@W**8xS^Mhg7%P*TASopBQ+Rnk=51`h1hM<%(vaQX*?-m=kBTmrgWol?I(}$zzs2RU za}Ahy?VXM5#s15E;n4UCFAbiXk>yJA$XbCV2)p18-D;hhY0)uz5;hx{0}-AzFi-Lh z1Dgnk3~Z*imTX{w)WouN2svX&sLd6np~ z(oLUwJ#~9YtCRkMus1d%_RfA1nUO;tO=zaKlXy`nrn726%&3LT+)~kUVL>^+l+G&V LW%azG-P(Tv+O2EK literal 0 HcmV?d00001 diff --git a/gym-manage-uniapp/common/style/iconfont_courseCard.css b/gym-manage-uniapp/common/style/iconfont_courseCard.css new file mode 100644 index 0000000..98fb44c --- /dev/null +++ b/gym-manage-uniapp/common/style/iconfont_courseCard.css @@ -0,0 +1,25 @@ +@font-face { + font-family: "iconfont_courseCard"; /* Project id */ + src: url('./font/iconfont_courseCard.ttf?t=1780537357472') format('truetype'); +} + +.iconfont_courseCard { + font-family: "iconfont_courseCard" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-didian:before { + content: "\e61a"; +} + +.icon-renwu-ren:before { + content: "\e749"; +} + +.icon-shijian:before { + content: "\e61d"; +} + diff --git a/gym-manage-uniapp/common/style/iconfont_time_select.css b/gym-manage-uniapp/common/style/iconfont_time_select.css new file mode 100644 index 0000000..1efde39 --- /dev/null +++ b/gym-manage-uniapp/common/style/iconfont_time_select.css @@ -0,0 +1,29 @@ +@font-face { + font-family: "iconfont_time_select"; /* Project id */ + src: url('./font/iconfont_time_select.ttf?t=1780535096813') format('truetype'); +} + +.iconfont_time_select { + font-family: "iconfont_time_select" !important; + font-size: 25px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-zaochen:before { + content: "\e784"; +} + +.icon-gengduo:before { + content: "\e6df"; +} + +.icon-xiawucha:before { + content: "\100ff"; +} + +.icon-yewan:before { + content: "\e67e"; +} + diff --git a/gym-manage-uniapp/components/groupCourse/CourseCard.vue b/gym-manage-uniapp/components/groupCourse/CourseCard.vue new file mode 100644 index 0000000..2ff731e --- /dev/null +++ b/gym-manage-uniapp/components/groupCourse/CourseCard.vue @@ -0,0 +1,487 @@ + + + + + \ No newline at end of file diff --git a/gym-manage-uniapp/components/groupCourse/FilterSection.vue b/gym-manage-uniapp/components/groupCourse/FilterSection.vue new file mode 100644 index 0000000..d97595d --- /dev/null +++ b/gym-manage-uniapp/components/groupCourse/FilterSection.vue @@ -0,0 +1,202 @@ + + + + + \ No newline at end of file diff --git a/gym-manage-uniapp/components/groupCourse/SearchBar.vue b/gym-manage-uniapp/components/groupCourse/SearchBar.vue new file mode 100644 index 0000000..cec1e7b --- /dev/null +++ b/gym-manage-uniapp/components/groupCourse/SearchBar.vue @@ -0,0 +1,165 @@ + + + + + \ No newline at end of file diff --git a/gym-manage-uniapp/components/groupCourse/TimePeriodSelector.vue b/gym-manage-uniapp/components/groupCourse/TimePeriodSelector.vue new file mode 100644 index 0000000..ef71591 --- /dev/null +++ b/gym-manage-uniapp/components/groupCourse/TimePeriodSelector.vue @@ -0,0 +1,191 @@ + + + + + \ No newline at end of file diff --git a/gym-manage-uniapp/components/groupCourse/TimeRangePicker.vue b/gym-manage-uniapp/components/groupCourse/TimeRangePicker.vue new file mode 100644 index 0000000..bb70cdc --- /dev/null +++ b/gym-manage-uniapp/components/groupCourse/TimeRangePicker.vue @@ -0,0 +1,728 @@ + + + + + \ No newline at end of file diff --git a/gym-manage-uniapp/docs/api-documentation.md b/gym-manage-uniapp/docs/api-documentation.md new file mode 100644 index 0000000..2f508e9 --- /dev/null +++ b/gym-manage-uniapp/docs/api-documentation.md @@ -0,0 +1,234 @@ +# 团课管理系统 API 文档 + +## 1. 项目概述 + +本项目是一个基于 UniApp 的健身房团课管理系统，包含完整的 API 层设计，支持开发/生产环境的快速切换。 + +### 1.1 项目结构 + +``` +gym-manage-uniapp/ +├── api/ # API 层目录 +│ ├── requestBase.js # 基础请求封装 +│ ├── groupCourse.js # 团课真实API +│ ├── groupCourse.mock.js # 团课模拟数据API +│ └── envConfig.js # 环境配置与服务导出 +├── pages/ +│ └── groupCourse/ +│ └── list.vue # 团课列表页面 +└── components/ # 组件目录 +``` + +--- + +## 2. API 层设计 + +### 2.1 架构设计 + +| 层级 | 文件 | 职责 | +|------|------|------| +| 基础层 | `requestBase.js` | 封装 uni.request，统一处理加载状态、错误提示 | +| 接口层 | `groupCourse.js` | 定义真实后端API接口 | +| 模拟层 | `groupCourse.mock.js` | 提供模拟数据，支持开发测试 | +| 配置层 | `envConfig.js` | 环境配置，统一服务导出入口 | + +### 2.2 环境切换机制 + +通过修改 `envConfig.js` 中的 `ENV_MODE` 变量实现环境切换： + +```javascript +// envConfig.js +export const ENV_MODE = 'development' // 'production' | 'development' +``` + +- **`production`**：生产环境，使用真实网络请求 +- **`development`**：开发环境，使用模拟数据 + +--- + +## 3. 文件详细说明 + +### 3.1 requestBase.js - 基础请求封装 + +**功能定位**：封装 `uni.request`，提供统一的请求处理逻辑。 + +**核心特性**： +- 自动显示/隐藏加载提示 +- 统一的响应状态码处理 +- 统一的错误提示机制 + +**接口定义**： + +| 方法 | 说明 | 参数 | 返回值 | +|------|------|------|--------| +| `request(options)` | 发起网络请求 | `options` 对象 | `Promise` | + +**options 参数**： + +| 参数 | 类型 | 必填 | 说明 | +|------|------|------|------| +| `url` | string | 是 | 请求路径 | +| `method` | string | 否 | 请求方法，默认 `GET` | +| `data` | object | 否 | 请求数据 | +| `header` | object | 否 | 请求头 | + +**响应数据结构**： + +```javascript +// 成功响应 +{ + code: 0, // 状态码，0表示成功 + message: 'success', // 提示信息 + data: {} // 业务数据 +} +``` + +### 3.2 groupCourse.js - 团课真实 API + +**功能定位**：定义团课相关的真实后端接口。 + +**接口列表**： + +| 方法 | 说明 | 参数 | HTTP方法 | 路径 | +|------|------|------|----------|------| +| `getList()` | 获取团课列表 | 无 | GET | `/api/groupCourse/list` | +| `getDetail(id)` | 获取团课详情 | `id`: 课程ID | GET | `/api/groupCourse/detail/{id}` | +| `book(data)` | 预约团课 | `data`: 预约数据 | POST | `/api/groupCourse/book` | +| `cancelBooking(id)` | 取消预约 | `id`: 预约记录ID | POST | `/api/groupCourse/cancel/{id}` | + +**book 方法参数结构**： + +```javascript +{ + courseId: string, // 课程ID + memberId: string // 会员ID +} +``` + +### 3.3 groupCourse.mock.js - 团课模拟数据 API + +**功能定位**：提供模拟数据，支持开发测试，无需后端服务。 + +**特性**： +- 模拟网络延迟（300-500ms） +- 接口签名与真实API完全一致 +- 包含6条完整的模拟团课数据 + +**模拟数据结构**： + +| 字段 | 类型 | 说明 | +|------|------|------| +| `id` | string | 课程唯一标识 | +| `courseName` | string | 课程名称 | +| `coachName` | string | 教练姓名 | +| `coachAvatar` | string | 教练头像 | +| `startTime` | string | 开始时间（ISO格式） | +| `endTime` | string | 结束时间（ISO格式） | +| `duration` | number | 课程时长（分钟） | +| `location` | string | 上课地点 | +| `maxMembers` | number | 最大人数 | +| `currentMembers` | number | 当前人数 | +| `storedValueAmount` | number | 储值卡价格（元） | +| `pointCardAmount` | number | 次卡次数 | +| `courseType` | string | 课程类型 | +| `level` | string | 难度级别 | +| `description` | string | 课程描述 | +| `tags` | array | 标签列表 | +| `status` | string | 状态（available/closed） | + +### 3.4 envConfig.js - 环境配置 + +**功能定位**：统一服务导出入口，根据环境模式自动选择 API 实现。 + +**导出内容**： + +| 导出项 | 类型 | 说明 | +|--------|------|------| +| `ENV_MODE` | string | 当前环境模式 | +| `groupCourseService` | object | 团课服务实例 | + +--- + +## 4. 使用示例 + +### 4.1 在页面中使用 + +```javascript +// pages/groupCourse/list.vue +import { groupCourseService } from '@/api/envConfig.js' + +// 获取团课列表 +const fetchCourseList = async () => { + try { + const data = await groupCourseService.getList() + courseList.value = data + console.log('团课列表获取成功:', data) + } catch (error) { + console.error('获取团课列表异常:', error) + } +} +``` + +### 4.2 切换环境 + +```javascript +// api/envConfig.js +// 开发环境 - 使用模拟数据 +export const ENV_MODE = 'development' + +// 生产环境 - 使用真实网络请求 +export const ENV_MODE = 'production' +``` + +--- + +## 5. 数据流转图 + +``` +┌─────────────────────────────────────────────────────────────┐ +│ 页面层 (View) │ +│ pages/groupCourse/list.vue │ +└───────────────────────────┬─────────────────────────────────┘ + │ import & call + ▼ +┌─────────────────────────────────────────────────────────────┐ +│ 环境配置层 (Config) │ +│ api/envConfig.js │ +│ 根据 ENV_MODE 选择对应的服务实现 │ +└───────────────────────────┬─────────────────────────────────┘ + │ + ┌─────────────────┴─────────────────┐ + ▼ ▼ +┌─────────────────────────┐ ┌─────────────────────────────┐ +│ groupCourse.js │ │ groupCourse.mock.js │ +│ (production 环境) │ │ (development 环境) │ +└───────────┬─────────────┘ └─────────────┬───────────────┘ + │ │ + ▼ ▼ +┌─────────────────────────┐ ┌─────────────────────┐ +│ requestBase.js │ │ 本地模拟数据 │ +│ (真实网络请求) │ │ (无需后端) │ +└───────────┬─────────────┘ └─────────────────────┘ + │ + ▼ +┌─────────────────────────┐ +│ 后端服务器 API │ +└─────────────────────────┘ +``` + +--- + +## 6. 注意事项 + +1. **环境变量配置**：部署前务必确认 `ENV_MODE` 设置正确 +2. **数据一致性**：模拟数据结构应与真实API保持一致 +3. **错误处理**：所有API调用都应包含 try-catch 错误处理 +4. **日志记录**：建议在关键节点添加日志，便于调试 + +--- + +## 7. 版本历史 + +| 版本 | 日期 | 更新内容 | +|------|------|----------| +| v1.0 | 2026-06-04 | 初始版本，完成基础API层设计 | diff --git a/gym-manage-uniapp/pages/groupCourse/list.vue b/gym-manage-uniapp/pages/groupCourse/list.vue new file mode 100644 index 0000000..4870609 --- /dev/null +++ b/gym-manage-uniapp/pages/groupCourse/list.vue @@ -0,0 +1,172 @@ + + + + + \ No newline at end of file From 349b7ae03b2c69994c61a4b1cec4c570e9f2318b Mon Sep 17 00:00:00 2001 From: liwentao Date: Thu, 4 Jun 2026 13:06:54 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=81=97=E5=A4=B1?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../composables/useGroupCourseList.js | 228 ++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 gym-manage-uniapp/composables/useGroupCourseList.js diff --git a/gym-manage-uniapp/composables/useGroupCourseList.js b/gym-manage-uniapp/composables/useGroupCourseList.js new file mode 100644 index 0000000..1fbf56f --- /dev/null +++ b/gym-manage-uniapp/composables/useGroupCourseList.js @@ -0,0 +1,228 @@ +import { ref, computed } from 'vue' +import { groupCourseService } from '@/api/envConfig.js' + +export function useGroupCourseList() { + // 分页相关 + const pageNum = ref(1) + const pageSize = ref(10) + const total = ref(0) + const totalPages = ref(0) + const loading = ref(false) + const hasMore = ref(true) + + // 团课列表数据 + const courseList = ref([]) + + // 搜索相关 + const searchKeyword = ref('') + const hotKeywords = ref(['燃脂', '瑜伽', '单车', '普拉提', '高强度']) + + // 排序相关 + const sortOptions = ref([ + { label: '默认排序', value: 'default' }, + { label: '价格从低到高', value: 'priceAsc' }, + { label: '价格从高到低', value: 'priceDesc' }, + { label: '剩余名额最多', value: 'spotsDesc' } + ]) + const sortIndex = ref(0) + + // 时间段选择相关 + const timePeriodOptions = ref([ + { label: '全部', value: 'all' }, + { label: '早上 (6-12 点)', value: 'morning', startHour: 6, endHour: 12 }, + { label: '下午 (12-18 点)', value: 'afternoon', startHour: 12, endHour: 18 }, + { label: '晚上 (18-24 点)', value: 'evening', startHour: 18, endHour: 24 } + ]) + const timePeriodIndex = ref(0) + + // 时间筛选相关 + const showTimePicker = ref(false) + const startDate = ref('') + const endDate = ref('') + const timeRangeText = ref('') + + // 筛选后的课程列表 + const filteredCourseList = computed(() => { + let result = [...courseList.value] + + // 关键词搜索 + if (searchKeyword.value) { + result = result.filter(course => + course.courseName.includes(searchKeyword.value) + ) + } + + // 时间范围筛选 + if (startDate.value || endDate.value) { + result = result.filter(course => { + const courseDate = course.startTime.split('T')[0] + if (startDate.value && courseDate < startDate.value) return false + if (endDate.value && courseDate > endDate.value) return false + return true + }) + } + + // 时间段筛选 + const timePeriod = timePeriodOptions.value[timePeriodIndex.value] + if (timePeriod.value !== 'all') { + result = result.filter(course => { + const courseHour = new Date(course.startTime).getHours() + return courseHour >= timePeriod.startHour && courseHour < timePeriod.endHour + }) + } + + // 排序 + const sortType = sortOptions.value[sortIndex.value].value + if (sortType === 'priceAsc') { + result.sort((a, b) => (a.storedValueAmount || a.pointCardAmount) - (b.storedValueAmount || b.pointCardAmount)) + } else if (sortType === 'priceDesc') { + result.sort((a, b) => (b.storedValueAmount || b.pointCardAmount) - (a.storedValueAmount || a.pointCardAmount)) + } else if (sortType === 'spotsDesc') { + result.sort((a, b) => (b.maxMembers - b.currentMembers) - (a.maxMembers - a.currentMembers)) + } + + return result + }) + + // 获取所有搜索参数 + const getAllSearchParams = (searchBarRef, filterSectionRef, timePeriodRef, timeRangePickerRef) => { + const searchParams = searchBarRef?.getSearchParams?.() || { keyword: searchKeyword.value } + const filterParams = filterSectionRef?.getFilterParams?.() || { sortType: sortOptions.value[sortIndex.value].value } + const timePeriodParams = timePeriodRef?.getTimePeriodParams?.() || { index: timePeriodIndex.value, value: timePeriodOptions.value[timePeriodIndex.value].value } + const timeRangeParams = timeRangePickerRef?.getTimeRangeParams?.() || { startDate: startDate.value, endDate: endDate.value, timeRangeText: timeRangeText.value } + + const allParams = { + search: searchParams, + filter: filterParams, + timePeriod: timePeriodParams, + timeRange: timeRangeParams + } + + console.log('[useGroupCourseList] 获取所有搜索参数:', allParams) + return allParams + } + + // 搜索处理 + const handleSearch = (params) => { + console.log('[useGroupCourseList] 搜索触发:', params) + uni.showToast({ + title: params.keyword ? `搜索：${params.keyword}` : '请输入关键词', + icon: 'none' + }) + } + + // 时间段变化处理 + const onTimePeriodChange = (option) => { + console.log('[useGroupCourseList] 时间段选择:', option) + } + + // 时间范围确认处理 + const onTimeRangeConfirm = (params) => { + console.log('[useGroupCourseList] 时间范围确认:', params) + timeRangeText.value = params.timeRangeText + } + + // 预约处理 + const handleBooking = (course) => { + console.log('[useGroupCourseList] 预约课程:', course) + uni.showToast({ + title: `预约课程：${course.courseName}`, + icon: 'success' + }) + } + + // 跳转详情 + const goDetail = (courseId) => { + console.log('[useGroupCourseList] 跳转到课程详情:', courseId) + uni.navigateTo({ + url: `/pages/groupCourse/detail?id=${courseId}` + }) + } + + // 获取团课列表 + const fetchCourseList = async (isLoadMore = false) => { + if (loading.value) return + + loading.value = true + + try { + const result = await groupCourseService.getList({ + pageNum: pageNum.value, + pageSize: pageSize.value + }) + + if (result.code === 0 && result.data) { + const { list, total: totalCount, pageNum: currentPage, totalPages: pages } = result.data + + if (isLoadMore) { + courseList.value = [...courseList.value, ...list] + } else { + courseList.value = list + } + + total.value = totalCount + pageNum.value = currentPage + totalPages.value = pages + hasMore.value = pageNum.value < totalPages.value + + console.log('[useGroupCourseList] 团课列表获取成功:', { + total: total.value, + currentPage: pageNum.value, + totalPages: totalPages.value, + hasMore: hasMore.value + }) + } else { + console.error('[useGroupCourseList] 获取团课列表失败:', result.message) + } + } catch (error) { + console.error('[useGroupCourseList] 获取团课列表异常:', error) + } finally { + loading.value = false + } + } + + // 加载更多 + const loadMore = () => { + if (!hasMore.value || loading.value) return + pageNum.value++ + fetchCourseList(true) + } + + // 滚动到底部触发 + const onScrollToLower = () => { + loadMore() + } + + return { + // 状态 + pageNum, + pageSize, + total, + totalPages, + loading, + hasMore, + courseList, + searchKeyword, + hotKeywords, + sortOptions, + sortIndex, + timePeriodOptions, + timePeriodIndex, + showTimePicker, + startDate, + endDate, + timeRangeText, + filteredCourseList, + + // 方法 + getAllSearchParams, + handleSearch, + onTimePeriodChange, + onTimeRangeConfirm, + handleBooking, + goDetail, + fetchCourseList, + loadMore, + onScrollToLower + } +} From 4981a240fa58306928035bad9da643bd194b5d88 Mon Sep 17 00:00:00 2001 From: liwentao Date: Thu, 4 Jun 2026 13:16:09 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=9A=84=E8=B7=B3=E8=BD=AC=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gym-manage-uniapp/components/TabBar.vue | 82 ++++++++++++++++++------- gym-manage-uniapp/pages.json | 6 ++ 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/gym-manage-uniapp/components/TabBar.vue b/gym-manage-uniapp/components/TabBar.vue index d341948..91cbd50 100644 --- a/gym-manage-uniapp/components/TabBar.vue +++ b/gym-manage-uniapp/components/TabBar.vue @@ -5,11 +5,11 @@ - + {{ tab.label }} @@ -17,39 +17,78 @@