浏览代码

增加创建账号优化

dsx 2 年之前
父节点
当前提交
6c01c2d998

+ 16 - 9
src/main/java/com/fdkankan/openApi/service/system/impl/AccountServiceImpl.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.CommonStatus;
@@ -163,8 +164,11 @@ public class AccountServiceImpl extends ServiceImpl<IAccountMapper, Account> imp
             throw new BusinessException(ErrorCode.FAILURE_CODE_10003);
         }
 
-        if(!param.getUserName().equals(account.getUserName())){
+        if(StrUtil.isNotEmpty(param.getUserName()) && !param.getUserName().equals(account.getUserName())){
             User user = userService.getByUserName(param.getUserName());
+            if(Objects.isNull(user)){
+                throw new BusinessException(ErrorCode.FAILURE_CODE_10003);
+            }
             account.setUserName(param.getUserName());
             account.setUserId(user.getId());
         }
@@ -176,19 +180,22 @@ public class AccountServiceImpl extends ServiceImpl<IAccountMapper, Account> imp
 
         UserAuthInfo userAuthInfo = userAuthService.findByAccountId(account.getId());
 
-        int totalCount = userAuthInfo.getTotalCount();
+        Integer totalCount = userAuthInfo.getTotalCount();
         if(totalCount < 0){
             totalCount = 0;
         }
         Integer count = param.getCount();
-        if(CountType.NO_LIMIT.code() == param.getCountType()){
-            totalCount = -1;
-        }else if(CountType.REDUCE.code() == param.getCountType()){
-            totalCount  -= count;
-            totalCount = totalCount < 0 ? 0 : totalCount;
-        }else{
-            totalCount += count;
+        if(Objects.nonNull(param.getCountType())){
+            if(CountType.NO_LIMIT.code() == param.getCountType()){
+                totalCount = -1;
+            }else if(CountType.REDUCE.code() == param.getCountType()){
+                totalCount  -= count;
+                totalCount = totalCount < 0 ? 0 : totalCount;
+            }else{
+                totalCount += count;
+            }
         }
+
         userAuthInfo.setUserId(account.getUserId());
         userAuthInfo.setTotalCount(totalCount);
         userAuthInfo.setState(param.getState());

+ 2 - 0
src/main/java/com/fdkankan/openApi/vo/system/AppUserVo.java

@@ -15,6 +15,8 @@ import java.util.Date;
 @Builder
 public class AppUserVo {
 
+    private Long id;
+
     /**
      * 账号
      */

+ 0 - 4
src/main/java/com/fdkankan/openApi/vo/system/UpdateAppUserParamVo.java

@@ -15,12 +15,10 @@ public class UpdateAppUserParamVo {
     /**
      * 账号
      */
-    @NotBlank(message = "userName不能为空")
     private String userName;
     /**
      * 客户名称
      */
-    @NotBlank(message = "customerName不能为空")
     private String customerName;
 
     /**
@@ -36,13 +34,11 @@ public class UpdateAppUserParamVo {
     /**
      * api调用次数
      */
-    @NotNull(message = "count不能为空")
     private Integer count;
 
     /**
      * 启用状态(0-否,1-是)
      */
-    @NotNull(message = "state不能为空")
     private Integer state;
 
     /**