业务员管理接口

authentication/src/main/java/com/jzg/config/SecurityConfig.java

@@ -56,7 +56,7 @@ public class SecurityConfig {
 
     @Bean
     public AuthenticationProvider authenticationProvider(UserDetailsService userDetailsService) {
-        return new JzgAuthenticationProvider(userDetailsService,sysUserService,sysRoleService,redissonClient,sysRoleDataScopeMapper,sysRoleDataScopeLinkMapper);
+        return new JzgAuthenticationProvider(userDetailsService,sysUserService,sysRoleService,redissonClient);
     }
 
     @Bean

commons/src/main/java/com/jzg/commons/constants/UserInfoFileEnum.java

@@ -0,0 +1,37 @@
+package com.jzg.commons.constants;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+/**
+ * @author quchen
+ * @date 2025/1/18 16:52
+ */
+
+@Getter
+@AllArgsConstructor
+public enum UserInfoFileEnum {
+    SFZ1("SFZ1", "身份证正面"),
+
+    SFZ2("SFZ2", "身份证反面"),
+
+    ZYZGZ("ZYZGZ", "展业资格证"),
+
+    LDHT("LDHT", "劳动合同"),
+
+    YPB("YPB","应聘表"),
+
+    DXB("DXB","定薪表"),
+
+    LZB("LZB","离职表"),
+
+    YHK("YHK","银行卡");
+
+
+
+
+    private String code;
+
+    private String desc;
+}

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoDto.java

@@ -0,0 +1,30 @@
+package com.jzg.commons.entity.dto;
+
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/1/17 15:22
+ */
+
+@Data
+public class SysUserJzgInfoDto {
+    public String id;
+
+    public String userId;
+
+    public String username;
+
+    public String mobile;
+
+    public String deptId;
+    public String deptName;
+    public String typeAttr;
+    public String status;
+    public String isEnable;
+    public String leaderId;
+    public String leaderName;
+    public String referrerId;
+    public String referrerName;
+
+}

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -1,201 +1,211 @@
 package com.jzg.commons.entity.po;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
- * 用户信息表实体 sys_user
- *
- * @author dongxin
+ * @author quchen
+ * @date 2025/1/16 9:05
  */
-@Schema(description = "用户信息表实体")
+
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
+@TableName("sys_user_jzg_info")
+@Schema(description = "业务员信息表")
 public class SysUserJzgInfo extends BaseModel {
-
-    /** 工号 */
-    @Schema(description = "工号")
+    @TableId(value = "id")
+    @Schema(description = "主键")
     private String id;
 
-    /** 用户id */
-    @Schema(description = "用户id")
+    @TableField(value = "user_id")
+    @Schema(description = "用户")
     private String userId;
 
-    /** 系统code */
-    @Schema(description = "系统code")
-    private String systemCode;
+    @TableField(value = "name")
+    @Schema(description = "姓名")
+    private String name;
 
-    /** 状态  1：正常   0：删除 2：审批中  3：审批不通过 */
-    @Schema(description = "状态  1：正常   0：删除 2：审批中  3：审批不通过")
+    @TableField(value = "status")
+    @Schema(description = "状态 0：未认证 1：实名认证失败 2：待入职 3：入职待审核 4：审核不通过 5：已入职")
     private Integer status;
 
-    /** 机构ID */
-    @Schema(description = "机构ID")
+    @TableField(value = "is_enable")
+    @Schema(description = "是否启用 1：启用 0：禁用")
+    private Integer isEnable;
+
+    @TableField(value = "system_code")
+    @Schema(description = "系统code")
+    private String systemCode;
+
+    @TableField(value = "dept_id")
+    @Schema(description = "机构id")
     private String deptId;
 
-    /** 微信id */
+    @TableField(value = "open_id")
     @Schema(description = "微信id")
     private String openId;
 
-    /** 支付宝id */
+    @TableField(value = "alipay")
     @Schema(description = "支付宝id")
     private String alipay;
 
-    /** 审批意见 */
+    @TableField(value = "approval_opinion")
     @Schema(description = "审批意见")
     private String approvalOpinion;
 
-    /** 身份证号 */
+    @TableField(value = "identity")
     @Schema(description = "身份证号")
     private String identity;
 
-    /** 身份证有效期起期 */
+    @TableField(value = "identity_time_start")
     @Schema(description = "身份证有效期起期")
     private String identityTimeStart;
 
-    /** 身份证有效期止期 */
+    @TableField(value = "identity_time_end")
     @Schema(description = "身份证有效期止期")
     private String identityTimeEnd;
 
-    /** 离司时间 */
-    @Schema(description = "离司时间")
-    private LocalDate logoutTime;
+    @TableField(value = "logout_time")
+    @Schema(description = "离职时间")
+    private String logoutTime;
 
-    /** 头像 */
+    @TableField(value = "head_sculpture")
     @Schema(description = "头像")
     private String headSculpture;
 
-    /** 0 未验证 1 已验证 */
-    @Schema(description = "0 未验证 1 已验证")
-    private Integer factorVerify;
+    @TableField(value = "leader_id")
+    @Schema(description = "领导人id")
+    private String leaderId;
 
-    /** 居住地址 */
-    @Schema(description = "居住地址")
+    @TableField(value = "referrer_id")
+    @Schema(description = "推荐人id")
+    private String referrerId;
+
+    @TableField(value = "manager_id")
+    @Schema(description = "电销管理人id")
+    private String managerId;
+
+    @TableField(value = "position_id")
+    @Schema(description = "职位id")
+    private String positionId;
+
+    @TableField(value = "operator_code")
+    @Schema(description = "关联的业务员工号（该字段仅针对出单员）")
+    private String operatorCode;
+
+    @TableField(value = "partner_level")
+    @Schema(description = "合伙人等级")
+    private String partnerLevel;
+
+    @TableField(value = "type_attr")
+    @Schema(description = "用户类型：1.前线人员 2:后线人员 3:合伙人 4:工作室管理员 5:团队长")
+    private String typeAttr;
+
+    @TableField(value = "factor_verify")
+    @Schema(description = "是否实名认证 0 未验证 1 已验证")
+    private String factorVerify;
+
+    @TableField(value = "address")
+    @Schema(description = "地址")
     private String address;
 
-    /** 民族 */
+    @TableField(value = "nations")
     @Schema(description = "民族")
     private String nations;
 
-    /** 开户行 */
-    @Schema(description = "开户行")
-    private String bankName;
-
-    /** 开户账号 */
-    @Schema(description = "开户账号")
-    private String bankCardId;
-
-    /** 户籍 */
+    @TableField(value = "koseki")
     @Schema(description = "户籍")
     private String koseki;
 
-    /** 出生日期 */
-    @Schema(description = "出生日期")
-    private LocalDate birthday;
+    @TableField(value = "birthday")
+    @Schema(description = "生日")
+    private String birthday;
 
-    /** 婚姻状况 */
+    @TableField(value = "marital_status")
     @Schema(description = "婚姻状况")
     private String maritalStatus;
 
-    /** 政治面貌 */
+    @TableField(value = "politics_status")
     @Schema(description = "政治面貌")
     private String politicsStatus;
 
-    /** 健康状况 */
+    @TableField(value = "health")
     @Schema(description = "健康状况")
     private String health;
 
-    /** 邮政编码 */
+    @TableField(value = "postal_code")
     @Schema(description = "邮政编码")
     private String postalCode;
 
-    /** 血型 */
+    @TableField(value = "blood_type")
     @Schema(description = "血型")
     private String bloodType;
 
-    /** 学历 */
+    @TableField(value = "education")
     @Schema(description = "学历")
     private String education;
 
-    /** 毕业院校 */
+    @TableField(value = "school")
     @Schema(description = "毕业院校")
     private String school;
 
-    /** 毕业时间 */
+    @TableField(value = "graduation_time")
     @Schema(description = "毕业时间")
-    private LocalDate graduationTime;
-
-    /** 是否是计算机专业 */
-    @Schema(description = "是否是计算机专业")
-    private Integer isComputer;
+    private String graduationTime;
 
-    /** 原工作单位 */
+    @TableField(value = "former_employer")
     @Schema(description = "原工作单位")
     private String formerEmployer;
 
-    /** 入司时间 */
-    @Schema(description = "入司时间")
-    private LocalDate entryTime;
+    @TableField(value = "entry_time")
+    @Schema(description = "入职时间")
+    private String entryTime;
 
-    /** 代理人资格证号 */
+    @TableField(value = "agent_qualification_code")
     @Schema(description = "代理人资格证号")
     private String agentQualificationCode;
 
-    /** 紧急联系人电话 */
+    @TableField(value = "emergency_contact_tel")
     @Schema(description = "紧急联系人电话")
     private String emergencyContactTel;
 
-    /** 紧急联系人姓名 */
+    @TableField(value = "emergency_contact_name")
     @Schema(description = "紧急联系人姓名")
     private String emergencyContactName;
 
-    /** 备注 */
+    @TableField(value = "remark")
     @Schema(description = "备注")
     private String remark;
 
-    /** 邮箱 */
-    @Schema(description = "邮箱")
-    private String email;
-
-    /** 性别 */
+    @TableField(value = "sex")
     @Schema(description = "性别")
     private String sex;
 
-    /** 专业 */
+    @TableField(value = "speciality")
     @Schema(description = "专业")
     private String speciality;
 
-    /** 薪资 */
+    @TableField(value = "salary")
     @Schema(description = "薪资")
-    private BigDecimal salary;
-
-    /** 薪资等级 */
-    @Schema(description = "薪资等级")
-    private String salaryLevel;
+    private String salary;
 
-    /** 居住地址 */
+    @TableField(value = "live_address")
     @Schema(description = "居住地址")
     private String liveAddress;
 
-    /** 省 */
-    @Schema(description = "省")
-    private String province;
+    @TableField(value = "is_delete")
+    @Schema(description = "是否删除 0未删除 1 删除")
+    private Integer isDelete;
 
-    /** 市 */
-    @Schema(description = "市")
-    private String city;
+    @TableField(exist = false)
+    @Schema(description = "身份证正面")
+    private String idCardUp;
 
-    /** 区/县 */
-    @Schema(description = "区/县")
-    private String district;
+    @TableField(exist = false)
+    @Schema(description = "身份证反面")
+    private String idCardDown;
 
 }

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoBankCard.java

@@ -0,0 +1,48 @@
+package com.jzg.commons.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/1/18 9:32
+ */
+
+@Data
+@TableName("sys_user_jzg_info_bank_card")
+public class SysUserJzgInfoBankCard {
+    @TableId
+    @Schema(description = "主键")
+    private String id;
+
+    @TableField(value = "user_jzg_info_id")
+    @Schema(description = "info表id")
+    private String userJzgInfoId;
+
+    @TableField(value = "bank_card_number")
+    @Schema(description = "银行卡号")
+    private String bankCardNumber;
+
+    @TableField(value = "bank_card_name")
+    @Schema(description = "银行名称")
+    private String bankName;
+
+    @TableField(value = "bank_address")
+    @Schema(description = "开户行地址")
+    private String bankAddress;
+
+    @TableField(value = "is_default")
+    @Schema(description = "是否默认 1：是  0：否")
+    private Integer isDefault;
+
+    @TableField(value = "audit_status")
+    @Schema(description = "审核状态  0：未审核 1：审核通过 2：审核驳回")
+    private Integer auditStatus;
+
+    @TableField(value = "remark")
+    @Schema(description = "备注")
+    private String remark;
+}

commons/src/main/java/com/jzg/commons/entity/vo/BatchLeaderVo.java

@@ -0,0 +1,16 @@
+package com.jzg.commons.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/1/17 16:40
+ * @description 批量设置负责人
+ */
+
+@Data
+public class BatchLeaderVo {
+    private String[] ids;
+
+    private String leaderId;
+}

commons/src/main/java/com/jzg/commons/entity/vo/IsDeleteVo.java

@@ -0,0 +1,18 @@
+package com.jzg.commons.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author quchen
+ * @date 2025/1/17 16:20
+ * @description 批量删除
+ */
+
+@Data
+public class IsDeleteVo {
+    @Schema(description = "id集合")
+    private List<String> ids;
+}

commons/src/main/java/com/jzg/commons/entity/vo/IsEnableVo.java

@@ -0,0 +1,16 @@
+package com.jzg.commons.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/1/17 16:37
+ * @description 启用禁用业务员
+ */
+
+@Data
+public class IsEnableVo {
+    private String[] ids;
+
+    private Integer isEnable;
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysUserInfoListVo.java

@@ -0,0 +1,43 @@
+package com.jzg.commons.entity.vo;
+
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/1/17 14:25
+ */
+
+@Data
+public class SysUserInfoListVo extends PageRequest {
+
+    // 姓名
+    @Schema(description = "业务员")
+    private String salesman;
+
+    // 状态  1：正常   0：删除 2：审批中  3：审批不通过
+    @Schema(description = "状态  1：正常   0：删除 2：审批中  3：审批不通过")
+    private Integer status;
+
+    // 归属机构id
+    @Schema(description = "归属机构id")
+    private String deptId;
+
+    // 归属机构名称
+    @Schema(description = "归属机构名称")
+    private String deptName;
+
+    // 启用禁用
+    @Schema(description = "启用禁用")
+    public Integer isEnable;
+
+    // 管理人id
+    @Schema(description = "管理人id")
+    private String leaderId;
+
+    // 类型
+    @Schema(description = "用户类型")
+    private String typeAttr;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysUserJzgInfoBankCardVo.java

@@ -0,0 +1,26 @@
+package com.jzg.commons.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/1/18 10:28
+ */
+
+@Data
+public class SysUserJzgInfoBankCardVo {
+
+    @Schema(description = "业务员id")
+    private String userJzgInfoId;
+
+    @Schema(description = "银行卡号")
+    private String bankCardNumber;
+
+    @Schema(description = "银行名称")
+    private String bankName;
+
+    @Schema(description = "开户行地址")
+    private String bankAddress;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysUserSelectVo.java

@@ -0,0 +1,15 @@
+package com.jzg.commons.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @author quchen
+ * @date 2025/1/18 15:41
+ */
+
+@Data
+public class SysUserSelectVo {
+    private String id;
+
+    private String name;
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysUserVo.java

@@ -50,6 +50,101 @@ public class SysUserVo extends PageRequest {
     @Schema(description = "部门id")
     private String deptId;
 
+    @Schema(description = "姓名")
+    private String name;
+
+    @Schema(description = "系统编码")
+    private String systemCode;
+
+    @Schema(description = "身份证号")
+    private String identity;
+
+    @Schema(description = "身份证有效期起期")
+    private String identityTimeStart;
+
+    @Schema(description = "身份证有效期止期")
+    private String identityTimeEnd;
+
+    @Schema(description = "领导人id")
+    private String leaderId;
+
+    @Schema(description = "领导人姓名")
+    private String leaderName;
+
+    @Schema(description = "推荐人id")
+    private String referrerId;
+
+    @Schema(description = "推荐人id")
+    private String referrerName;
+
+    @Schema(description = "性别")
+    private String sex;
+
+    @Schema(description = "出生日期")
+    private String birthday;
+
+    @Schema(description = "民族")
+    private String nations;
+    @Schema(description = "户籍")
+    private String koseki;
+
+    @Schema(description = "婚姻状况")
+    private String maritalStatus;
+
+    @Schema(description = "政治面貌")
+    private String politicsStatus;
+
+    @Schema(description = "健康状况")
+    private String health;
+
+    @Schema(description = "省")
+    private String province;
+
+    @Schema(description = "市")
+    private String city;
+
+    @Schema(description = "区")
+    private String district;
+
+    @Schema(description = "详细地址")
+    private String liveAddress;
+
+    @Schema(description = "邮政编码")
+    private String postalCode;
+
+    @Schema(description = "学历")
+    private String education;
+
+    @Schema(description = "毕业学校")
+    private String school;
+
+    @Schema(description = "毕业时间")
+    private String graduationTime;
+
+    @Schema(description = "是否是计算机专业 1 是 0 否")
+    private String isComputer;
+
+    @Schema(description = "紧急联系人姓名")
+    private String emergencyContactName;
+
+    @Schema(description = "紧急联系人电话")
+    private String emergencyContactTel;
+
+    @Schema(description = "薪资")
+    private String salary;
+
+    @Schema(description = "薪资等级")
+    private String salaryLevel;
+
+    @Schema(description = "开户行")
+    private String bankName;
+
+    @Schema(description = "银行卡号")
+    private String bankCardId;
+
+    @Schema(description = "用户类型1.前线人员 2:后线人员 3:合伙人 4:工作室管理员 5:团队长 6:个代 7：电销 8 渠道")
+    private String typeAttr;
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor

gateway/src/main/resources/application.yml

@@ -21,4 +21,6 @@ spring:
         - id: tenant_route
           uri: http://localhost:8084/
           predicates:
-            - Path=/tenant/**,/dept/**,/area/**,/dict/**
+            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**
+
+

tenant/organization/src/main/java/com/jzg/organization/controller/UserController.java

@@ -0,0 +1,83 @@
+package com.jzg.organization.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.vo.*;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.*;
+import com.jzg.organization.service.SysUserService;
+
+/**
+ * @author quchen
+ * @date 2025/1/16 16:54
+ */
+
+@RestController
+@RequestMapping("/userInfo")
+public class UserController extends BaseController {
+    @Resource
+    private SysUserService sysUserService;
+
+    @Operation(summary = "分页获取业务员列表接口", description = "分页获取业务员列表接口")
+    @PostMapping(value = "/getUserInfoList")
+    public HttpResult getUserInfoList(@RequestBody SysUserInfoListVo sysUserInfoListVo) {
+        Page page = sysUserInfoListVo.getPage();
+        return HttpResult.ok(sysUserService.getUserInfoList(page,sysUserInfoListVo));
+    }
+
+    @Operation(summary = "获取人员列表接口", description = "获取人员列表接口")
+    @PostMapping(value = "/getUser")
+    public HttpResult getUser() {
+        return sysUserService.getUserSelect();
+    }
+
+    @Operation(summary = "新增业务员接口", description = "新增业务员接口")
+    @PostMapping(value = "/add")
+    public HttpResult addUserInfo(@RequestBody SysUserVo sysUserVo) {
+        return sysUserService.addUserInfo(sysUserVo);
+    }
+
+    @Operation(summary = "删除业务员接口", description = "删除业务员接口")
+    @PostMapping(value = "/delete")
+    public HttpResult deleteUser(@RequestBody IsDeleteVo isDeleteVo) {
+        return sysUserService.deleteUserInfo(isDeleteVo);
+    }
+
+    @Operation(summary = "启用禁用业务员接口", description = "启用禁用业务员接口")
+    @PostMapping(value = "/isEnable")
+    public HttpResult isEnableUser(@RequestBody IsEnableVo isEnableVo) {
+        return sysUserService.isEnableUser(isEnableVo);
+    }
+
+    @Operation(summary = "设置负责人接口", description = "设置负责人接口")
+    @PostMapping(value = "/batchLeader")
+    public HttpResult batchLeader(@RequestBody BatchLeaderVo batchLeaderVo) {
+        return sysUserService.batchLeader(batchLeaderVo);
+    }
+
+    @Operation(summary = "修改业务员接口", description = "修改业务员接口")
+    @PostMapping(value = "/update")
+    public HttpResult updateUser(@RequestBody SysUserVo sysUserVo) {
+        return sysUserService.updateUserInfo(sysUserVo);
+    }
+
+    @Operation(summary = "添加业务员银行卡", description = "添加业务员银行卡")
+    @PostMapping(value = "/addBankCard")
+    public HttpResult addBankCard(@RequestBody SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
+        return sysUserService.addBankCard(sysUserJzgInfoBankCardVo);
+    }
+
+    @Operation(summary = "获取业务员信息接口", description = "获取业务员信息接口")
+    @GetMapping(value = "/getUserInfo")
+    public HttpResult getUserInfoById(@RequestParam String id) {
+        return sysUserService.getUserInfoById(id);
+    }
+
+
+
+
+
+
+}

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoBankCardMapper.java

@@ -0,0 +1,10 @@
+package com.jzg.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysUserJzgInfoBankCardMapper extends BaseMapper<SysUserJzgInfoBankCard> {
+
+}

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoMapper.java

@@ -0,0 +1,19 @@
+package com.jzg.organization.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
+import com.jzg.commons.entity.vo.SysUserInfoListVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SysUserJzgInfoMapper extends BaseMapper<SysUserJzgInfo> {
+    List<SysUserJzgInfo> getUserInfoByIdentity(@Param("identity") String identity, @Param("userId") String userId);
+
+    Page<SysUserJzgInfo> getUserInfoList(Page page, @Param("sysUserInfoListVo") SysUserInfoListVo sysUserInfoListVo);
+
+}

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserMapper.java

@@ -2,6 +2,8 @@ package com.jzg.organization.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysUser;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
+import com.jzg.commons.entity.vo.SysUserSelectVo;
 import com.jzg.commons.entity.vo.SysUserVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -12,4 +14,10 @@ import java.util.List;
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
     List<SysUserVo> getUserInfo(@Param("param") SysUserVo sysUserVo);
+
+    List<SysUserSelectVo> getUserSelect();
+
+    SysUser getUserByMobile(@Param("mobile") String mobile);
+
+
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoBankCardService.java

@@ -0,0 +1,8 @@
+package com.jzg.organization.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+
+public interface SysUserJzgInfoBankCardService extends IService<SysUserJzgInfoBankCard> {
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoService.java

@@ -0,0 +1,11 @@
+package com.jzg.organization.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import com.jzg.commons.entity.po.SysUserJzgInfo;
+
+import java.util.List;
+
+public interface SysUserJzgInfoService extends IService<SysUserJzgInfo> {
+    List<SysUserJzgInfo> getUserInfoByIdentity(String identity,String userId);
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysUserService.java

@@ -1,14 +1,18 @@
 package com.jzg.organization.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.SysUser;
-import com.jzg.commons.entity.vo.SysUserVo;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
+import com.jzg.commons.entity.vo.*;
 
 import java.util.List;
 
 /**
  * @author Administrator
- * @description 针对表【sys_area(省市县代码)】的数据库操作Service
+ * @description 针对表【sys_user】的数据库操作Service
  * @createDate 2023-11-15 11:23:28
  */
 public interface SysUserService extends IService<SysUser> {
@@ -20,4 +24,28 @@ public interface SysUserService extends IService<SysUser> {
      */
     List<SysUserVo> getUserInfo(SysUserVo sysUserVo);
 
+    HttpResult getUserSelect();
+    /**
+     * 添加业务员
+     * @param sysUserVo
+     * @return
+     */
+    HttpResult addUserInfo(SysUserVo sysUserVo);
+
+    HttpResult deleteUserInfo(IsDeleteVo isDeleteVo);
+
+    HttpResult isEnableUser(IsEnableVo isEnableVo);
+
+    HttpResult batchLeader(BatchLeaderVo batchLeaderVo);
+
+    HttpResult addBankCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo);
+
+    HttpResult updateUserInfo(SysUserVo sysUserVo);
+
+    HttpResult getUserInfoById(String id);
+
+    Page<SysUserJzgInfo> getUserInfoList(Page page, SysUserInfoListVo sysUserInfoListVo);
+
+
+
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardServiceImpl.java

@@ -0,0 +1,15 @@
+package com.jzg.organization.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+import com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper;
+import com.jzg.organization.service.SysUserJzgInfoBankCardService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author quchen
+ * @date 2025/1/18 9:48
+ */
+@Service
+public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInfoBankCardMapper, SysUserJzgInfoBankCard> implements SysUserJzgInfoBankCardService {
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoServiceImpl.java

@@ -0,0 +1,23 @@
+package com.jzg.organization.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
+import com.jzg.organization.mapper.SysUserJzgInfoMapper;
+import com.jzg.organization.service.SysUserJzgInfoService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author quchen
+ * @date 2025/1/17 8:57
+ */
+
+@Service
+public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper, SysUserJzgInfo> implements SysUserJzgInfoService {
+
+    @Override
+    public List<SysUserJzgInfo> getUserInfoByIdentity(String identity, String userId) {
+        return baseMapper.getUserInfoByIdentity(identity, userId);
+    }
+}

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -1,11 +1,29 @@
 package com.jzg.organization.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.core.base.PageRequest;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.po.SysDept;
 import com.jzg.commons.entity.po.SysUser;
-import com.jzg.commons.entity.vo.SysUserVo;
+import com.jzg.commons.entity.po.SysUserJzgInfo;
+import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+import com.jzg.commons.entity.vo.*;
+import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.PasswordUtils;
+import com.jzg.commons.util.idgen.IdGenerate;
+import com.jzg.organization.mapper.SysUserJzgInfoMapper;
 import com.jzg.organization.mapper.SysUserMapper;
+import com.jzg.organization.service.SysDeptService;
+import com.jzg.organization.service.SysUserJzgInfoBankCardService;
+import com.jzg.organization.service.SysUserJzgInfoService;
 import com.jzg.organization.service.SysUserService;
+import jakarta.annotation.Resource;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -16,12 +34,196 @@ import java.util.List;
  */
 @Service
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
+    @Resource
+    private SysUserJzgInfoService sysUserJzgInfoService;
+
+    @Resource
+    private SysDeptService sysDeptService;
+
+    @Resource
+    private SysUserJzgInfoBankCardService sysUserJzgInfoBankCardService;
+
+    @Resource
+    private SysUserJzgInfoMapper sysUserJzgInfoMapper;
 
     @Override
     public List<SysUserVo> getUserInfo(SysUserVo sysUserVo) {
         return baseMapper.getUserInfo(sysUserVo);
     }
 
+    @Override
+    public HttpResult getUserSelect(){
+        return HttpResult.ok(baseMapper.getUserSelect());
+    }
+
+    @Override
+    public Page<SysUserJzgInfo> getUserInfoList(Page page,SysUserInfoListVo sysUserInfoListVo) {
+        return sysUserJzgInfoMapper.getUserInfoList(page,sysUserInfoListVo);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult addUserInfo(SysUserVo sysUserVo) {
+        SysUser sysUser = baseMapper.getUserByMobile(sysUserVo.getMobile());
+        if (sysUser != null) {
+            verifyUser(sysUserVo.getDeptId(),sysUserVo.getIdentity(),sysUser.getId(),sysUserVo.getLeaderId(),sysUserVo.getReferrerId());
+            SysUserJzgInfo sysUserJzgInfo = new SysUserJzgInfo();
+            BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
+            sysUserJzgInfo.setUserId(sysUser.getId());
+            sysUserJzgInfo.setStatus(0);
+            sysUserJzgInfo.setIsEnable(1);
+            sysUserJzgInfoService.save(sysUserJzgInfo);
+
+            //如果表单输入的银行卡号和银行名不为空，则保存银行卡信息
+            if (sysUserVo.getBankCardId() != null && sysUserVo.getBankName() != null) {
+                SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
+                sysUserJzgInfoBankCard.setId(IdGenerate.nextId());
+                sysUserJzgInfoBankCard.setUserJzgInfoId(sysUserJzgInfo.getId());
+                sysUserJzgInfoBankCard.setBankCardNumber(sysUserVo.getBankCardId());
+                sysUserJzgInfoBankCard.setBankName(sysUserVo.getBankName());
+                sysUserJzgInfoBankCard.setIsDefault(0); //设为非默认卡
+                sysUserJzgInfoBankCard.setAuditStatus(0); //设为待审核
+                sysUserJzgInfoBankCard.setRemark("");
+                sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
+            }
+        } else {
+            // 如果手机号为新号 重新生成SysUser 设置默认密码
+            SysUser sysUser1 = new SysUser();
+            sysUser1.setId(IdGenerate.nextId());
+            sysUser1.setUsername(sysUserVo.getMobile());
+            String pwd = "12345678";
+            String salt = PasswordUtils.getSalt();
+            sysUser1.setPassword(PasswordUtils.encode(pwd, salt));
+            sysUser1.setSalt(salt);
+            sysUser1.setMobile(sysUserVo.getMobile());
+            sysUser1.setAccountStatus(1);
+            this.save(sysUser1);
+            SysUserJzgInfo sysUserJzgInfo = new SysUserJzgInfo();
+            BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
+            sysUserJzgInfo.setId(IdGenerate.nextId());
+            sysUserJzgInfo.setUserId(sysUser1.getId());
+            sysUserJzgInfo.setStatus(0);
+            sysUserJzgInfoService.save(sysUserJzgInfo);
+
+            //如果表单输入的银行卡号和银行名不为空，则保存银行卡信息
+            if (sysUserVo.getBankCardId() != null && sysUserVo.getBankName() != null) {
+                SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
+                sysUserJzgInfoBankCard.setId(IdGenerate.nextId());
+                sysUserJzgInfoBankCard.setUserJzgInfoId(sysUserJzgInfo.getId());
+                sysUserJzgInfoBankCard.setBankCardNumber(sysUserVo.getBankCardId());
+                sysUserJzgInfoBankCard.setBankName(sysUserVo.getBankName());
+                sysUserJzgInfoBankCard.setIsDefault(0); //设为非默认卡
+                sysUserJzgInfoBankCard.setAuditStatus(0); //设为待审核
+                sysUserJzgInfoBankCard.setRemark("");
+                sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
+            }
+        }
+        return HttpResult.ok("添加业务员成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult<Boolean> deleteUserInfo(IsDeleteVo isDeleteVo) {
+        for (String id : isDeleteVo.getIds()) {
+            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
+            if (sysUserJzgInfo == null) {
+                throw new SystemException("该用户不存在");
+            }
+            sysUserJzgInfo.setIsDelete(1);
+            sysUserJzgInfoService.updateById(sysUserJzgInfo);
+        }
+        return HttpResult.ok("删除业务员成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult<Boolean> isEnableUser(IsEnableVo isEnableVo) {
+        for (String id : isEnableVo.getIds()) {
+            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
+            if (sysUserJzgInfo == null) {
+                throw new SystemException("该用户不存在");
+            }
+            sysUserJzgInfo.setIsEnable(isEnableVo.getIsEnable());
+            sysUserJzgInfoService.updateById(sysUserJzgInfo);
+        }
+        return HttpResult.ok("删除业务员成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult<Boolean> batchLeader(BatchLeaderVo batchLeaderVo) {
+        for (String id : batchLeaderVo.getIds()) {
+            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
+            if (sysUserJzgInfo == null) {
+                throw new SystemException("该用户不存在");
+            }
+            sysUserJzgInfo.setLeaderId(batchLeaderVo.getLeaderId());
+            sysUserJzgInfoService.updateById(sysUserJzgInfo);
+        }
+        return HttpResult.ok("设置负责人成功");
+    }
+
+    @Override
+    public HttpResult addBankCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(sysUserJzgInfoBankCardVo.getUserJzgInfoId());
+        if (sysUserJzgInfo == null) {
+            throw new SystemException("该业务员不存在");
+        }
+        SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
+        BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, sysUserJzgInfoBankCard);
+        sysUserJzgInfoBankCard.setId(IdGenerate.nextId());
+        sysUserJzgInfoBankCard.setAuditStatus(0);
+        sysUserJzgInfoBankCard.setIsDefault(0);
+        sysUserJzgInfoBankCard.setRemark("");
+        sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
+        return HttpResult.ok("添加银行卡成功");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult<Boolean> updateUserInfo(SysUserVo sysUserVo) {
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(sysUserVo.getId());
+        if (sysUserJzgInfo == null || sysUserJzgInfo.getStatus() == 0) {
+            throw new SystemException("该业务员不存在");
+        }
+        if (sysUserJzgInfo.getIsEnable() == 0) {
+            throw new SystemException("该业务员已被禁用");
+        }
+        BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
+        sysUserJzgInfoService.updateById(sysUserJzgInfo);
+        return HttpResult.ok("修改业务员成功");
+    }
+
+    @Override
+    public HttpResult getUserInfoById(String id) {
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
+        if (sysUserJzgInfo == null) {
+            throw new SystemException("该用户不存在");
+        }
+        return HttpResult.ok(sysUserJzgInfo);
+    }
+
+
+    public void verifyUser(String deptId,String identity,String userId,String leaderId,String referrerId){
+        SysDept sysDept = sysDeptService.getById(deptId);
+        List<SysUserJzgInfo> sysUserJzgInfos  = sysUserJzgInfoService.getUserInfoByIdentity(identity, userId);
+        SysUserJzgInfo sysUserJzgInfoByLeaderId = sysUserJzgInfoService.getOne
+                (new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getId,leaderId).eq(SysUserJzgInfo::getIsDelete,0));
+        SysUserJzgInfo sysUserJzgInfoByReferrerId = sysUserJzgInfoService.getOne
+                (new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getId,referrerId).eq(SysUserJzgInfo::getIsDelete,0));
+        if (sysUserJzgInfos.size() > 0) {
+            throw new SystemException("该身份证号已存在，请检查");
+        }
+        if (sysDept == null) {
+            throw new SystemException("所选机构不存在");
+        }
+        if (sysUserJzgInfoByLeaderId == null) {
+            throw new SystemException("所选管理员不存在");
+        }
+        if (sysUserJzgInfoByReferrerId == null) {
+            throw new SystemException("所选推荐人不存在");
+        }
+    }
 }
 
 

tenant/organization/src/main/resources/application.yml

@@ -6,7 +6,8 @@ spring:
       address: redis://192.168.0.250:6379
       password: 123456
       database: 0
-
+  main:
+    allow-circular-references: true
   datasource:
       url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
       username: root

tenant/organization/src/main/resources/mapper/SysUserJzgInfoBankCardMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper">
+</mapper>

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jzg.organization.mapper.SysUserJzgInfoMapper">
+
+    <resultMap id="BaseResultMap" type="com.jzg.commons.entity.dto.SysUserJzgInfoDto">
+        <id column="id" jdbcType="VARCHAR" property="id"/>
+        <result column="user_id" jdbcType="VARCHAR" property="userId"/>
+        <result column="username" jdbcType="VARCHAR" property="username"/>
+        <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
+        <result column="dept_id" jdbcType="VARCHAR" property="deptId"/>
+        <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
+        <result column="type_attr" jdbcType="VARCHAR" property="typeAttr"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="is_enable" jdbcType="INTEGER" property="isEnable"/>
+        <result column="leader_id" jdbcType="VARCHAR" property="leaderId"/>
+        <result column="leader_name" jdbcType="VARCHAR" property="leaderName"/>
+        <result column="referrer_id" jdbcType="VARCHAR" property="referrerId"/>
+        <result column="referrer_name" jdbcType="VARCHAR" property="referrerName"/>
+    </resultMap>
+
+    <select id="getUserInfoByIdentity" resultType="com.jzg.commons.entity.po.SysUserJzgInfo">
+        SELECT
+        *
+        FROM
+        sys_user_jzg_info suji
+        WHERE
+        1=1
+        <if test="identity != null and identity != ''">
+            AND suji.identity = #{identity}
+        </if>
+        <if test="userId != null and userId != ''">
+            AND suji.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getUserInfoList" resultMap="BaseResultMap">
+        select
+            suji.id,
+            suji.user_id,
+            su.username,
+            su.mobile,
+            suji.dept_id,
+            sd.name as dept_name,
+            suji.type_attr,
+            suji.status,
+            suji.is_enable,
+            suji.leader_id,
+            su.username as leader_name,
+            suji.referrer_id,
+            su.username as referrer_name
+        from
+        sys_user_jzg_info suji
+        left join sys_user su on su.id = suji.user_id
+        left join sys_dept sd on sd.id = suji.dept_id
+        where
+        1=1
+        <if test="sysUserInfoListVo.deptId != null and sysUserInfoListVo.deptId != ''">
+            and suji.dept_id = #{sysUserInfoListVo.deptId}
+        </if>
+        <if test="sysUserInfoListVo.deptName != null and sysUserInfoListVo.deptName != ''">
+            and sd.name like concat('%',#{sysUserInfoListVo.deptName},'%')
+        </if>
+
+        <if test="sysUserInfoListVo.typeAttr != null and sysUserInfoListVo.typeAttr != ''">
+            and suji.type_attr = #{sysUserInfoListVo.typeAttr}
+        </if>
+        <if test="sysUserInfoListVo.status != null and sysUserInfoListVo.status != ''">
+            and suji.status = #{sysUserInfoListVo.status}
+        </if>
+        <if test="sysUserInfoListVo.leaderId != null and sysUserInfoListVo.leaderId != ''">
+            and (suji.leader_id = #{sysUserInfoListVo.leaderId}
+            or  su.username = #{sysUserInfoListVo.leaderId)
+        </if>
+        <if test="sysUserInfoListVo.salesman != null and sysUserInfoListVo.salesman != ''">
+            and (su.username like concat('%',#{sysUserInfoListVo.salesman},'%')
+            or  su.mobile = #{sysUserInfoListVo.salesman}
+            or  suji.id = #{sysUserInfoListVo.salesman})
+        </if>
+    </select>
+</mapper>

tenant/organization/src/main/resources/mapper/SysUserMapper.xml

@@ -17,4 +17,26 @@
             AND suji.dept_id = #{param.deptId}
         </if>
     </select>
+
+    <select id="getUserSelect" resultType="com.jzg.commons.entity.vo.SysUserSelectVo">
+        SELECT
+        suji.id,
+        suji.name
+        FROM
+        sys_user_jzg_info suji
+        WHERE
+        1=1
+    </select>
+
+    <select id="getUserByMobile" resultType="com.jzg.commons.entity.po.SysUser">
+        SELECT
+        *
+        FROM
+        sys_user su
+        WHERE
+        1=1
+        <if test="mobile != null and mobile != ''">
+            AND su.mobile = #{mobile}
+        </if>
+    </select>
 </mapper>