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

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/constant/GalaxyConstant.java

@@ -11,6 +11,7 @@ package com.liquidnet.service.galaxy.constant;
  */
 public class GalaxyConstant {
     //可删除key
+    public static final String REDIS_KEY_GALAXY_USER_ID_CARD="galaxy:user_id_card:";
     public static final String REDIS_KEY_GALAXY_USER="galaxy:user:";
     public static final String REDIS_KEY_GALAXY_SERIES="galaxy:series:";
     public static final String REDIS_KEY_GALAXY_SERIES_NFT_UPLOAD="galaxy:series:nft:upload:";

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

@@ -13,7 +13,7 @@ adam_user_info.update_qr_code=UPDATE adam_user_info SET qr_code=? WHERE uid=?
 # ----------------------------------------------------
 adam_real_name.add=INSERT INTO adam_real_name (real_name_id,`uid`,`type`,`node`,`name`,id_card,`state`,created_at) VALUES (?,?,?,?,?,?,?,?) 
 adam_real_name.del=UPDATE adam_real_name SET `state`=2, updated_at=?, comment='\u4E09\u8981\u7D20\u8BA4\u8BC1\u8986\u76D6' WHERE `uid`=? and `state`=1 and node=2 
-adam_real_name.del_by_nft=UPDATE adam_real_name SET `state`=2, updated_at=?, comment='\u4E09\u8981\u7D20\u8BA4\u8BC1\u8986\u76D6NFT' WHERE `uid`=? and `state`=1 and node=2 
+adam_real_name.del_by_nft=UPDATE adam_real_name SET `state`=2, updated_at=?, comment='\u4E09\u8981\u7D20\u8BA4\u8BC1\u8986\u76D6NFT' WHERE `uid`=? and `state`=1 
 adam_real_name.close=UPDATE adam_real_name SET `state`=2, updated_at=?, comment='close' WHERE `uid`=? 
 
 # ----------------------------------------------------

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinUserCommonBiz.java

@@ -30,8 +30,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 
 import java.io.UnsupportedEncodingException;
 import java.time.LocalDateTime;
@@ -175,6 +173,14 @@ public class ZxinUserCommonBiz {
                 throw new GalaxyNftUserException(nft003Resp.getCode(),nft003Resp.getMessage());
             }
 
+            //如果实名认证成功，并且该身份证已经开通过数字账户
+            if(isRealNameAuthSuccess){
+                String blockAddress = dataUtils.getGalaxyUserInfoByIdCardNo(reqDto.getRouterType(),idCard);
+                if(StringUtil.isNotEmpty(blockAddress)){
+                    throw new GalaxyNftUserException(nft003Resp.getCode(),nft003Resp.getMessage());
+                }
+            }
+
             if(StringUtil.isNotEmpty(userPubKey)&&StringUtil.isNotEmpty(userPriKey)&&StringUtil.isNotEmpty(userIdentification)){
                 //1.2.2调用授信平台NFT地址绑定接口
                 Nft014IdentityBindSubmitByTrustedReqDto nft014ReqDto = Nft014IdentityBindSubmitByTrustedReqDto.getNew();
@@ -215,6 +221,9 @@ public class ZxinUserCommonBiz {
 
                     isBindBlockAddressSuccess = true;
                     userInfoBo.setBlockChainAddress(address);
+
+                    //设置
+                    dataUtils.setGalaxyUserInfoByIdCardNo(reqDto.getRouterType(),idCard,address);
                 }else{
                     throw new GalaxyNftUserException(nft016Resp.getCode(),nft016Resp.getMessage());
                 }
@@ -237,6 +246,7 @@ public class ZxinUserCommonBiz {
                 userInfoBo.setMobile(mobile);
                 userInfoBo.setIdCardType(idCardType);
                 userInfoBo.setIdCard(idCard);
+                userInfoBo.setUserIdentification(userIdentification);
                 dataUtils.updateGalaxyUserInfo(reqDto.getRouterType(),reqDto.getUserId(),userInfoBo);
             }
         }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/utils/AbstractDataUtils.java

@@ -29,6 +29,18 @@ public abstract class AbstractDataUtils {
 
 //    private long keyExpireTime = 3600*24*30;
 
+    public void setGalaxyUserInfoByIdCardNo(String routerType,String idCardNo, String address) {
+        this.getRedisUtil().set(GalaxyConstant.REDIS_KEY_GALAXY_USER_ID_CARD.concat(routerType).concat(":") + idCardNo,address);
+    }
+
+    public String getGalaxyUserInfoByIdCardNo(String routerType,String idCardNo) {
+        Object obj = this.getRedisUtil().get(GalaxyConstant.REDIS_KEY_GALAXY_USER_ID_CARD.concat(routerType).concat(":") + idCardNo);
+        if(obj!=null){
+            return (String) obj;
+        }
+        return null;
+    }
+
     public void setGalaxyUserInfo(String routerType,String userId, GalaxyUserInfoBo userInfoBo) {
         String userType = GalaxyEnum.RegisterTypeEnum.PERSON.getCode();
         this.getRedisUtil().set(GalaxyConstant.REDIS_KEY_GALAXY_USER.concat(routerType).concat(":") + userId,userInfoBo);
@@ -40,8 +52,8 @@ public abstract class AbstractDataUtils {
             this.getQueueUtil().sendMySqlRedis(
                     SqlMapping.get("galaxy_user_info.insert"),
                     new Object[]{userId,userInfoBo.getUserName(),userType,userInfoBo.getMobile(),userInfoBo.getIdCardType()
-                                 ,userInfoBo.getIdCard(),userInfoBo.getMnemonic(),userInfoBo.getIndex(),userInfoBo.getUserIdentification(),userInfoBo.getUserPubKey()
-                                 ,userInfoBo.getUserPriKey(),userInfoBo.getBlockChainAddress(),userInfoBo.getRouterType(),new Date(),null
+                            ,userInfoBo.getIdCard(),userInfoBo.getMnemonic(),userInfoBo.getIndex(),userInfoBo.getUserIdentification(),userInfoBo.getUserPubKey()
+                            ,userInfoBo.getUserPriKey(),userInfoBo.getBlockChainAddress(),userInfoBo.getRouterType(),new Date(),null
                     }
                     , MQConst.GalaxyQueue.SQL_USER_INFO.getKey()
             );