feat:发票添加申请人

feat:添加微信小程序的用户入口

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/RegisterController.java

@@ -26,12 +26,12 @@ public class RegisterController {
 
     private final SysUserService userService;
 
-    /**
-     * 注册用户
-     *
-     * @param userDto 用户信息
-     * @return success/false
-     */
+//    /**
+//     * 注册用户
+//     *
+//     * @param userDto 用户信息
+//     * @return success/false
+//     */
 //    @SysLog("注册用户")
 //    @PostMapping("/user")
 //    @ConditionalOnProperty(name = "register.user", matchIfMissing = true)
@@ -39,6 +39,14 @@ public class RegisterController {
 //        return userService.registerUser(userDto);
 //    }
 
+    /**
+     * 注册普通用户
+     */
+    @SysLog("注册用户")
+    @PostMapping("/default-user")
+    public R<Boolean> registerDefaultUser(@RequestBody UserDTO userDto) {
+        return userService.registerDefaultUser(userDto);
+    }
 
 
     /**

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java

@@ -136,6 +136,11 @@ public interface SysUserService extends IService<SysUser> {
      */
     R<Boolean> registerUser(UserDTO userDto);
 
+    /**
+     * 注册普通用户
+     */
+    R<Boolean> registerDefaultUser(UserDTO userDto);
+
     /**
      * 锁定用户
      *

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java

@@ -753,6 +753,71 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return R.ok(true);
     }
 
+    /**
+     * 注册用户 赋予用户默认角色
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R<Boolean> registerDefaultUser(UserDTO userDto) {
+        userDto.setPhone(userDto.getUsername());
+        // 判断用户名是否存在
+        boolean usernameExists = this.exists(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, userDto.getUsername()));
+        if (usernameExists) {
+            String message = MsgUtils.getMessage(ErrorCodes.SYS_USER_USERNAME_EXISTING, userDto.getUsername());
+            return R.failed(message);
+        }
+        // 判断手机号是否存在
+        boolean phoneExists = this.exists(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getPhone, userDto.getPhone()));
+        if (phoneExists) {
+            String message = MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, userDto.getPhone());
+            return R.failed(message);
+        }
+        SysUser sysUser = new SysUser();
+        BeanUtils.copyProperties(userDto, sysUser);
+
+        sysUser.setLockFlag(UserStateEnum.NORMAL.getCode());
+        sysUser.setCreateBy(userDto.getUsername());
+        sysUser.setUpdateBy(userDto.getUsername());
+        sysUser.setPassword(ENCODER.encode(userDto.getPassword()));
+        sysUser.setPasswordModifyTime(LocalDateTime.now());
+        sysUser.setProcessStatus(TaskCheckStatusEnum.RESULT.getCode());
+        sysUser.setProcessTime(LocalDateTime.now());
+        sysUser.setStaffingType(UserStaffingTypeEnum.NONE_STAFFING.getType());
+        baseMapper.insert(sysUser);
+
+        // 如果角色为空，赋默认角色
+        if (CollUtil.isEmpty(userDto.getRole())) {
+            // 获取默认角色编码
+            String defaultRole = ParamResolver.getStr("USER_DEFAULT_ROLE");
+            // 默认角色
+            SysRole sysRole = sysRoleService.getOne(Wrappers.<SysRole>lambdaQuery().eq(SysRole::getRoleCode, defaultRole));
+            userDto.setRole(Collections.singletonList(sysRole.getRoleId()));
+        }
+
+        // 插入用户角色关系表
+        userDto.getRole().stream().map(roleId -> {
+            SysUserRole userRole = new SysUserRole();
+            userRole.setUserId(sysUser.getUserId());
+            userRole.setRoleId(roleId);
+            return userRole;
+        }).forEach(sysUserRoleMapper::insert);
+
+        // 创建用户默认钱包、保证线程header
+        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+        CompletableFuture.runAsync(() -> {
+            try {
+                RequestContextHolder.setRequestAttributes(requestAttributes);
+                // 创建钱包
+                remoteWalletService.createWallet(sysUser.getUserId());
+                // 通知钱包
+                remoteWalletService.userChange(sysUser.getUserId(), Boolean.FALSE);
+            } catch (Exception e) {
+                log.error("|{}|创建用户钱包失败error:|{}|", TAG, e.getMessage());
+            }
+        });
+        return R.ok(null);
+    }
+
     /**
      * 锁定用户
      *