Java/seer-teach-cloud-21
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加代理商，活动，代理商员工关，代理商活动参与者相关功能

Browse Source
This commit is contained in:
Wang 2025-12-31 09:28:30 +08:00
parent c0fdf7dfd1
commit 14a17fb4e8
5 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
seer-admin/src/main/java/com/seer/teach/admin/config/AdminApiConfig.java
View File

@ -53,6 +53,14 @@ public class AdminApiConfig {
.build(); .build();
} }
@Bean
public GroupedOpenApi mpAdminApi() {
return GroupedOpenApi.builder()
.group("admin-mp")
.pathsToMatch("/mp/**")
.build();
}
@Bean @Bean
public GroupedOpenApi payAdminApi() { public GroupedOpenApi payAdminApi() {
return GroupedOpenApi.builder() return GroupedOpenApi.builder()

31
seer-mp/seer-mp-service-app-bootstrap/src/main/resources/db/mysql/V1.0.2__add_agent_activity_tables.sql
View File

@ -1,5 +1,6 @@
-- 创建代理商表 -- 创建代理商表
CREATE TABLE `mp_agents` ( DROP TABLE IF EXISTS `mp_agent`;
CREATE TABLE `mp_agent` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '代理商ID', `id` int NOT NULL AUTO_INCREMENT COMMENT '代理商ID',
`agent_name` varchar(255) NOT NULL COMMENT '代理商名称', `agent_name` varchar(255) NOT NULL COMMENT '代理商名称',
`agent_code` varchar(100) NOT NULL COMMENT '代理商编码', `agent_code` varchar(100) NOT NULL COMMENT '代理商编码',
@ -19,7 +20,8 @@ CREATE TABLE `mp_agents` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商表';
-- 创建代理商员工关联表 -- 创建代理商员工关联表
CREATE TABLE `mp_agent_employee_relations` ( DROP TABLE IF EXISTS `mp_agent_employee_relation`;
CREATE TABLE `mp_agent_employee_relation` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '关联ID', `id` int NOT NULL AUTO_INCREMENT COMMENT '关联ID',
`agent_id` int NOT NULL COMMENT '代理商ID（对应user表的ID）', `agent_id` int NOT NULL COMMENT '代理商ID（对应user表的ID）',
`employee_user_id` int NOT NULL COMMENT '员工用户ID（对应user表的ID）', `employee_user_id` int NOT NULL COMMENT '员工用户ID（对应user表的ID）',
@ -38,7 +40,8 @@ CREATE TABLE `mp_agent_employee_relations` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商员工关联表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商员工关联表';
-- 创建活动表 -- 创建活动表
CREATE TABLE `mp_activities` ( DROP TABLE IF EXISTS `mp_activity`;
CREATE TABLE `mp_activity` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '活动ID', `id` int NOT NULL AUTO_INCREMENT COMMENT '活动ID',
`activity_name` varchar(255) NOT NULL COMMENT '活动名称，如千人助学计划', `activity_name` varchar(255) NOT NULL COMMENT '活动名称，如千人助学计划',
`description` text COMMENT '活动描述', `description` text COMMENT '活动描述',
@ -55,7 +58,8 @@ CREATE TABLE `mp_activities` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商活动表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商活动表';
-- 创建代理商活动参与记录表 -- 创建代理商活动参与记录表
CREATE TABLE `mp_agent_activity_participants` ( DROP TABLE IF EXISTS `mp_agent_activity_participant`;
CREATE TABLE `mp_agent_activity_participant` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '参与记录ID', `id` int NOT NULL AUTO_INCREMENT COMMENT '参与记录ID',
`activity_id` int NOT NULL COMMENT '活动ID', `activity_id` int NOT NULL COMMENT '活动ID',
`agent_id` int NOT NULL COMMENT '代理商ID', `agent_id` int NOT NULL COMMENT '代理商ID',
@ -66,11 +70,11 @@ CREATE TABLE `mp_agent_activity_participants` (
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
`tenant_id` varchar(20) DEFAULT 'Default' COMMENT '租户id', `tenant_id` varchar(20) DEFAULT 'Default' COMMENT '租户id',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
KEY `idx_activity_agent` (`activity_id`, `agent_id`), KEY `idx_activity_agent` (`activity_id`, `agent_id`)
KEY `idx_parent_id` (`parent_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商活动参与记录表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商活动参与记录表';
-- 创建代理商活动操作日志表 -- 创建代理商活动操作日志表
DROP TABLE IF EXISTS `mp_agent_activity_log`;
CREATE TABLE `mp_agent_activity_log` ( CREATE TABLE `mp_agent_activity_log` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '日志ID', `id` int NOT NULL AUTO_INCREMENT COMMENT '日志ID',
`activity_id` int DEFAULT NULL COMMENT '活动ID', `activity_id` int DEFAULT NULL COMMENT '活动ID',
@ -91,21 +95,21 @@ CREATE TABLE `mp_agent_activity_log` (
KEY `idx_create_time` (`create_time`) KEY `idx_create_time` (`create_time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商活动操作日志表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代理商活动操作日志表';
DROP TABLE IF EXISTS `mp_parent_agent_activity_relation`;
CREATE TABLE `mp_parent_agent_activity_relation` ( CREATE TABLE `mp_parent_agent_activity_relation` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '关系ID', `id` int NOT NULL AUTO_INCREMENT COMMENT '关系ID',
`activity_id` int NOT NULL COMMENT '活动ID', `activity_id` int NOT NULL COMMENT '活动ID',
`agent_id` int NOT NULL COMMENT '代理商ID', `agent_id` int NOT NULL COMMENT '代理商ID',
`parent_id` int NOT NULL COMMENT '家长ID', `parent_id` int NOT NULL COMMENT '家长ID',
`activity_name` varchar(255) NOT NULL COMMENT '活动名称（冗余字段）', `activity_name` varchar(255) NULL COMMENT '活动名称（冗余字段）',
`agent_name` varchar(255) NOT NULL COMMENT '代理商名称（冗余字段）', `agent_name` varchar(255) NULL COMMENT '代理商名称（冗余字段）',
`status` tinyint NOT NULL DEFAULT '1' COMMENT '参与状态：0-取消参与，1-正常参与', `status` tinyint NOT NULL DEFAULT '1' COMMENT '参与状态：0-取消参与，1-正常参与',
`sign_up_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '报名时间', `sign_up_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '报名时间',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_german2_ci NULL DEFAULT NULL COMMENT '创建人', `create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_german2_ci NULL DEFAULT NULL COMMENT '创建人',
`update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`update_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_german2_ci NULL DEFAULT NULL COMMENT '修改人', `update_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_german2_ci NULL DEFAULT NULL COMMENT '修改人',
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除',
`tenant_id` varchar(20) DEFAULT 'Default' COMMENT '租户id', `tenant_id` varchar(20) DEFAULT 'Default' COMMENT '租户id',
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
KEY `idx_activity_id` (`activity_id`), KEY `idx_activity_id` (`activity_id`),
@ -114,13 +118,12 @@ CREATE TABLE `mp_parent_agent_activity_relation` (
KEY `idx_sign_up_time` (`sign_up_time`) KEY `idx_sign_up_time` (`sign_up_time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='家长参与代理商活动关系表'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='家长参与代理商活动关系表';
DROP TABLE IF EXISTS `mp_activity_info_collection`;
CREATE TABLE `mp_activity_info_collection` ( CREATE TABLE `mp_activity_info_collection` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '信息收集ID', `id` int NOT NULL AUTO_INCREMENT COMMENT '信息收集ID',
`relation_id` int NOT NULL COMMENT '关系ID', `relation_id` int NOT NULL COMMENT '关联的家长参与代理商活动关系ID',
`activity_id` int NOT NULL COMMENT '活动ID', `activity_id` int NOT NULL COMMENT '活动ID',
`parent_id` int NOT NULL COMMENT '家长ID', `parent_id` int NOT NULL COMMENT '家长ID',
`relation_id` int COMMENT '关联的家长参与代理商活动关系ID',
`child_name` varchar(100) COMMENT '孩子姓名', `child_name` varchar(100) COMMENT '孩子姓名',
`child_gender` varchar(10) COMMENT '孩子性别(M-男,F-女)', `child_gender` varchar(10) COMMENT '孩子性别(M-男,F-女)',
`child_birth_date` date COMMENT '出生年月', `child_birth_date` date COMMENT '出生年月',

2
seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/controller/AppAgentActivityParentInfoController.java
View File

@ -26,7 +26,7 @@ import java.util.List;
* @author Lingma * @author Lingma
* @since 2025-12-30 * @since 2025-12-30
*/ */
@Tag(name = "APP - 代理商活动参与家长信息") @Tag(name = "APP - 参与代理商活动家长信息")
@RestController @RestController
@RequestMapping("/app/agent/activity/parent-info") @RequestMapping("/app/agent/activity/parent-info")
@LogPrint @LogPrint

4
seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/controller/AppAgentActivityParticipantController.java
View File

@ -20,13 +20,13 @@ import java.util.List;
/** /**
* <p> * <p>
* 代理商活动参与记录App控制器 * 代理商参与活动记录App控制器
* </p> * </p>
* *
* @author Lingma * @author Lingma
* @since 2025-12-29 * @since 2025-12-29
*/ */
@Tag(name = "APP - 代理商活动参与记录") @Tag(name = "APP - 代理商参与活动记录")
@RestController @RestController
@RequestMapping("/app/agent/activity/participant") @RequestMapping("/app/agent/activity/participant")
@LogPrint @LogPrint

4
seer-user/seer-user-service-app/src/main/java/com/seer/teach/user/app/auth/service/strategy/OfficialAccountLoginStrategy.java
View File

@ -62,8 +62,6 @@ public class OfficialAccountLoginStrategy extends AbstractLoginStrategy implemen
userAuth.setAppId(request.getAppId()); userAuth.setAppId(request.getAppId());
updateUserAuth(userAuth); updateUserAuth(userAuth);
} }
Integer status = wechatOfficialAccountApi.getDealerApplicationsApplyStatusByUserId(userAuth.getUserId()); return new LoginUser(userAuth.getUserId());
log.info("获取用户状态：{}",status);
return new LoginUser(userAuth.getUserId(),status == null ? -1 : status);
} }
} }