修改账号信息时，如果促销状态未使用，则不进行促销账号开通

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

@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Objects;
+
 /**
  * @author : liqiulin
  * @date : 2024-10-30 17
@@ -57,6 +59,9 @@ public class SysUserCoreController {
         userVo.setUpdateBy(SecurityUtils.getUsername());
         sysUserService.updateUser(userVo);
 
+        if (Objects.isNull(userVo.getPrivilegeId())){
+            return;
+        }
         // 开通促销账号
         sysUserService.openPromotion(userVo);
     }

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

 package com.sfa.system.controller.query;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.sfa.common.core.domain.R;
 import com.sfa.common.core.utils.StringUtils;
 import com.sfa.common.core.utils.poi.ExcelUtil;
@@ -44,8 +45,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/user")
-public class SysUserQueryController extends BaseController
-{
+public class SysUserQueryController extends BaseController {
     @Autowired
     private ISysUserDao userDao;
 
@@ -72,16 +72,14 @@ public class SysUserQueryController extends BaseController
      */
     @RequiresPermissions("system:user:list")
     @GetMapping("/list")
-    public PageInfo list(UserVo userVo)
-    {
+    public PageInfo list(UserVo userVo) {
         return userQueryService.selectUserPage(userVo);
     }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @RequiresPermissions("system:user:export")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysUser user)
-    {
+    public void export(HttpServletResponse response, SysUser user) {
         List<SysUser> list = userDao.selectUserList(user);
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.exportExcel(response, list, "用户数据");
@@ -90,8 +88,7 @@ public class SysUserQueryController extends BaseController
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)
     @RequiresPermissions("system:user:import")
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         List<SysUser> userList = util.importExcel(file.getInputStream());
         String operName = SecurityUtils.getUsername();
@@ -100,8 +97,7 @@ public class SysUserQueryController extends BaseController
     }
 
     @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response) throws IOException
-    {
+    public void importTemplate(HttpServletResponse response) throws IOException {
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.importTemplateExcel(response, "用户数据");
     }
@@ -111,11 +107,9 @@ public class SysUserQueryController extends BaseController
      */
     @InnerAuth
     @GetMapping("/info/{username}")
-    public R<LoginUser> info(@PathVariable("username") String username)
-    {
+    public R<LoginUser> info(@PathVariable("username") String username) {
         SysUser sysUser = userDao.selectUserByUserName(username);
-        if (StringUtils.isNull(sysUser))
-        {
+        if (StringUtils.isNull(sysUser)) {
             return R.fail("用户名或密码错误");
         }
         // 角色集合
@@ -129,32 +123,41 @@ public class SysUserQueryController extends BaseController
         return R.ok(sysUserVo);
     }
 
+    @InnerAuth
+    @GetMapping("/userInfoById")
+    public R<SysUser> userInfo(Long userId) {
+        SysUser user =new SysUser(userId);
+        List<SysUser> list = userDao.selectUserList(user);
+        if(ObjectUtil.isEmpty(list)){
+            return R.fail("用户名或密码错误");
+        }
+        SysUser sysUser = list.get(0);
+        return R.ok(sysUser);
+
+    }
+
     /**
      * 注册用户信息
      */
     @InnerAuth
     @PostMapping("/register")
-    public R<Boolean> register(@RequestBody SysUser sysUser)
-    {
+    public R<Boolean> register(@RequestBody SysUser sysUser) {
         String username = sysUser.getUserName();
-        if (!("true".equals(sysConfigDao.selectConfigByKey("sys.account.registerUser"))))
-        {
+        if (!("true".equals(sysConfigDao.selectConfigByKey("sys.account.registerUser")))) {
             return R.fail("当前系统没有开启注册功能！");
         }
-        if (!userDao.checkUserNameUnique(sysUser))
-        {
+        if (!userDao.checkUserNameUnique(sysUser)) {
             return R.fail("保存用户'" + username + "'失败，注册账号已存在");
         }
         return R.ok(userDao.registerUser(sysUser));
     }
 
     /**
-     *记录用户登录IP地址和登录时间
+     * 记录用户登录IP地址和登录时间
      */
     @InnerAuth
     @PutMapping("/recordlogin")
-    public R<Boolean> recordlogin(@RequestBody SysUser sysUser)
-    {
+    public R<Boolean> recordlogin(@RequestBody SysUser sysUser) {
         return R.ok(userDao.updateUserProfile(sysUser));
     }
 
@@ -164,8 +167,7 @@ public class SysUserQueryController extends BaseController
      * @return 用户信息
      */
     @GetMapping("/getInfo")
-    public AjaxResult getInfo()
-    {
+    public AjaxResult getInfo() {
         SysUser user = userDao.selectUserById(SecurityUtils.getUserId());
         UserDto userDto = new UserDto();
         BeanUtils.copyProperties(user, userDto);
@@ -191,16 +193,14 @@ public class SysUserQueryController extends BaseController
      * 根据用户编号获取详细信息
      */
     @RequiresPermissions("system:user:query")
-    @GetMapping(value = { "/", "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
-    {
+    @GetMapping(value = {"/", "/{userId}"})
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         userDao.checkUserDataScope(userId);
         AjaxResult ajax = AjaxResult.success();
         List<SysRole> roles = sysRoleDao.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", sysPostDao.selectPostAll());
-        if (StringUtils.isNotNull(userId))
-        {
+        if (StringUtils.isNotNull(userId)) {
             SysUser sysUser = userDao.selectUserById(userId);
             UserDto userDto = new UserDto();
             BeanUtils.copyProperties(sysUser, userDto);
@@ -222,8 +222,7 @@ public class SysUserQueryController extends BaseController
      * 新增用户
      @RequiresPermissions("system:user:add")
      @Log(title = "用户管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@Validated @RequestBody UserVo userVo)
+     @PostMapping public AjaxResult add(@Validated @RequestBody UserVo userVo)
      {
      sysDeptDao.checkDeptDataScope(userVo.getDeptId());
      sysRoleDao.checkRoleDataScope(userVo.getRoleIds());
@@ -251,8 +250,7 @@ public class SysUserQueryController extends BaseController
 
      @RequiresPermissions("system:user:edit")
      @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysUser user)
+     @PutMapping public AjaxResult edit(@Validated @RequestBody SysUser user)
      {
      userDao.checkUserAllowed(user);
      userDao.checkUserDataScope(user.getUserId());
@@ -282,10 +280,8 @@ public class SysUserQueryController extends BaseController
     @RequiresPermissions("system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
-    {
-        if (ArrayUtils.contains(userIds, SecurityUtils.getUserId()))
-        {
+    public AjaxResult remove(@PathVariable Long[] userIds) {
+        if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
             return error("当前用户不能删除");
         }
         return toAjax(userDao.deleteUserByIds(userIds));
@@ -297,8 +293,7 @@ public class SysUserQueryController extends BaseController
     @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public AjaxResult resetPwd(@RequestBody SysUser user)
-    {
+    public AjaxResult resetPwd(@RequestBody SysUser user) {
         userDao.checkUserAllowed(user.getUserId());
         userDao.checkUserDataScope(user.getUserId());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -312,8 +307,7 @@ public class SysUserQueryController extends BaseController
     @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysUser user)
-    {
+    public AjaxResult changeStatus(@RequestBody SysUser user) {
         userDao.checkUserAllowed(user.getUserId());
         userDao.checkUserDataScope(user.getUserId());
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -325,8 +319,7 @@ public class SysUserQueryController extends BaseController
      */
     @RequiresPermissions("system:user:query")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId)
-    {
+    public AjaxResult authRole(@PathVariable("userId") Long userId) {
         AjaxResult ajax = AjaxResult.success();
         SysUser user = userDao.selectUserById(userId);
         List<SysRole> roles = sysRoleDao.selectRolesByUserId(userId);
@@ -341,8 +334,7 @@ public class SysUserQueryController extends BaseController
     @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
-    {
+    public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
         userDao.checkUserDataScope(userId);
         sysRoleDao.checkRoleDataScope(roleIds);
         userDao.insertUserAuth(userId, roleIds);
@@ -354,8 +346,7 @@ public class SysUserQueryController extends BaseController
      */
     @RequiresPermissions("system:user:list")
     @GetMapping("/deptTree")
-    public AjaxResult deptTree(SysDept dept)
-    {
+    public AjaxResult deptTree(SysDept dept) {
         return success(sysDeptDao.selectDeptTreeList(dept));
     }
 }

src/main/resources/bootstrap-master.yml

+spring:
+  application:
+    name: wangxiaolu-sfa-system
+
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.0.0.170:8848
+        group: sfa
+        namespace: e2996044-6ddc-4988-8810-602e05d01ccf
+      config:
+        server-addr: 10.0.0.170:8848
+        file-extension: yaml
+        group: sfa
+        namespace: e2996044-6ddc-4988-8810-602e05d01ccf