修改nft实名认证

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/service/impl/ZxlnftSdkServiceImpl.java

@@ -116,9 +116,9 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
         }
         log.info("nft003RegisterPersonPlatform--->>> response : {} ",response);
 
-        if (StringUtils.isEmpty(response)) {
-            return null;
-        }
+//        if (StringUtils.isEmpty(response)) {
+//            return null;
+//        }
 
         /**
          * 构造返回结果
@@ -488,10 +488,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
         }
         log.info("nft014IdentityBindSubmitByTrusted--->>> response : {} ",response);
 
-        if (StringUtils.isEmpty(response)) {
-            return null;
-        }
-
         /**
          * 构造返回结果
          */

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/util/ZxlnftSdkUtil.java

@@ -2,6 +2,7 @@ package com.liquidnet.common.third.zxlnft.util;
 
 import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz;
 import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig;
+import com.liquidnet.common.third.zxlnft.constant.ZxlErrorEnum;
 import com.liquidnet.common.third.zxlnft.dto.*;
 import com.liquidnet.common.third.zxlnft.dto.nft.*;
 import com.liquidnet.common.third.zxlnft.exception.ZxlNftException;
@@ -90,6 +91,8 @@ public class ZxlnftSdkUtil {
             BeanUtil.copy(resp,respDto);
         }catch(ZxlNftException e){
             return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage());
+        }catch(Exception e){
+            return ZxlnftResponseDto.failure(ZxlErrorEnum.SERVER_INNER_ERROR.getCode(),ZxlErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return ZxlnftResponseDto.success(respDto);
     }
@@ -316,6 +319,8 @@ public class ZxlnftSdkUtil {
             BeanUtil.copy(resp,respDto);
         }catch(ZxlNftException e){
             return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage());
+        }catch(Exception e){
+            return ZxlnftResponseDto.failure(ZxlErrorEnum.SERVER_INNER_ERROR.getCode(),ZxlErrorEnum.SERVER_INNER_ERROR.getMsg());
         }
         return ZxlnftResponseDto.success(respDto);
     }

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

@@ -172,7 +172,11 @@ public class ZxinUserCommonBiz {
                 userIdentification = nft003Resp.getData().getUserIdentification();
                 isRealNameAuthSuccess = true;
             }else{
-                throw new GalaxyNftUserException(nft003Resp.getCode(),nft003Resp.getMessage());
+                if(nft003Resp.getCode().equals(ZxlErrorEnum.SERVER_INNER_ERROR.getCode())){
+                    throw new ZxlNftException(nft003Resp.getCode(),nft003Resp.getMessage());
+                }else{
+                    throw new GalaxyNftUserException(nft003Resp.getCode(),nft003Resp.getMessage());
+                }
             }
 
             //如果实名认证成功，并且该身份证已经开通过数字账户
@@ -291,8 +295,8 @@ public class ZxinUserCommonBiz {
         //是否开通数字账户
         boolean isOpenAccount = false;
         //开通失败错误信息
-        String resultCode = null;
-        String resultMessage = null;
+        String resultCode = NftAccStatusEnum.StatusAcc.ING.getCode();
+        String resultMessage = NftAccStatusEnum.StatusAcc.ING.getMsg();
 
         //实名成功+绑定区块链地址成功
         if(isRealNameAuthSuccess && isBindBlockAddressSuccess){
@@ -305,8 +309,13 @@ public class ZxinUserCommonBiz {
         if(!isOpenAccount){
             //实名失败
             if(!isRealNameAuthSuccess){
-                resultCode = NftAccStatusEnum.StatusAcc.FAILURE1.getCode();
-                resultMessage = NftAccStatusEnum.StatusAcc.FAILURE1.getMsg();
+                if(StringUtil.isNotEmpty(bizFailDesc)){
+                    resultCode = NftAccStatusEnum.StatusAcc.FAILURE1.getCode();
+                    resultMessage = NftAccStatusEnum.StatusAcc.FAILURE1.getMsg();
+                }else if(StringUtil.isNotEmpty(sysFailDesc)){
+                    resultCode = NftAccStatusEnum.StatusAcc.FAILURE2.getCode();
+                    resultMessage = NftAccStatusEnum.StatusAcc.FAILURE2.getMsg();
+                }
             }else{
                 //地址绑定失败
                 if(!isBindBlockAddressSuccess){