1111

src/main/java/com/fdkankan/openApi/controller/www/JyUserController.java

@@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.crypto.asymmetric.RSA;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.AesUtil;
 import com.fdkankan.openApi.aop.ValidateApi;
 import com.fdkankan.openApi.entity.www.JyUser;
@@ -27,6 +28,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 
 /**
  * <p>

src/main/java/com/fdkankan/openApi/service/system/impl/AccountServiceImpl.java

@@ -235,9 +235,10 @@ public class AccountServiceImpl extends ServiceImpl<IAccountMapper, Account> imp
 
     @Override
     public ResultData createApp4Jmga(CreateAppUser4JmgaParamVo param) {
-        Account account = this.getOne(new LambdaQueryWrapper<Account>().eq(Account::getUserName, param.getUserName()));
+        Account account = this.getOne(new LambdaQueryWrapper<Account>().eq(Account::getUserName, param.getSystemId()));
         if(Objects.nonNull(account)){
-            throw new BusinessException(ErrorCode.FAILURE_CODE_10002);
+            UserAuthInfo userAuthInfo = userAuthService.findByAccountId(account.getId());
+            return ResultData.ok(userAuthInfo.getAppKey());
         }
         if(param.getState() != CommonStatus.NO.code().intValue()
                 && param.getState() != CommonStatus.YES.code().intValue()){
@@ -250,10 +251,8 @@ public class AccountServiceImpl extends ServiceImpl<IAccountMapper, Account> imp
             count = -1;
         }
         account = new Account();
-        account.setUserName(param.getUserName());
-        account.setCustomerName(param.getUserName());
-        account.setDescription(param.getDescription());
-        account.setCreaterId(param.getCreaterId());
+        account.setUserName(param.getSystemId());
+        account.setCustomerName(param.getSystemId());
         this.save(account);
 
         UserAuthInfo userAuthInfo = new UserAuthInfo();
@@ -263,7 +262,6 @@ public class AccountServiceImpl extends ServiceImpl<IAccountMapper, Account> imp
         userAuthInfo.setCallCount(0);
         userAuthInfo.setState(param.getState());
         userAuthInfo.setEffectTime(Calendar.getInstance().getTime());
-        userAuthInfo.setCreaterId(param.getCreaterId());
         userAuthService.save(userAuthInfo);
 
         return ResultData.ok(userAuthInfo.getAppKey());

src/main/java/com/fdkankan/openApi/service/www/impl/JyUserServiceImpl.java

@@ -84,6 +84,9 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
 
     @Override
     public ResultData updateStatus(DelJyUserParamVo param) {
+        if(Objects.isNull(param)){
+            throw new BusinessException(ErrorCode.PARAM_REQUIRED.code(), "status不能为空");
+        }
         return fdKKClient.post(JmgaConstant.API_STATUS_UCENTER_USER, param);
     }
 }

src/main/java/com/fdkankan/openApi/vo/system/CreateAppUser4JmgaParamVo.java

@@ -12,17 +12,9 @@ public class CreateAppUser4JmgaParamVo {
     /**
      * 账号
      */
-    @NotBlank(message = "userName不能为空")
-    private String userName;
-    /**
-     * 客户名称
-     */
-    private String customerName;
+    @NotBlank(message = "systemId不能为空")
+    private String systemId;
 
-    /**
-     * 客户描述
-     */
-    private String description;
 
     /**
      * 次数类型（-1-无限制，1-具体次数）
@@ -45,11 +37,6 @@ public class CreateAppUser4JmgaParamVo {
      */
     private Date effectTime;
 
-    /**
-     * 创建人id（对应管理后台用户id）
-     */
-    private Long createrId;
-