Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamRealInfoVo.java

@@ -11,11 +11,15 @@ import java.io.Serializable;
 @Data
 public class AdamRealInfoVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -3469256375584132928L;
+    @ApiModelProperty(position = 10, value = "用户ID[30]")
+    private String uid;
     @ApiModelProperty(position = 11, value = "姓名[30]")
     private String name;
     @ApiModelProperty(position = 12, value = "证件号[50]")
     private String idCard;
-    @ApiModelProperty(position = 13, value = "状态:1-正常")
+    @ApiModelProperty(position = 13, value = "类型[1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证]")
+    private String type;
+    @ApiModelProperty(position = 14, value = "状态:1-正常")
     private Integer state;
 
     private static final AdamRealInfoVo obj = new AdamRealInfoVo();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java

@@ -43,7 +43,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
             long s = System.currentTimeMillis();
             AdamUserInfoVo vo = mongoTemplate.findOne(query, AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName());
             log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-            if (null != vo) redisUtil.set(key, vo.getUid());
+            if (null != vo) {
+                val = vo.getMobile();
+                redisUtil.set(key, vo.getUid());
+            }
         }
         return val;
     }
@@ -68,7 +71,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
             long s = System.currentTimeMillis();
             AdamThirdPartInfoVo vo = mongoTemplate.findOne(query, AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
             log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-            if (null != vo) redisUtil.set(key, vo.getUid());
+            if (null != vo) {
+                val = vo.getUid();
+                redisUtil.set(key, vo.getUid());
+            }
         }
         return val;
     }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -364,8 +364,10 @@ public class AdamUserServiceImpl implements IAdamUserService {
         adamRealNameService.add(realName);
 
         AdamRealInfoVo realInfoVo = AdamRealInfoVo.getNew();
+        realInfoVo.setUid(uid);
         realInfoVo.setName(name);
         realInfoVo.setIdCard(idCard);
+        realInfoVo.setType(realName.getType());
         realInfoVo.setState(1);
 
         long s = System.currentTimeMillis();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMRealNameProcessor.java

@@ -75,6 +75,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
                     realName.setUpdatedAt(row.getLocalDateTime(6));
 
                     AdamRealInfoVo vo = AdamRealInfoVo.getNew();
+                    vo.setUid(uid);
+                    vo.setType(realName.getType());
                     vo.setName(realName.getName());
                     vo.setIdCard(realName.getIdCard());
                     vo.setState(1);