From 8f020d577f9889c6152ba5b5d7471d2ae1104842 Mon Sep 17 00:00:00 2001 From: liwentao Date: Mon, 4 May 2026 13:15:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BC=9A=E5=91=98=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E7=BC=96=E8=BE=91=E4=B8=AA=E4=BA=BA=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gym/manage/app/config/SystemRouter.java | 9 +- .../src/main/resources/application-dev.yml | 3 + .../src/main/resources/application.yml | 6 +- .../db/converter/GymMemberConverter.java | 32 +++ .../gym/manage/db/dao/GymMemberDao.java | 9 + .../db/repository/GymMemberRepository.java | 57 ++++++ .../V6__Create_gym_member_tables.sql | 190 ++++++++++++++++++ .../db/migration/V7__Insert_gym_test_data.sql | 108 ++++++++++ .../gym/manage/sys/config/SecurityConfig.java | 1 + .../core/command/UpdateGymMemberCommand.java | 37 ++++ .../core/repository/IGymMemberRepository.java | 9 + .../sys/core/service/IGymMemberService.java | 11 + .../core/service/impl/GymMemberService.java | 104 ++++++++++ .../sys/dto/request/GymUpdateRequest.java | 133 ++++++++++++ .../handler/gymMember/GymMemberHandler.java | 63 ++++++ gym-manage-api/pom.xml | 5 + 16 files changed, 774 insertions(+), 3 deletions(-) create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GymMemberConverter.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GymMemberDao.java create mode 100644 gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GymMemberRepository.java create mode 100644 gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_gym_member_tables.sql create mode 100644 gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_gym_test_data.sql create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/command/UpdateGymMemberCommand.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGymMemberRepository.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGymMemberService.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GymMemberService.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/dto/request/GymUpdateRequest.java create mode 100644 gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/gymMember/GymMemberHandler.java 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 c869da3..6d6ac62 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 @@ -5,6 +5,7 @@ import cn.novalon.gym.manage.sys.handler.auth.PasswordDiagnosticHandler; import cn.novalon.gym.manage.sys.handler.config.SysConfigHandler; import cn.novalon.gym.manage.sys.handler.dictionary.DictionaryHandler; import cn.novalon.gym.manage.sys.handler.dict.SysDictHandler; +import cn.novalon.gym.manage.sys.handler.gymMember.GymMemberHandler; import cn.novalon.gym.manage.sys.handler.log.SysLogHandler; import cn.novalon.gym.manage.sys.handler.log.OperationLogHandler; import cn.novalon.gym.manage.sys.handler.menu.MenuHandler; @@ -51,7 +52,8 @@ public class SystemRouter { SysUserMessageHandler messageHandler, SysFileHandler fileHandler, SysPermissionHandler permissionHandler, - PasswordDiagnosticHandler passwordDiagnosticHandler) { + PasswordDiagnosticHandler passwordDiagnosticHandler, + GymMemberHandler gymMemberHandler) { return route() // ========== 诊断路由 ========== @@ -192,6 +194,11 @@ public class SystemRouter { .POST("/api/permissions", permissionHandler::createPermission) .PUT("/api/permissions/{id}", permissionHandler::updatePermission) .DELETE("/api/permissions/{id}", permissionHandler::deletePermission) + + // ========== 顾客路由 ========== + + .GET("/api/gymMember/{id}", gymMemberHandler::getUserById) + .POST("/api/gymMember/{id}",gymMemberHandler::updateMemberBaseInfo) .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 8f5e8dc..9cfe50c 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 @@ -12,6 +12,9 @@ spring: max-life-time: 30m acquire-timeout: 3s flyway: + url: jdbc:postgresql://localhost:55432/manage_system + user: novalon + password: novalon123 enabled: true locations: classpath:db/migration baseline-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 9305b16..0d7edda 100644 --- a/gym-manage-api/manage-app/src/main/resources/application.yml +++ b/gym-manage-api/manage-app/src/main/resources/application.yml @@ -25,8 +25,8 @@ spring: acquire-timeout: 5s datasource: url: jdbc:postgresql://${DB_HOST:localhost}:${DB_PORT:55432}/${DB_NAME:manage_system} - username: ${DB_USERNAME:postgres} - password: ${DB_PASSWORD:postgres} + username: ${DB_USERNAME:novalon} + password: ${DB_PASSWORD:novalon123} driver-class-name: org.postgresql.Driver flyway: enabled: true @@ -38,6 +38,8 @@ spring: user: name: disabled password: disabled + profiles: + active: dev management: endpoints: diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GymMemberConverter.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GymMemberConverter.java new file mode 100644 index 0000000..8eb8db0 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/converter/GymMemberConverter.java @@ -0,0 +1,32 @@ +package cn.novalon.gym.manage.db.converter; + +import cn.hutool.core.bean.BeanUtil; +import cn.novalon.gym.manage.db.entity.GymMemberEntity; +import cn.novalon.gym.manage.sys.core.domain.GymMember; +import cn.novalon.gym.manage.sys.core.domain.SysUser; +import org.springframework.stereotype.Component; + +/** + * @author:liwentao + * @date:2026/5/4-05-04-10:34 + */ +@Component +public class GymMemberConverter { + public GymMember toDomain(GymMemberEntity entity){ + if (entity == null){ + return null; + } + GymMember domain = new GymMember(); + BeanUtil.copyProperties(entity,domain); + return domain; + } + + public GymMemberEntity toEntity(GymMember domain){ + if(domain == null){ + return null; + } + GymMemberEntity entity = new GymMemberEntity(); + BeanUtil.copyProperties(domain,entity); + return entity; + } +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GymMemberDao.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GymMemberDao.java new file mode 100644 index 0000000..9b39612 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/dao/GymMemberDao.java @@ -0,0 +1,9 @@ +package cn.novalon.gym.manage.db.dao; + +import cn.novalon.gym.manage.db.entity.GymMemberEntity; +import org.springframework.data.r2dbc.repository.R2dbcRepository; +import reactor.core.publisher.Mono; + +public interface GymMemberDao extends R2dbcRepository { + Mono findByIdIsAndDeletedAtIsNull(Long id); +} diff --git a/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GymMemberRepository.java b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GymMemberRepository.java new file mode 100644 index 0000000..c4402f5 --- /dev/null +++ b/gym-manage-api/manage-db/src/main/java/cn/novalon/gym/manage/db/repository/GymMemberRepository.java @@ -0,0 +1,57 @@ +package cn.novalon.gym.manage.db.repository; + +import cn.novalon.gym.manage.db.converter.GymMemberConverter; +import cn.novalon.gym.manage.db.dao.GymMemberDao; +import cn.novalon.gym.manage.db.entity.GymMemberEntity; +import cn.novalon.gym.manage.sys.audit.service.IAuditLogService; +import cn.novalon.gym.manage.sys.core.domain.GymMember; +import cn.novalon.gym.manage.sys.core.repository.IGymMemberRepository; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.r2dbc.core.R2dbcEntityTemplate; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Repository; +import reactor.core.publisher.Mono; + +/** + * @author:liwentao + * @date:2026/5/4-05-04-10:30 + */ +@Repository +public class GymMemberRepository implements IGymMemberRepository { + private final GymMemberDao gymMemberDao; + private final GymMemberConverter gymMemberConverter; + private final R2dbcEntityTemplate r2dbcEntityTemplate; + + public GymMemberRepository( + GymMemberDao gymMemberDao, + GymMemberConverter gymMemberConverter, + R2dbcEntityTemplate r2dbcEntityTemplate + ){ + this.gymMemberConverter = gymMemberConverter; + this.gymMemberDao = gymMemberDao; + this.r2dbcEntityTemplate = r2dbcEntityTemplate; + } + @Override + public Mono findById(Long id) { + return gymMemberDao.findByIdIsAndDeletedAtIsNull(id).map(gymMemberConverter::toDomain); + } + + public Mono save(GymMember gymMember){ + GymMemberEntity entity = gymMemberConverter.toEntity(gymMember); + if(entity.isNew()){ + return r2dbcEntityTemplate.insert(GymMemberEntity.class) + .using(entity) + .doOnNext(e -> e.markNotNew()) + .map(gymMemberConverter::toDomain); + } + return gymMemberDao.save(entity) + .map(gymMemberConverter::toDomain); + } + + public Mono update(GymMember gymMember){ + GymMemberEntity entity = gymMemberConverter.toEntity(gymMember); + entity.markNotNew(); + return gymMemberDao.save(entity) + .map(gymMemberConverter::toDomain); + } +} diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_gym_member_tables.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_gym_member_tables.sql new file mode 100644 index 0000000..3bf507d --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V6__Create_gym_member_tables.sql @@ -0,0 +1,190 @@ +-- ============================================ +-- 健身房管理系统 - 顾客用户表 +-- ============================================ + +-- 会员卡类型字典（如果需要独立管理） +CREATE TABLE IF NOT EXISTS gym_membership_card_type ( + id BIGSERIAL PRIMARY KEY, + card_type_name VARCHAR(50) NOT NULL, + card_type_code VARCHAR(50) NOT NULL UNIQUE, + duration_days INTEGER, + price DECIMAL(10,2), + description VARCHAR(500), + sort INTEGER DEFAULT 0, + status INTEGER DEFAULT 1, + 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 gym_member ( + id BIGSERIAL PRIMARY KEY, + -- 基本信息 + member_no VARCHAR(50) NOT NULL UNIQUE, + username VARCHAR(50), + real_name VARCHAR(100) NOT NULL, + gender VARCHAR(1) DEFAULT '0', + birthday DATE, + phone VARCHAR(20), + email VARCHAR(100), + id_card VARCHAR(18), + -- 地址信息 + province VARCHAR(50), + city VARCHAR(50), + district VARCHAR(50), + address VARCHAR(255), + -- 身体指标 + height DECIMAL(5,2), + weight DECIMAL(5,2), + bmi DECIMAL(5,2), + -- 健身信息 + registration_date DATE, + card_type_id BIGINT, + card_start_date DATE, + card_end_date DATE, + card_status VARCHAR(1) DEFAULT '0', + remaining_times INTEGER, + -- 教练信息 + coach_id BIGINT, + -- 紧急联系人 + emergency_contact VARCHAR(100), + emergency_phone VARCHAR(20), + -- 备注与状态 + remark TEXT, + status INTEGER DEFAULT 1, + -- 来源信息 + source VARCHAR(50), + -- 照片 + avatar_url VARCHAR(255), + -- 审计字段 + 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 gym_check_in ( + id BIGSERIAL PRIMARY KEY, + member_id BIGINT NOT NULL, + check_in_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + check_out_time TIMESTAMP, + check_in_type VARCHAR(1) DEFAULT '1', + card_id VARCHAR(50), + device_info VARCHAR(255), + create_by VARCHAR(50), + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + deleted_at TIMESTAMP + ); + +-- 顾客体测记录表 +CREATE TABLE IF NOT EXISTS gym_body_measurement ( + id BIGSERIAL PRIMARY KEY, + member_id BIGINT NOT NULL, + measure_date DATE NOT NULL, + height DECIMAL(5,2), + weight DECIMAL(5,2), + bmi DECIMAL(5,2), + body_fat_percentage DECIMAL(5,2), + muscle_mass DECIMAL(5,2), + body_water DECIMAL(5,2), + bone_mass DECIMAL(5,2), + visceral_fat_level INTEGER, + basal_metabolism DECIMAL(6,2), + waist_circumference DECIMAL(5,2), + hip_circumference DECIMAL(5,2), + chest_circumference DECIMAL(5,2), + arm_circumference DECIMAL(5,2), + thigh_circumference DECIMAL(5,2), + systolic_blood_pressure INTEGER, + diastolic_blood_pressure INTEGER, + heart_rate INTEGER, + remark TEXT, + 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 gym_membership_card_type IS '会员卡类型表'; +COMMENT ON COLUMN gym_membership_card_type.id IS '主键ID'; +COMMENT ON COLUMN gym_membership_card_type.card_type_name IS '卡类型名称（如年卡、季卡、次卡）'; +COMMENT ON COLUMN gym_membership_card_type.card_type_code IS '卡类型编码'; +COMMENT ON COLUMN gym_membership_card_type.duration_days IS '有效天数'; +COMMENT ON COLUMN gym_membership_card_type.price IS '价格'; +COMMENT ON COLUMN gym_membership_card_type.description IS '描述'; +COMMENT ON COLUMN gym_membership_card_type.sort IS '排序'; +COMMENT ON COLUMN gym_membership_card_type.status IS '状态（0正常 1停用）'; + +COMMENT ON TABLE gym_member IS '健身房顾客用户表'; +COMMENT ON COLUMN gym_member.id IS '主键ID'; +COMMENT ON COLUMN gym_member.member_no IS '会员编号（唯一）'; +COMMENT ON COLUMN gym_member.username IS '用户名（登录用）'; +COMMENT ON COLUMN gym_member.real_name IS '真实姓名'; +COMMENT ON COLUMN gym_member.gender IS '性别（0男 1女 2未知）'; +COMMENT ON COLUMN gym_member.birthday IS '出生日期'; +COMMENT ON COLUMN gym_member.phone IS '手机号码'; +COMMENT ON COLUMN gym_member.email IS '邮箱'; +COMMENT ON COLUMN gym_member.id_card IS '身份证号'; +COMMENT ON COLUMN gym_member.province IS '省份'; +COMMENT ON COLUMN gym_member.city IS '城市'; +COMMENT ON COLUMN gym_member.district IS '区县'; +COMMENT ON COLUMN gym_member.address IS '详细地址'; +COMMENT ON COLUMN gym_member.height IS '身高（cm）'; +COMMENT ON COLUMN gym_member.weight IS '体重（kg）'; +COMMENT ON COLUMN gym_member.bmi IS 'BMI指数'; +COMMENT ON COLUMN gym_member.registration_date IS '注册日期'; +COMMENT ON COLUMN gym_member.card_type_id IS '会员卡类型ID'; +COMMENT ON COLUMN gym_member.card_start_date IS '会员卡开始日期'; +COMMENT ON COLUMN gym_member.card_end_date IS '会员卡结束日期'; +COMMENT ON COLUMN gym_member.card_status IS '会员卡状态（0正常 1即将到期 2已过期 3冻结）'; +COMMENT ON COLUMN gym_member.remaining_times IS '剩余次数（次卡使用）'; +COMMENT ON COLUMN gym_member.coach_id IS '私教ID'; +COMMENT ON COLUMN gym_member.emergency_contact IS '紧急联系人'; +COMMENT ON COLUMN gym_member.emergency_phone IS '紧急联系电话'; +COMMENT ON COLUMN gym_member.remark IS '备注信息'; +COMMENT ON COLUMN gym_member.status IS '用户状态（0正常 1停用 2黑名单）'; +COMMENT ON COLUMN gym_member.source IS '客户来源（如地推、转介绍、线上广告等）'; +COMMENT ON COLUMN gym_member.avatar_url IS '头像URL'; + +COMMENT ON TABLE gym_check_in IS '顾客签到记录表'; +COMMENT ON COLUMN gym_check_in.id IS '主键ID'; +COMMENT ON COLUMN gym_check_in.member_id IS '会员ID'; +COMMENT ON COLUMN gym_check_in.check_in_time IS '签到时间'; +COMMENT ON COLUMN gym_check_in.check_out_time IS '签退时间'; +COMMENT ON COLUMN gym_check_in.check_in_type IS '签到类型（1刷卡 2扫码 3指纹 4人脸）'; +COMMENT ON COLUMN gym_check_in.card_id IS '刷卡卡号'; +COMMENT ON COLUMN gym_check_in.device_info IS '签到设备信息'; + +COMMENT ON TABLE gym_body_measurement IS '顾客体测记录表'; +COMMENT ON COLUMN gym_body_measurement.id IS '主键ID'; +COMMENT ON COLUMN gym_body_measurement.member_id IS '会员ID'; +COMMENT ON COLUMN gym_body_measurement.measure_date IS '测量日期'; +COMMENT ON COLUMN gym_body_measurement.height IS '身高（cm）'; +COMMENT ON COLUMN gym_body_measurement.weight IS '体重（kg）'; +COMMENT ON COLUMN gym_body_measurement.bmi IS 'BMI指数'; +COMMENT ON COLUMN gym_body_measurement.body_fat_percentage IS '体脂率（%）'; +COMMENT ON COLUMN gym_body_measurement.muscle_mass IS '肌肉量（kg）'; +COMMENT ON COLUMN gym_body_measurement.body_water IS '水分量（kg）'; +COMMENT ON COLUMN gym_body_measurement.bone_mass IS '骨量（kg）'; +COMMENT ON COLUMN gym_body_measurement.visceral_fat_level IS '内脏脂肪等级'; +COMMENT ON COLUMN gym_body_measurement.basal_metabolism IS '基础代谢（kcal）'; +COMMENT ON COLUMN gym_body_measurement.waist_circumference IS '腰围（cm）'; +COMMENT ON COLUMN gym_body_measurement.hip_circumference IS '臀围（cm）'; +COMMENT ON COLUMN gym_body_measurement.chest_circumference IS '胸围（cm）'; +COMMENT ON COLUMN gym_body_measurement.arm_circumference IS '臂围（cm）'; +COMMENT ON COLUMN gym_body_measurement.thigh_circumference IS '大腿围（cm）'; +COMMENT ON COLUMN gym_body_measurement.systolic_blood_pressure IS '收缩压（mmHg）'; +COMMENT ON COLUMN gym_body_measurement.diastolic_blood_pressure IS '舒张压（mmHg）'; +COMMENT ON COLUMN gym_body_measurement.heart_rate IS '心率（次/分）'; +COMMENT ON COLUMN gym_body_measurement.remark IS '备注'; \ No newline at end of file diff --git a/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_gym_test_data.sql b/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_gym_test_data.sql new file mode 100644 index 0000000..34029cf --- /dev/null +++ b/gym-manage-api/manage-db/src/main/resources/db/migration/V7__Insert_gym_test_data.sql @@ -0,0 +1,108 @@ +-- ============================================ +-- 健身房管理系统 - 测试数据 +-- ============================================ + +-- ============================================ +-- 会员卡类型数据 +-- ============================================ +INSERT INTO gym_membership_card_type (card_type_name, card_type_code, duration_days, price, description, sort, status, create_by, created_at, updated_at) VALUES + ('年卡', 'YEAR_CARD', 365, 2999.00, '一年有效期，不限次数', 1, 0, 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), + ('半年卡', 'HALF_YEAR_CARD', 180, 1699.00, '半年有效期，不限次数', 2, 0, 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), + ('季卡', 'QUARTER_CARD', 90, 999.00, '三个月有效期，不限次数', 3, 0, 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), + ('月卡', 'MONTH_CARD', 30, 399.00, '一个月有效期，不限次数', 4, 0, 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), + ('50次卡', 'TIMES_CARD_50', 180, 1580.00, '50次有效，半年内使用', 5, 0, 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), + ('30次卡', 'TIMES_CARD_30', 120, 1080.00, '30次有效，四个月内使用', 6, 0, 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP), + ('体验周卡', 'WEEK_TRIAL', 7, 99.00, '一周体验，不限次数', 7, 0, 'admin', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); + +-- ============================================ +-- 健身房顾客数据 +-- ============================================ +INSERT INTO gym_member (member_no, username, real_name, gender, birthday, phone, email, id_card, province, city, district, address, height, weight, bmi, registration_date, card_type_id, card_start_date, card_end_date, card_status, remaining_times, coach_id, emergency_contact, emergency_phone, remark, status, source, avatar_url, create_by, update_by, created_at, updated_at) VALUES +-- 年卡用户 +('GM20240001', 'zhangsan', '张三', '0', '1995-03-15', '13800138001', 'zhangsan@email.com', '110101199503150011', '广东省', '深圳市', '南山区', '科技园南路88号创新大厦1206', 178.50, 75.00, 23.53, '2024-01-10', 1, '2024-01-10', '2025-01-09', '0', NULL, 1, '李四', '13900139001', '增肌目标，每周训练4次', 0, '线上广告', '/avatars/member_001.jpg', 'admin', 'admin', '2024-01-10 09:30:00', '2024-06-15 14:20:00'), +('GM20240002', 'lisi', '李四', '0', '1992-08-22', '13800138002', 'lisi@email.com', '110101199208220012', '广东省', '深圳市', '福田区', '华强北路1002号赛格广场15层', 175.00, 82.00, 26.78, '2024-01-15', 1, '2024-01-15', '2025-01-14', '0', NULL, 1, '王五', '13900139002', '减脂增肌', 0, '朋友介绍', '/avatars/member_002.jpg', 'admin', 'admin', '2024-01-15 10:00:00', '2024-07-20 16:45:00'), +('GM20240003', 'wangwu', '王五', '1', '1990-05-18', '13800138003', 'wangwu@email.com', '110101199005180013', '广东省', '深圳市', '罗湖区', '深南东路5002号地王大厦32层', 165.00, 55.00, 20.20, '2024-02-01', 1, '2024-02-01', '2025-01-31', '0', NULL, 2, '赵六', '13900139003', '塑形训练，瑜伽爱好者', 0, '线上广告', '/avatars/member_003.jpg', 'admin', 'admin', '2024-02-01 11:15:00', '2024-08-10 09:30:00'), + +-- 半年卡用户 +('GM20240004', 'zhaoliu', '赵六', '0', '1998-12-05', '13800138004', 'zhaoliu@email.com', '110101199812050014', '广东省', '深圳市', '宝安区', '西乡街道宝源路108号', 182.00, 90.00, 27.17, '2024-03-10', 2, '2024-03-10', '2024-09-09', '0', NULL, 3, '张三', '13900139004', '增肌为主，目标体重95kg', 0, '地推', '/avatars/member_004.jpg', 'admin', 'admin', '2024-03-10 13:00:00', '2024-06-20 10:15:00'), +('GM20240005', 'sunqi', '孙七', '1', '1996-06-28', '13800138005', 'sunqi@email.com', '110101199606280015', '广东省', '深圳市', '龙华区', '民治街道梅龙路258号', 162.00, 50.00, 19.05, '2024-03-15', 2, '2024-03-15', '2024-09-14', '0', NULL, 2, '周八', '13900139005', '减重目标，每月减2kg', 0, '转介绍', '/avatars/member_005.jpg', 'admin', 'admin', '2024-03-15 14:30:00', '2024-08-01 11:20:00'), + +-- 季卡用户 +('GM20240006', 'zhouba', '周八', '0', '2000-01-20', '13800138006', 'zhouba@email.com', '110101200001200016', '广东省', '深圳市', '南山区', '粤海街道滨海大道33号', 176.00, 72.00, 23.24, '2024-04-01', 3, '2024-04-01', '2024-06-30', '0', NULL, 4, '吴九', '13900139006', '学生党，暑假密集训练', 0, '校园推广', '/avatars/member_006.jpg', 'admin', 'admin', '2024-04-01 09:00:00', '2024-05-18 16:30:00'), +('GM20240007', 'wujiu', '吴九', '1', '1994-09-14', '13800138007', 'wujiu@email.com', '110101199409140017', '广东省', '深圳市', '龙岗区', '龙城街道龙翔大道666号', 168.00, 58.00, 20.55, '2024-04-10', 3, '2024-04-10', '2024-07-09', '2', NULL, NULL, '郑十', '13900139007', '季卡已过期，需要续费提醒', 0, '线上广告', '/avatars/member_007.jpg', 'admin', 'admin', '2024-04-10 10:45:00', '2024-07-15 08:00:00'), + +-- 次卡用户 +('GM20240008', 'zhengshi', '郑十', '0', '1993-11-30', '13800138008', 'zhengshi@email.com', '110101199311300018', '广东省', '深圳市', '南山区', '蛇口街道工业八路156号', 180.00, 85.00, 26.23, '2024-05-01', 5, '2024-05-01', '2024-10-31', '0', 35, 3, '陈十一', '13900139008', '次卡用户，已使用15次', 0, '朋友介绍', '/avatars/member_008.jpg', 'admin', 'admin', '2024-05-01 15:00:00', '2024-06-28 12:45:00'), +('GM20240009', 'chenyi', '陈十一', '1', '1997-07-08', '13800138009', 'chenyi@email.com', '110101199707080019', '广东省', '深圳市', '福田区', '莲花街道红荔路2008号', 163.00, 52.00, 19.57, '2024-05-20', 6, '2024-05-20', '2024-09-19', '0', 22, 4, '刘十二', '13900139009', '次卡用户，已使用8次', 0, '地推', '/avatars/member_009.jpg', 'admin', 'admin', '2024-05-20 11:30:00', '2024-07-01 17:00:00'), + +-- 即将到期用户 +('GM20240010', 'liushier', '刘十二', '0', '1991-02-14', '13800138010', 'liushier@email.com', '110101199102140010', '广东省', '深圳市', '罗湖区', '翠竹街道太宁路99号', 174.00, 78.00, 25.76, '2024-01-05', 1, '2024-01-05', '2025-01-04', '1', NULL, 5, '马十三', '13900139010', '年卡即将到期，需要续费', 0, '转介绍', '/avatars/member_010.jpg', 'admin', 'admin', '2024-01-05 08:30:00', '2024-07-10 14:00:00'), + +-- 体验用户 +('GM20240011', 'mashisan', '马十三', '0', '1999-04-25', '13800138011', 'mashisan@email.com', '110101199904250011', '广东省', '深圳市', '宝安区', '新安街道创业一路288号', 177.00, 70.00, 22.34, '2024-06-01', 7, '2024-06-01', '2024-06-07', '2', NULL, NULL, '张三', '13900139011', '体验卡已到期，潜在客户', 0, '线上广告', '/avatars/member_011.jpg', 'admin', 'admin', '2024-06-01 13:45:00', '2024-06-08 09:00:00'), + +-- 冻结用户 +('GM20240012', 'yangshi', '杨十四', '1', '1988-10-10', '13800138012', 'yangshi@email.com', '110101198810100012', '广东省', '深圳市', '南山区', '前海路0199号', 166.00, 54.00, 19.59, '2024-02-20', 1, '2024-02-20', '2025-02-19', '3', NULL, 1, '黄十五', '13900139012', '因伤冻结3个月', 0, '朋友介绍', '/avatars/member_012.jpg', 'admin', 'admin', '2024-02-20 10:00:00', '2024-06-01 11:30:00'), + +-- 黑名单用户 +('GM20240013', 'huangshiwu', '黄十五', '0', '1996-09-05', '13800138013', 'huangshiwu@email.com', '110101199609050013', '广东省', '深圳市', '龙华区', '大浪街道华旺路178号', 181.00, 95.00, 29.00, '2024-03-01', 2, '2024-03-01', '2024-08-31', '1', NULL, NULL, '林十六', '13900139013', '违规使用器械，已列入黑名单', 2, '地推', '/avatars/member_013.jpg', 'admin', 'admin', '2024-03-01 16:20:00', '2024-05-15 10:30:00'); + +-- ============================================ +-- 顾客签到记录数据 +-- ============================================ +INSERT INTO gym_check_in (member_id, check_in_time, check_out_time, check_in_type, card_id, device_info, create_by, created_at) VALUES +-- 张三最近一周签到记录 +(1, '2024-07-15 08:10:00', '2024-07-15 10:00:00', '1', 'CARD001', '门禁设备01', 'system', '2024-07-15 08:10:00'), +(1, '2024-07-16 08:15:00', '2024-07-16 09:45:00', '1', 'CARD001', '门禁设备01', 'system', '2024-07-16 08:15:00'), +(1, '2024-07-17 18:30:00', '2024-07-17 20:30:00', '1', 'CARD001', '门禁设备02', 'system', '2024-07-17 18:30:00'), +(1, '2024-07-18 08:05:00', '2024-07-18 10:15:00', '2', 'CARD001', '扫码设备03', 'system', '2024-07-18 08:05:00'), +(1, '2024-07-21 09:00:00', '2024-07-21 11:00:00', '1', 'CARD001', '门禁设备01', 'system', '2024-07-21 09:00:00'), + +-- 李四签到记录 +(2, '2024-07-15 07:00:00', '2024-07-15 08:30:00', '1', 'CARD002', '门禁设备01', 'system', '2024-07-15 07:00:00'), +(2, '2024-07-16 07:15:00', '2024-07-16 09:00:00', '1', 'CARD002', '门禁设备01', 'system', '2024-07-16 07:15:00'), +(2, '2024-07-17 17:00:00', '2024-07-17 19:00:00', '1', 'CARD002', '门禁设备02', 'system', '2024-07-17 17:00:00'), + +-- 王五签到记录 +(3, '2024-07-15 09:30:00', '2024-07-15 11:00:00', '1', 'CARD003', '门禁设备01', 'system', '2024-07-15 09:30:00'), +(3, '2024-07-17 10:00:00', '2024-07-17 11:30:00', '3', 'FP003', '指纹设备04', 'system', '2024-07-17 10:00:00'), +(3, '2024-07-19 14:00:00', '2024-07-19 16:00:00', '1', 'CARD003', '门禁设备01', 'system', '2024-07-19 14:00:00'), + +-- 赵六签到记录 +(4, '2024-07-16 06:30:00', '2024-07-16 08:30:00', '1', 'CARD004', '门禁设备01', 'system', '2024-07-16 06:30:00'), +(4, '2024-07-17 06:45:00', '2024-07-17 08:45:00', '1', 'CARD004', '门禁设备01', 'system', '2024-07-17 06:45:00'), +(4, '2024-07-19 07:00:00', '2024-07-19 09:00:00', '4', 'FACE_004', '人脸识别05', 'system', '2024-07-19 07:00:00'), + +-- 郑十（次卡用户）签到记录 +(8, '2024-07-16 16:00:00', '2024-07-16 18:00:00', '1', 'CARD008', '门禁设备02', 'system', '2024-07-16 16:00:00'), +(8, '2024-07-19 16:30:00', '2024-07-19 18:30:00', '1', 'CARD008', '门禁设备02', 'system', '2024-07-19 16:30:00'); + +-- ============================================ +-- 顾客体测记录数据 +-- ============================================ +INSERT INTO gym_body_measurement (member_id, measure_date, height, weight, bmi, body_fat_percentage, muscle_mass, body_water, bone_mass, visceral_fat_level, basal_metabolism, waist_circumference, hip_circumference, chest_circumference, arm_circumference, thigh_circumference, systolic_blood_pressure, diastolic_blood_pressure, heart_rate, remark, create_by, created_at, updated_at) VALUES +-- 张三体测记录（3次） +(1, '2024-01-10', 178.50, 85.00, 26.67, 25.00, 60.50, 42.00, 3.80, 10, 1780.00, 92.00, 100.00, 98.00, 32.00, 55.00, 135, 85, 72, '初次体测，体脂偏高', 'coach_001', '2024-01-10 10:00:00', '2024-01-10 10:00:00'), +(1, '2024-04-10', 178.50, 80.00, 25.10, 22.00, 62.00, 43.50, 3.85, 9, 1750.00, 88.00, 98.00, 100.00, 34.00, 56.00, 130, 82, 70, '三个月训练，体重下降5kg', 'coach_001', '2024-04-10 10:30:00', '2024-04-10 10:30:00'), +(1, '2024-07-10', 178.50, 75.00, 23.53, 18.50, 64.00, 45.00, 3.90, 7, 1720.00, 83.00, 96.00, 102.00, 35.50, 57.00, 125, 80, 68, '目标达成！体脂降至18.5%', 'coach_001', '2024-07-10 09:00:00', '2024-07-10 09:00:00'), + +-- 李四体测记录 +(2, '2024-01-15', 175.00, 88.00, 28.73, 28.00, 60.00, 41.00, 3.75, 12, 1820.00, 95.00, 102.00, 100.00, 33.00, 58.00, 140, 90, 75, '初次体测，需重点减脂', 'coach_001', '2024-01-15 10:00:00', '2024-01-15 10:00:00'), +(2, '2024-07-15', 175.00, 82.00, 26.78, 23.00, 63.00, 43.80, 3.82, 9, 1780.00, 88.00, 100.00, 103.00, 35.00, 57.00, 132, 84, 72, '减脂效果明显，继续加油', 'coach_001', '2024-07-15 08:00:00', '2024-07-15 08:00:00'), + +-- 王五体测记录 +(3, '2024-02-01', 165.00, 58.00, 21.30, 25.00, 41.00, 32.00, 2.80, 5, 1280.00, 72.00, 90.00, 88.00, 26.00, 50.00, 118, 75, 68, '基础体重偏低，增肌为主', 'coach_002', '2024-02-01 11:00:00', '2024-02-01 11:00:00'), +(3, '2024-05-01', 165.00, 56.00, 20.57, 23.00, 42.00, 33.00, 2.85, 4, 1300.00, 70.00, 89.00, 90.00, 27.00, 51.00, 120, 78, 65, '瑜伽训练效果良好', 'coach_002', '2024-05-01 14:00:00', '2024-05-01 14:00:00'), +(3, '2024-07-21', 165.00, 55.00, 20.20, 21.50, 43.00, 34.00, 2.90, 3, 1310.00, 68.00, 88.00, 91.00, 28.00, 52.00, 115, 72, 66, '体态明显改善', 'coach_002', '2024-07-21 10:30:00', '2024-07-21 10:30:00'), + +-- 赵六体测记录 +(4, '2024-03-10', 182.00, 95.00, 28.68, 29.00, 64.00, 43.00, 4.10, 14, 1900.00, 98.00, 105.00, 105.00, 36.00, 62.00, 145, 92, 78, '体重超标，需严格控食', 'coach_003', '2024-03-10 13:00:00', '2024-03-10 13:00:00'), +(4, '2024-06-25', 182.00, 90.00, 27.17, 26.00, 66.00, 45.00, 4.15, 11, 1850.00, 94.00, 103.00, 107.00, 37.00, 60.00, 140, 88, 74, '减重5kg，继续增肌', 'coach_003', '2024-06-25 16:00:00', '2024-06-25 16:00:00'), + +-- 孙七体测记录 +(5, '2024-03-15', 162.00, 52.00, 19.81, 26.00, 38.00, 30.00, 2.60, 5, 1220.00, 74.00, 88.00, 85.00, 25.00, 48.00, 125, 80, 72, '有氧训练为主', 'coach_002', '2024-03-15 14:30:00', '2024-03-15 14:30:00'), +(5, '2024-06-15', 162.00, 50.00, 19.05, 24.00, 39.00, 31.00, 2.65, 4, 1230.00, 71.00, 87.00, 86.00, 26.00, 49.00, 122, 78, 70, '体脂率下降2%', 'coach_002', '2024-06-15 10:00:00', '2024-06-15 10:00:00'), + +-- 郑十体测记录 +(8, '2024-05-01', 180.00, 88.00, 27.16, 27.00, 61.00, 42.00, 3.95, 11, 1820.00, 94.00, 102.00, 102.00, 35.00, 59.00, 138, 86, 76, '初次体测', 'coach_003', '2024-05-01 15:00:00', '2024-05-01 15:00:00'), +(8, '2024-07-01', 180.00, 85.00, 26.23, 25.50, 62.50, 43.00, 4.00, 10, 1800.00, 91.00, 101.00, 103.00, 35.50, 58.00, 135, 84, 74, '两个月训练，减重3kg', 'coach_003', '2024-07-01 16:30:00', '2024-07-01 16:30: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..b2328e5 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,6 +50,7 @@ public class SecurityConfig { spec.pathMatchers("/api/auth/**").permitAll() .pathMatchers("/api/public/**").permitAll() .pathMatchers("/ws/**").permitAll() + .pathMatchers("/api/gymMember/**").permitAll() .pathMatchers("/actuator/**").permitAll(); if (isDevOrTest) { diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/command/UpdateGymMemberCommand.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/command/UpdateGymMemberCommand.java new file mode 100644 index 0000000..634f06b --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/command/UpdateGymMemberCommand.java @@ -0,0 +1,37 @@ +package cn.novalon.gym.manage.sys.core.command; + +import java.time.LocalDateTime; + +public record UpdateGymMemberCommand( + Long id, + String username, + String email, + Long gender, + LocalDateTime birthday, + String province, + String city, + String district, + String address, + String emergency_contact, + String emergency_phone, + String avatar_url, + String remark +) { + public static UpdateGymMemberCommand of( + Long id, + String username, + String email, + Long gender, + LocalDateTime birthday, + String province, + String city, + String district, + String address, + String emergency_contact, + String emergency_phone, + String avatar_url, + String remark + ){ + return new UpdateGymMemberCommand(id, username, email, gender, birthday, province, city, district, address, emergency_contact, emergency_phone, avatar_url, remark); + } +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGymMemberRepository.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGymMemberRepository.java new file mode 100644 index 0000000..0978f44 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/repository/IGymMemberRepository.java @@ -0,0 +1,9 @@ +package cn.novalon.gym.manage.sys.core.repository; + +import cn.novalon.gym.manage.sys.core.domain.GymMember; +import reactor.core.publisher.Mono; + +public interface IGymMemberRepository { + Mono findById(Long id); + Mono update(GymMember gymMember); +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGymMemberService.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGymMemberService.java new file mode 100644 index 0000000..99b3a71 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/IGymMemberService.java @@ -0,0 +1,11 @@ +package cn.novalon.gym.manage.sys.core.service; + +import cn.novalon.gym.manage.sys.core.command.UpdateGymMemberCommand; +import cn.novalon.gym.manage.sys.core.domain.GymMember; +import reactor.core.publisher.Mono; + +public interface IGymMemberService { + Mono findById(Long id); + Mono updateMember(GymMember gymMember); + Mono updateMember(UpdateGymMemberCommand updateGymMemberCommand); +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GymMemberService.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GymMemberService.java new file mode 100644 index 0000000..2de117b --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/core/service/impl/GymMemberService.java @@ -0,0 +1,104 @@ +package cn.novalon.gym.manage.sys.core.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.novalon.gym.manage.sys.audit.AuditLogHelper; +import cn.novalon.gym.manage.sys.audit.service.IAuditLogService; +import cn.novalon.gym.manage.sys.core.command.UpdateGymMemberCommand; +import cn.novalon.gym.manage.sys.core.domain.GymMember; +import cn.novalon.gym.manage.sys.core.repository.IGymMemberRepository; +import cn.novalon.gym.manage.sys.core.service.IGymMemberService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Lazy; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.server.ServerResponse; +import reactor.core.publisher.Mono; + +import java.time.LocalDateTime; + +/** + * @author:liwentao + * @date:2026/5/4-05-04-10:27 + */ +@Service +public class GymMemberService implements IGymMemberService { + private static final Logger logger = LoggerFactory.getLogger(SysUserService.class); + private final IGymMemberRepository gymMemberRepository; + private final PasswordEncoder passwordEncoder; + private final IAuditLogService auditLogService; + + public GymMemberService( + IGymMemberRepository gymMemberRepository, + @Qualifier("passwordEncoder") PasswordEncoder passwordEncoder, + @Lazy IAuditLogService auditLogService){ + this.gymMemberRepository = gymMemberRepository; + this.passwordEncoder = passwordEncoder; + this.auditLogService = auditLogService; + } + @Override + public Mono findById(Long id) { + return gymMemberRepository.findById(id); + } + + @Override + public Mono updateMember(GymMember gymMember) { + gymMember.setUpdatedAt(LocalDateTime.now()); + return gymMemberRepository.findById(gymMember.getId()) + .flatMap(before -> gymMemberRepository.update(gymMember) + .flatMap(saved-> AuditLogHelper.record(auditLogService,"GymMember",saved.getId(),"UPDATE",before,saved) + .thenReturn(saved))); + } + + @Override + public Mono updateMember(UpdateGymMemberCommand updateGymMemberCommand) { + return gymMemberRepository.findById(updateGymMemberCommand.id()) + .switchIfEmpty(Mono.error(new RuntimeException("User not found"))) + .flatMap( gymMember -> { + GymMember member = new GymMember(); + BeanUtil.copyProperties(gymMember,member); + if(updateGymMemberCommand.username() != null){ + gymMember.setUsername(updateGymMemberCommand.username()); + } + if(updateGymMemberCommand.email() != null){ + gymMember.setEmail(updateGymMemberCommand.email()); + } + if(updateGymMemberCommand.gender() != null){ + gymMember.setGender(updateGymMemberCommand.gender()); + } + if(updateGymMemberCommand.birthday() != null){ + gymMember.setBirthday(updateGymMemberCommand.birthday()); + } + if(updateGymMemberCommand.province() != null){ + gymMember.setProvince(updateGymMemberCommand.province()); + } + if(updateGymMemberCommand.city() != null){ + gymMember.setCity(updateGymMemberCommand.city()); + } + if(updateGymMemberCommand.district() != null){ + gymMember.setDistrict(updateGymMemberCommand.district()); + } + if(updateGymMemberCommand.address() != null){ + gymMember.setAddress(updateGymMemberCommand.address()); + } + if(updateGymMemberCommand.emergency_contact() != null){ + gymMember.setEmergencyContact(updateGymMemberCommand.emergency_contact()); + } + if(updateGymMemberCommand.emergency_phone() != null){ + gymMember.setEmergencyPhone(updateGymMemberCommand.emergency_phone()); + } + if(updateGymMemberCommand.avatar_url() != null){ + gymMember.setAvatarUrl(updateGymMemberCommand.avatar_url()); + } + if(updateGymMemberCommand.remark() != null){ + gymMember.setRemark(updateGymMemberCommand.remark()); + } + gymMember.setUpdatedAt(LocalDateTime.now()); + return gymMemberRepository.update(gymMember) + .flatMap(saved -> AuditLogHelper + .record(auditLogService,"GymMember",saved.getId(),"UPDATE",member,saved) + .thenReturn(saved)); + }); + } +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/dto/request/GymUpdateRequest.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/dto/request/GymUpdateRequest.java new file mode 100644 index 0000000..0806138 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/dto/request/GymUpdateRequest.java @@ -0,0 +1,133 @@ +package cn.novalon.gym.manage.sys.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; + +import java.time.LocalDateTime; + +/** + * @author:liwentao + * @date:2026/5/4-05-04-12:14 + */ +@Schema(description = "用户基础信息更新请求") +public class GymUpdateRequest { + @Schema(description = "用户名", example = "zhangsan") + private String username; + @Schema(description = "邮箱", example = "newemail@example.com") + private String email; + @Schema(description = "性别", example = "男") + private Long gender; + @Schema(description = "生日", example = "2005-04-17") + private LocalDateTime birthday; + @Schema(description = "省份", example = "四川") + private String province; + @Schema(description = "城市", example = "内江市") + private String city; + @Schema(description = "区县", example = "市中区") + private String district; + @Schema(description = "详细地址", example = "xxx街") + private String address; + @Schema(description = "紧急联系人姓名", example = "李四") + private String emergency_contact; + @Schema(description = "紧急联系人电话", example = "123456789") + private String emergency_phone; + @Schema(description = "头像URL地址", example = "无") + private String avatar_url; + @Schema(description = "备注", example = "无") + private String remark; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getEmergency_contact() { + return emergency_contact; + } + + public void setEmergency_contact(String emergency_contact) { + this.emergency_contact = emergency_contact; + } + + public String getEmergency_phone() { + return emergency_phone; + } + + public void setEmergency_phone(String emergency_phone) { + this.emergency_phone = emergency_phone; + } + + public String getAvatar_url() { + return avatar_url; + } + + public void setAvatar_url(String avatar_url) { + this.avatar_url = avatar_url; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getGender() { + return gender; + } + + public void setGender(Long gender) { + this.gender = gender; + } + + public LocalDateTime getBirthday() { + return birthday; + } + + public void setBirthday(LocalDateTime birthday) { + this.birthday = birthday; + } +} diff --git a/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/gymMember/GymMemberHandler.java b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/gymMember/GymMemberHandler.java new file mode 100644 index 0000000..3d61983 --- /dev/null +++ b/gym-manage-api/manage-sys/src/main/java/cn/novalon/gym/manage/sys/handler/gymMember/GymMemberHandler.java @@ -0,0 +1,63 @@ +package cn.novalon.gym.manage.sys.handler.gymMember; + +import cn.novalon.gym.manage.sys.core.command.UpdateGymMemberCommand; +import cn.novalon.gym.manage.sys.core.service.IGymMemberService; +import cn.novalon.gym.manage.sys.dto.request.GymUpdateRequest; +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/5/4-05-04-10:56 + */ +@Component +@Tag(name = "顾客管理", description = "顾客相关操作") +public class GymMemberHandler { + private final IGymMemberService gymMemberService; + private final Validator validator; + public GymMemberHandler( + IGymMemberService gymMemberService, + Validator validator + ){ + this.gymMemberService = gymMemberService; + this.validator = validator; + } + + @Operation(summary = "根据id查询用户", description = "获取用户信息") + public Mono getUserById(ServerRequest request){ + Long id = Long.valueOf(request.pathVariable("id")); + return gymMemberService.findById(id) + .flatMap(gymMember -> ServerResponse.ok().bodyValue(gymMember)) + .switchIfEmpty(ServerResponse.notFound().build()); + } + + public Mono updateMemberBaseInfo(ServerRequest request){ + Long id = Long.valueOf(request.pathVariable("id")); + return request.bodyToMono(GymUpdateRequest.class) + .map(req -> { + return UpdateGymMemberCommand.of( + id, + req.getUsername(), + req.getEmail(), + req.getGender(), + req.getBirthday(), + req.getProvince(), + req.getCity(), + req.getDistrict(), + req.getAddress(), + req.getEmergency_contact(), + req.getEmergency_phone(), + req.getAvatar_url(), + req.getRemark() + ); + }) + .flatMap(gymMemberService::updateMember) + .flatMap(gymMember -> ServerResponse.ok().bodyValue(gymMember)) + .switchIfEmpty(ServerResponse.notFound().build()); + } +} diff --git a/gym-manage-api/pom.xml b/gym-manage-api/pom.xml index df2e4c2..0489029 100644 --- a/gym-manage-api/pom.xml +++ b/gym-manage-api/pom.xml @@ -221,6 +221,11 @@ lombok true + + cn.hutool + hutool-all + 5.8.38 +