添加user-pro中间表；修改人员信息、促销账号直接按status修改

src/main/java/com/sfa/system/controller/core/SysUserCoreController.java

@@ -56,5 +56,8 @@ public class SysUserCoreController {
         userVo.setUpdateUserId(SecurityUtils.getUserId());
         userVo.setUpdateBy(SecurityUtils.getUsername());
         sysUserService.updateUser(userVo);
+
+        // 开通促销账号
+        sysUserService.openPromotion(userVo);
     }
 }

src/main/java/com/sfa/system/controller/query/SysUserQueryController.java

@@ -16,14 +16,17 @@ import com.sfa.system.api.domain.SysRole;
 import com.sfa.system.api.domain.SysUser;
 import com.sfa.system.api.model.LoginUser;
 import com.sfa.system.api.pojo.request.UserVo;
+import com.sfa.system.api.pojo.response.UserDto;
 import com.sfa.system.domain.dao.ISysPostDao;
 import com.sfa.system.domain.dao.ISysUserDao;
 import com.sfa.system.domain.dao.ISysConfigDao;
 import com.sfa.system.domain.dao.ISysDeptDao;
 import com.sfa.system.domain.dao.ISysPermissionDao;
 import com.sfa.system.domain.dao.ISysRoleDao;
+import com.sfa.system.pojo.response.SysUserProDto;
 import com.sfa.system.service.query.IUserQueryService;
 import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -191,7 +194,16 @@ public class SysUserQueryController extends BaseController
         if (StringUtils.isNotNull(userId))
         {
             SysUser sysUser = userDao.selectUserById(userId);
-            ajax.put(AjaxResult.DATA_TAG, sysUser);
+            UserDto userDto = new UserDto();
+            BeanUtils.copyProperties(sysUser, userDto);
+            SysUserProDto sysUserProDto = userQueryService.selectUserPromotion(userDto);
+            userDto.setIsOpenPromotion(sysUserProDto != null);
+            if (userDto.getIsOpenPromotion()) {
+                userDto.setPrivilegeId(sysUserProDto.getPrivilegeId());
+                userDto.setProStatus(sysUserProDto.getStatus());
+            }
+
+            ajax.put(AjaxResult.DATA_TAG, userDto);
 //            ajax.put("postIds", sysPostDao.selectPostListByUserId(userId));
 //            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }

src/main/java/com/sfa/system/domain/dao/ISysUserProDao.java

+package com.sfa.system.domain.dao;
+
+import com.sfa.system.pojo.response.SysUserProDto;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-01-15 14
+ * @describe :
+ */
+public interface ISysUserProDao {
+    void insertOrUpdate(String userName, String nickName, Integer privilegeId, String proStatus);
+
+    SysUserProDto selectOne(String userName);
+}

src/main/java/com/sfa/system/domain/dao/impl/SysUserDaoImpl.java

@@ -321,7 +321,9 @@ public class SysUserDaoImpl implements ISysUserDao {
         // 新增用户与角色管理
 //        insertUserRole(user);
         insertUserRoleOne(user.getUserId(), user.getRoleId());
-        return userMapper.updateById(user);
+        user.setPassword(null);
+        userMapper.updateById(user);
+        return userMapper.updateRoleName(user);
     }
 
     /**

src/main/java/com/sfa/system/domain/dao/impl/SysUserProDaoImpl.java

+package com.sfa.system.domain.dao.impl;
+
+import com.sfa.system.domain.dao.ISysUserProDao;
+import com.sfa.system.domain.entity.SysUserPro;
+import com.sfa.system.domain.mapper.SysUserProMapper;
+import com.sfa.system.pojo.response.SysUserProDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-01-15 14
+ * @describe :
+ */
+@Service
+public class SysUserProDaoImpl implements ISysUserProDao {
+
+    @Autowired
+    private SysUserProMapper sysUserProMapper;
+    @Override
+    public void insertOrUpdate(String userName, String nickName, Integer privilegeId, String proStatus) {
+        SysUserPro sDo = new SysUserPro();
+        sDo.setUserName(userName);
+        sDo.setNickName(nickName);
+        sDo.setPrivilegeId(privilegeId);
+        sDo.setStatus(proStatus);
+        sysUserProMapper.insertOrUpdate(sDo);
+    }
+
+    @Override
+    public SysUserProDto selectOne(String userName) {
+        return sysUserProMapper.selectOneByUserName(userName);
+    }
+}

src/main/java/com/sfa/system/domain/entity/SysUserPro.java

+package com.sfa.system.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sfa.common.core.web.domain.BaseDo;
+import lombok.Data;
+
+/**
+ * 用户关联促销用户表
+ * @TableName sys_user_pro
+ */
+@TableName(value ="sys_user_pro")
+@Data
+public class SysUserPro extends BaseDo {
+    /**
+     * 用户登录账号/工号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 权限(1:oneself,2:admin)
+     */
+    private Integer privilegeId;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/sfa/system/domain/mapper/SysUserMapper.java

@@ -134,4 +134,6 @@ public interface SysUserMapper extends BaseMapper<SysUser>
     List<SysUser> selectUserPage();
 
     void updateUserPostByPostId(@Param("postId") Long postId, @Param("postName") String postName, @Param("ruleId") Long ruleId, @Param("ruleName") String ruleName);
+
+    int updateRoleName(SysUser user);
 }

src/main/java/com/sfa/system/domain/mapper/SysUserProMapper.java

+package com.sfa.system.domain.mapper;
+
+import com.sfa.system.domain.entity.SysUserPro;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sfa.system.pojo.response.SysUserProDto;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+* @author a02200059
+* @description 针对表【sys_user_pro(用户关联促销用户表)】的数据库操作Mapper
+* @createDate 2025-01-15 14:13:54
+* @Entity com.sfa.system.domain.entity.SysUserPro
+*/
+@Repository
+@Mapper
+public interface SysUserProMapper extends BaseMapper<SysUserPro> {
+
+    /**
+     * 插入或更新用户促销信息
+     * 如果用户促销信息已存在，则更新；否则，插入新的用户促销信息
+     */
+    void insertOrUpdate(SysUserPro sysUserPro);
+
+    SysUserProDto selectOneByUserName(String userName);
+}
+
+
+
+

src/main/java/com/sfa/system/pojo/response/SysUserProDto.java

+package com.sfa.system.pojo.response;
+
+import lombok.Data;
+
+@Data
+public class SysUserProDto{
+    /**
+     * 用户登录账号/工号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 权限(1:oneself,2:admin)
+     */
+    private Integer privilegeId;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+}
\ No newline at end of file

src/main/java/com/sfa/system/service/core/ISysUserCoreService.java

@@ -11,4 +11,6 @@ public interface ISysUserCoreService {
     void insertUser(UserVo userVo);
 
     void updateUser(UserVo userVo);
+
+    void openPromotion(UserVo userVo);
 }

src/main/java/com/sfa/system/service/core/impl/SysUserCoreServiceImpl.java

@@ -6,6 +6,7 @@ import com.sfa.system.api.pojo.response.SiteDto;
 import com.sfa.system.domain.dao.IMdmCityDao;
 import com.sfa.system.domain.dao.ISysPostDao;
 import com.sfa.system.domain.dao.ISysUserDao;
+import com.sfa.system.domain.dao.ISysUserProDao;
 import com.sfa.system.pojo.response.SysPostDto;
 import com.sfa.system.service.core.ISysUserCoreService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,8 @@ public class SysUserCoreServiceImpl implements ISysUserCoreService {
     ISysPostDao sysPostDao;
     @Autowired
     IMdmCityDao mdmCityDao;
+    @Autowired
+    ISysUserProDao sysUserProDao;
 
     @Override
     public void insertUser(UserVo userVo) {
@@ -52,6 +55,11 @@ public class SysUserCoreServiceImpl implements ISysUserCoreService {
         sysUserDao.updateUser(userVo);
     }
 
+    @Override
+    public void openPromotion(UserVo userVo) {
+        sysUserProDao.insertOrUpdate(userVo.getUserName(), userVo.getNickName(), userVo.getPrivilegeId(), userVo.getProStatus());
+    }
+
     // 补充角色、城市等信息
     private void addCity(UserVo userVo){
         if (StringUtils.isEmpty(userVo.getWorkCityNum())){

src/main/java/com/sfa/system/service/query/IUserQueryService.java

@@ -2,6 +2,8 @@ package com.sfa.system.service.query;
 
 import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.system.api.pojo.request.UserVo;
+import com.sfa.system.api.pojo.response.UserDto;
+import com.sfa.system.pojo.response.SysUserProDto;
 
 /**
  * @author : liqiulin
@@ -15,4 +17,7 @@ public interface IUserQueryService {
      * @return
      */
     PageInfo selectUserPage(UserVo userVo);
+
+
+    SysUserProDto selectUserPromotion(UserDto userDto);
 }

src/main/java/com/sfa/system/service/query/impl/UserQueryServiceImpl.java

@@ -2,8 +2,11 @@ package com.sfa.system.service.query.impl;
 
 import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.system.api.pojo.request.UserVo;
+import com.sfa.system.api.pojo.response.UserDto;
 import com.sfa.system.domain.dao.ISysUserDao;
+import com.sfa.system.domain.dao.ISysUserProDao;
 import com.sfa.system.domain.wq.SysUserWq;
+import com.sfa.system.pojo.response.SysUserProDto;
 import com.sfa.system.service.query.IUserQueryService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +22,8 @@ public class UserQueryServiceImpl implements IUserQueryService {
 
     @Autowired
     private ISysUserDao userDao;
+    @Autowired
+    private ISysUserProDao sysUserProDao;
 
     /**
      * 分页查询
@@ -32,4 +37,9 @@ public class UserQueryServiceImpl implements IUserQueryService {
 
         return userDao.selectUserPage(sysUserWq);
     }
+
+    @Override
+    public SysUserProDto selectUserPromotion(UserDto userDto) {
+        return sysUserProDao.selectOne(userDto.getUserName());
+    }
 }

src/main/resources/mapper/system/SysUserMapper.xml

@@ -249,4 +249,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="updateUserPostByPostId">
 		update sys_user set post_name =#{postName} ,rule_id =#{ruleId} ,rule_name =#{ruleName} where post_id =#{postId}
 	</update>
+
+	<update id="updateRoleName" parameterType="com.sfa.system.api.domain.SysUser">
+		update sys_user
+		set role_name =(select role_name
+						from sys_role
+						where role_id = #{roleId})
+		where user_id = #{userId}
+	</update>
 </mapper> 
\ No newline at end of file

src/main/resources/mapper/system/SysUserProMapper.xml

+<?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.sfa.system.domain.mapper.SysUserProMapper">
+
+    <resultMap id="BaseResultMap" type="com.sfa.system.domain.entity.SysUserPro">
+            <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+            <result property="nickName" column="nick_name" jdbcType="VARCHAR"/>
+            <result property="privilegeId" column="privilege_id" jdbcType="INTEGER"/>
+            <result property="status" column="status" jdbcType="CHAR"/>
+    </resultMap>
+
+    <resultMap id="DtoMap" type="com.sfa.system.pojo.response.SysUserProDto">
+            <result property="privilegeId" column="privilege_id" jdbcType="INTEGER"/>
+            <result property="status" column="status" jdbcType="CHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        user_name,nick_name,privilege_id,
+        status
+    </sql>
+
+    <insert id="insertOrUpdate" parameterType="com.sfa.system.domain.entity.SysUserPro">
+        insert into sys_user_pro (user_name, nick_name, privilege_id, status)
+        values (#{userName}, #{nickName}, #{privilegeId}, #{status}) on duplicate key
+        update
+            nick_name = #{nickName},
+            privilege_id = #{privilegeId},
+            status = #{status}
+    </insert>
+
+    <select id="selectOneByUserName" resultMap="DtoMap">
+        select privilege_id,status
+        from sys_user_pro
+        where user_name = #{userName};
+    </select>
+</mapper>