实名账户的修改

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserAuthorizedController.java

@@ -49,7 +49,7 @@ public class UserAuthorizedController {
         }
         UserAuthorized userAuthorized = userAuthorizedService.createUserAuthorized(userAuthorizedParam);
         if (null == userAuthorized) {
-            return JsonResult.buildErrorStateResult("重复创建异常", null);
+            return JsonResult.buildErrorStateResult("重复创建异常或userUuid有误", null);
         } else {
             return JsonResult.buildSuccessResult("创建成功", userAuthorized.getId());
         }

src/main/java/cn/quantgroup/xyqb/entity/UserAuthorized.java

@@ -18,7 +18,7 @@ public class UserAuthorized {
     @Id
     @Column(name = "id")
     @GeneratedValue(generator = "uuid")
-    @GenericGenerator(name ="uuid" , strategy = "uuid")
+    @GenericGenerator(name ="uuid" , strategy = "org.hibernate.id.UUIDGenerator")
     private String id;
 
     @Column(name = "user_uuid")

src/main/java/cn/quantgroup/xyqb/model/AuthPattern.java

@@ -5,6 +5,8 @@ package cn.quantgroup.xyqb.model;
  */
 public enum AuthPattern {
     ZMXY("芝麻分授权"),
+    KA_ZMXY("ka芝麻分授权"),
+    KA_FOUR_ELEMENTS_OF_BANK_CARD("ka银行卡四要素"),
     FOUR_ELEMENTS_OF_BANK_CARD("银行卡四要素");
     private String desc;
 

src/main/java/cn/quantgroup/xyqb/model/UserAuthorizedParam.java

@@ -11,7 +11,6 @@ import lombok.Getter;
 public class UserAuthorizedParam {
     private String name;
     private String idNo;
-    private Long userId;
     private String authPattern;
     private String userUuid;
 }

src/main/java/cn/quantgroup/xyqb/service/auth/IUserAuthorizedService.java

@@ -24,7 +24,7 @@ public interface IUserAuthorizedService {
     UserAuthorized createUserAuthorized(UserAuthorizedParam userAuthorizedParam);
 
     /**
-     * 通过userId获取实名账户表的id
+     * 通过userUuid获取实名账户表的id
      *
      * @param userUuid userUuid
      * @return

src/main/java/cn/quantgroup/xyqb/service/auth/impl/UserAuthorizedServiceImpl.java

@@ -4,6 +4,7 @@ import cn.quantgroup.xyqb.entity.UserAuthorized;
 import cn.quantgroup.xyqb.model.AuthPattern;
 import cn.quantgroup.xyqb.model.UserAuthorizedParam;
 import cn.quantgroup.xyqb.repository.IUserAuthorizedRepository;
+import cn.quantgroup.xyqb.repository.IUserRepository;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
 import org.apache.commons.lang.StringUtils;
@@ -29,6 +30,9 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
     @Resource
     private IUserAuthorizedRepository userAuthorizedRepository;
 
+    @Resource
+    private IUserRepository userRepository;
+
     @Cacheable(value = "user_authorized_idno_cache", key = "#idNo", unless = "#result == false", cacheManager = "cacheManager")
     @Override
     public Boolean hasUserAuthorized(String idNo) {
@@ -51,12 +55,9 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         if (null == userAuthorizedParam) {
             return Boolean.TRUE;
         }
-        Long userId = userAuthorizedParam.getUserId();
         String userUuid = userAuthorizedParam.getUserUuid();
-        if (userId == null || userId == 0L) {
-            if (StringUtils.isBlank(userUuid)) {
-                return Boolean.TRUE;
-            }
+        if (StringUtils.isBlank(userUuid)) {
+            return Boolean.TRUE;
         }
         String name = userAuthorizedParam.getName();
         String authPattern = userAuthorizedParam.getAuthPattern();
@@ -66,8 +67,9 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
 
     @Override
     public UserAuthorized createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
-        // 数据检查
-        if(Objects.isNull(userAuthorizedParam) || this.hasUserAuthorized(userAuthorizedParam.getIdNo())){
+        // 数据检查,以及检查userUuid是否存在
+        if (Objects.isNull(userAuthorizedParam) || this.hasUserAuthorized(userAuthorizedParam.getIdNo())
+                || Objects.isNull(userRepository.findByUuid(userAuthorizedParam.getUserUuid()))) {
             return null;
         }
         AuthPattern authPatternEnum = AuthPattern.valueOf(userAuthorizedParam.getAuthPattern());
@@ -100,7 +102,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         }
 
         UserAuthorized userAuthorized = userAuthorizedRepository.findByUserUuid(userUuid);
-        LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userUuid:{},userAuthorized:{}", userUuid,userAuthorized);
+        LOGGER.info("[getUserAuthorizedId]获取实名账户的id,userUuid:{},userAuthorized:{}", userUuid, userAuthorized);
         if (null == userAuthorized) {
             return null;
         }

src/test/java/web/UserAuthorizedControllerTests.java

@@ -43,7 +43,6 @@ public class UserAuthorizedControllerTests extends BaseParametersTests {
         String name = "史书一";
         AuthPattern authPattern = AuthPattern.ZMXY;
         Boolean available = true;
-        obj.setUserId(userId);
         obj.setIdNo(idNo);
         obj.setName(name);
         obj.setAuthPattern(Optional.ofNullable(authPattern).orElse(AuthPattern.ZMXY).name());
@@ -52,20 +51,20 @@ public class UserAuthorizedControllerTests extends BaseParametersTests {
     @Test
     public void testExist() throws Exception {
         ResponseEntity<String> phil = restTemplate.getForEntity("/user/auth/{model}?idNo={idNo}", String.class, "hasUserAuthorized", obj.getIdNo());
-        log.info("testExist: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserId(), obj.getAuthPattern());
+        log.info("testExist: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getAuthPattern());
         Assert.assertEquals(phil.getStatusCode(), HttpStatus.OK);
     }
 
     @Test
     public void testSave() throws Exception {
         ResponseEntity<String> phil = restTemplate.postForEntity("/user/auth/{model}", this.obj, String.class, "createUserAuthorized");
-        log.info("testSave: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserId(), obj.getAuthPattern());
+        log.info("testSave: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getAuthPattern());
         Assert.assertEquals(phil.getStatusCode(), HttpStatus.OK);
     }
 
     @Test
     public void testQuery(){
-        ResponseEntity<String> phil = restTemplate.getForEntity("/user/auth/{model}?userId={userId}", String.class, "getUserAuthorizedId", obj.getUserId());
+        ResponseEntity<String> phil = restTemplate.getForEntity("/user/auth/{model}?userId={userId}", String.class, "getUserAuthorizedId");
         Assert.assertEquals(phil.getStatusCode(), HttpStatus.OK);
     }