记得上下班打卡 | git大法好,push需谨慎

Commit 8528af95 authored by anjiabin's avatar anjiabin

Merge remote-tracking branch 'origin/dev_xuper_check_errro_20220725' into bak220720_merge

parents f954804b ce38602c
...@@ -68,7 +68,7 @@ public class XuperSdkUtil { ...@@ -68,7 +68,7 @@ public class XuperSdkUtil {
log.debug("xuperUploadFile resp : "+ JsonUtils.toJson(respDto)); log.debug("xuperUploadFile resp : "+ JsonUtils.toJson(respDto));
}catch(Exception e){ }catch(Exception e){
log.error("error msg "+e.getMessage(),e); log.error("error msg "+e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -91,7 +91,7 @@ public class XuperSdkUtil { ...@@ -91,7 +91,7 @@ public class XuperSdkUtil {
log.debug("xuper000CreateAccount resp : "+ JsonUtils.toJson(respDto)); log.debug("xuper000CreateAccount resp : "+ JsonUtils.toJson(respDto));
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -118,7 +118,7 @@ public class XuperSdkUtil { ...@@ -118,7 +118,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error("error msg "+e.getMessage(),e); log.error("error msg "+e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -164,7 +164,7 @@ public class XuperSdkUtil { ...@@ -164,7 +164,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -212,7 +212,7 @@ public class XuperSdkUtil { ...@@ -212,7 +212,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -241,7 +241,7 @@ public class XuperSdkUtil { ...@@ -241,7 +241,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -265,7 +265,7 @@ public class XuperSdkUtil { ...@@ -265,7 +265,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -296,7 +296,7 @@ public class XuperSdkUtil { ...@@ -296,7 +296,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -331,7 +331,7 @@ public class XuperSdkUtil { ...@@ -331,7 +331,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -366,7 +366,7 @@ public class XuperSdkUtil { ...@@ -366,7 +366,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -396,7 +396,7 @@ public class XuperSdkUtil { ...@@ -396,7 +396,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -422,7 +422,7 @@ public class XuperSdkUtil { ...@@ -422,7 +422,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -450,7 +450,7 @@ public class XuperSdkUtil { ...@@ -450,7 +450,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -478,7 +478,7 @@ public class XuperSdkUtil { ...@@ -478,7 +478,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -506,7 +506,7 @@ public class XuperSdkUtil { ...@@ -506,7 +506,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -532,7 +532,7 @@ public class XuperSdkUtil { ...@@ -532,7 +532,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
...@@ -556,7 +556,7 @@ public class XuperSdkUtil { ...@@ -556,7 +556,7 @@ public class XuperSdkUtil {
} }
}catch(Exception e){ }catch(Exception e){
log.error(e.getMessage(),e); log.error(e.getMessage(),e);
throw new XupterException(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg()); XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
} }
return XuperResponseDto.success(respDto); return XuperResponseDto.success(respDto);
} }
......
...@@ -2,6 +2,7 @@ package com.liquidnet.common.third.zxlnft.biz; ...@@ -2,6 +2,7 @@ package com.liquidnet.common.third.zxlnft.biz;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig; import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig;
import com.liquidnet.common.third.zxlnft.constant.ZxlErrorEnum;
import com.liquidnet.common.third.zxlnft.dto.wallet.*; import com.liquidnet.common.third.zxlnft.dto.wallet.*;
import com.liquidnet.common.third.zxlnft.exception.ZxlNftException; import com.liquidnet.common.third.zxlnft.exception.ZxlNftException;
import com.liquidnet.common.third.zxlnft.service.WalletSdkService; import com.liquidnet.common.third.zxlnft.service.WalletSdkService;
...@@ -83,7 +84,21 @@ public class ZxlnftBiz { ...@@ -83,7 +84,21 @@ public class ZxlnftBiz {
} }
public <T> T buildNftRespObj(String response,Class<T> tClass){ public <T> T buildNftRespObj(String response,Class<T> tClass){
return this.buildNftRespObj(response,tClass,true); T resp = null;
try {
/**
* 构造返回结果
*/
resp = this.buildNftRespObj(response,tClass,true);
log.info(tClass.getName()+"--->>> return result : {} ",resp.toString());
} catch (ZxlNftException e){
log.error("buildNftRespObj biz error response: {}", JsonUtils.toJson(response),e);
throw new ZxlNftException(e.getCode(),e.getMsg());
}catch (Exception e) {
log.error("buildNftRespObj sys error response: {}", JsonUtils.toJson(response),e);
throw new ZxlNftException(ZxlErrorEnum.SYSTEM_ERROR.getCode(),e.getMessage());
}
return resp;
} }
public <T> T buildNftRespObj(String response,Class<T> tClass,boolean isJson){ public <T> T buildNftRespObj(String response,Class<T> tClass,boolean isJson){
......
...@@ -2,11 +2,14 @@ package com.liquidnet.common.third.zxlnft.service.impl; ...@@ -2,11 +2,14 @@ package com.liquidnet.common.third.zxlnft.service.impl;
import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz; import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz;
import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig; import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig;
import com.liquidnet.common.third.zxlnft.constant.ZxlErrorEnum;
import com.liquidnet.common.third.zxlnft.constant.ZxlnftConstant; import com.liquidnet.common.third.zxlnft.constant.ZxlnftConstant;
import com.liquidnet.common.third.zxlnft.dto.nft.*; import com.liquidnet.common.third.zxlnft.dto.nft.*;
import com.liquidnet.common.third.zxlnft.exception.ZxlNftException;
import com.liquidnet.common.third.zxlnft.service.ZxlnftSdkService; import com.liquidnet.common.third.zxlnft.service.ZxlnftSdkService;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.HttpUtil; import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -50,10 +53,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -50,10 +53,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft001RegisterVerifyCode--->>> response : {} ",response); log.info("nft001RegisterVerifyCode--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -83,10 +82,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -83,10 +82,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft002RegisterPerson--->>> response : {} ",response); log.info("nft002RegisterPerson--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -110,16 +105,12 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -110,16 +105,12 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
try { try {
response = HttpUtil.postJson(requestUrl,reqJsonStr,commonHeader); response = HttpUtil.postJson(requestUrl,reqJsonStr,commonHeader);
} catch(HttpClientErrorException e) { } catch(HttpClientErrorException e) {
log.error("nft003RegisterPersonPlatform error", e); log.error("nft003RegisterPersonPlatform error:",e);
}catch (Exception e) { }catch (Exception e) {
log.error("nft003RegisterPersonPlatform error",e); log.error("nft003RegisterPersonPlatform error:",e);
} }
log.info("nft003RegisterPersonPlatform--->>> response : {} ",response); log.info("nft003RegisterPersonPlatform--->>> response : {} ",response);
// if (StringUtils.isEmpty(response)) {
// return null;
// }
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -149,10 +140,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -149,10 +140,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft004BusinessLicenseUpload--->>> response : {} ",response); log.info("nft004BusinessLicenseUpload--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -182,10 +169,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -182,10 +169,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft005BusinessLicenseUploadPlatform--->>> response : {} ",response); log.info("nft005BusinessLicenseUploadPlatform--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -215,11 +198,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -215,11 +198,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft006OfficialLetterUpload--->>> response : {} ",response); log.info("nft006OfficialLetterUpload--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -249,10 +227,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -249,10 +227,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft007OfficialLetterUploadPlatform--->>> response : {} ",response); log.info("nft007OfficialLetterUploadPlatform--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -283,10 +257,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -283,10 +257,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft008QueryImageModeration--->>> response : {} ",response); log.info("nft008QueryImageModeration--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -317,11 +287,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -317,11 +287,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft009RegisterCompany--->>> response : {} ",response); log.info("nft009RegisterCompany--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -351,11 +316,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -351,11 +316,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft010RegisterCompanyPlatform--->>> response : {} ",response); log.info("nft010RegisterCompanyPlatform--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -385,11 +345,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -385,11 +345,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft011UserQueryVerifyCode--->>> response : {} ",response); log.info("nft011UserQueryVerifyCode--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -421,10 +376,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -421,10 +376,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft012UserQuery--->>> response : {} ",response); log.info("nft012UserQuery--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -454,11 +405,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -454,11 +405,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft013IdentityBindSubmit--->>> response : {} ",response); log.info("nft013IdentityBindSubmit--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -518,10 +464,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -518,10 +464,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft015IdentityBindPlatformSelf--->>> response : {} ",response); log.info("nft015IdentityBindPlatformSelf--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -554,10 +496,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -554,10 +496,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft016IdentityBindQuery--->>> response : {} ",response); log.info("nft016IdentityBindQuery--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -587,11 +525,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -587,11 +525,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft017IdentityVerifyIdentity--->>> response : {} ",response); log.info("nft017IdentityVerifyIdentity--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -621,11 +554,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -621,11 +554,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft018FaceUrl--->>> response : {} ",response); log.info("nft018FaceUrl--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -655,10 +583,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -655,10 +583,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft019FaceUrlByAddress--->>> response : {} ",response); log.info("nft019FaceUrlByAddress--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -690,10 +614,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -690,10 +614,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft020FaceQuery--->>> response : {} ",response); log.info("nft020FaceQuery--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -725,9 +645,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -725,9 +645,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft021UploadUrl--->>> response : {} ",response); log.info("nft021UploadUrl--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -778,10 +695,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -778,10 +695,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft022UploadSecret--->>> response : {} ",response); log.info("nft022UploadSecret--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -810,9 +723,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -810,9 +723,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft023PointApply--->>> response : {} ",response); log.info("nft023PointApply--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -843,9 +753,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -843,9 +753,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft024PointApplyResult--->>> response : {} ",response); log.info("nft024PointApplyResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -875,9 +782,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -875,9 +782,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft025PointTransfer--->>> response : {} ",response); log.info("nft025PointTransfer--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -909,9 +813,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -909,9 +813,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft026PointTransferResult--->>> response : {} ",response); log.info("nft026PointTransferResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -941,9 +842,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -941,9 +842,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft027PointDestroy--->>> response : {} ",response); log.info("nft027PointDestroy--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -976,9 +874,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -976,9 +874,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft028PointDestoryResult--->>> response : {} ",response); log.info("nft028PointDestoryResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1010,9 +905,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1010,9 +905,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft029PointQuery--->>> response : {} ",response); log.info("nft029PointQuery--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1042,9 +934,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1042,9 +934,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft030SeriesClaim--->>> response : {} ",response); log.info("nft030SeriesClaim--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1077,9 +966,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1077,9 +966,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft031SeriesClaimResult--->>> response : {} ",response); log.info("nft031SeriesClaimResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1111,10 +997,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1111,10 +997,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft032Series--->>> response : {} ",response); log.info("nft032Series--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1146,9 +1028,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1146,9 +1028,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft033SeriesList--->>> response : {} ",response); log.info("nft033SeriesList--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1178,10 +1057,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1178,10 +1057,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft034Publish--->>> response : {} ",response); log.info("nft034Publish--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1232,14 +1107,10 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1232,14 +1107,10 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft035PublishResult--->>> response : {} ",response); log.info("nft035PublishResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
Nft035PublishResultResp resp = zxlnftBiz.buildNftRespObj(response,Nft035PublishResultResp.class); Nft035PublishResultResp resp = zxlnftBiz.buildNftRespObj(response, Nft035PublishResultResp.class);
log.info("nft035PublishResult--->>> return result : {} ",resp.toString()); log.info("nft035PublishResult--->>> return result : {} ",resp.toString());
return resp; return resp;
} }
...@@ -1266,10 +1137,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1266,10 +1137,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft036Info--->>> response : {} ",response); log.info("nft036Info--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1301,10 +1168,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1301,10 +1168,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft037AddressList--->>> response : {} ",response); log.info("nft037AddressList--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1336,10 +1199,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1336,10 +1199,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft038AddressWithoutSeriesList--->>> response : {} ",response); log.info("nft038AddressWithoutSeriesList--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1371,10 +1230,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1371,10 +1230,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft039TradeList--->>> response : {} ",response); log.info("nft039TradeList--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1406,10 +1261,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1406,10 +1261,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft040TradeInList--->>> response : {} ",response); log.info("nft040TradeInList--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1441,10 +1292,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1441,10 +1292,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft041TradeOutList--->>> response : {} ",response); log.info("nft041TradeOutList--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1476,10 +1323,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1476,10 +1323,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft042TradeAllList--->>> response : {} ",response); log.info("nft042TradeAllList--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1509,9 +1352,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1509,9 +1352,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft043Buy--->>> response : {} ",response); log.info("nft043Buy--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1543,9 +1383,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1543,9 +1383,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft044BuyResult--->>> response : {} ",response); log.info("nft044BuyResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1577,9 +1414,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1577,9 +1414,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft045BuyPayResult--->>> response : {} ",response); log.info("nft045BuyPayResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1609,10 +1443,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1609,10 +1443,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft046Transfer--->>> response : {} ",response); log.info("nft046Transfer--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1642,10 +1472,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1642,10 +1472,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft047SelfTransfer--->>> response : {} ",response); log.info("nft047SelfTransfer--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1675,10 +1501,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1675,10 +1501,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft048BatchTransfer--->>> response : {} ",response); log.info("nft048BatchTransfer--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1710,10 +1532,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1710,10 +1532,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft049TransferResult--->>> response : {} ",response); log.info("nft049TransferResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1743,10 +1561,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1743,10 +1561,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft050StatusUpdate--->>> response : {} ",response); log.info("nft050StatusUpdate--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1778,9 +1592,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1778,9 +1592,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft051StatusUpdateResult--->>> response : {} ",response); log.info("nft051StatusUpdateResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1810,10 +1621,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1810,10 +1621,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft052PriceUpdate--->>> response : {} ",response); log.info("nft052PriceUpdate--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1845,9 +1652,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1845,9 +1652,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft053PriceUpdateResult--->>> response : {} ",response); log.info("nft053PriceUpdateResult--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
...@@ -1879,9 +1683,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService ...@@ -1879,9 +1683,6 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
} }
log.info("nft054QueryUserAddressBelongToUser--->>> response : {} ",response); log.info("nft054QueryUserAddressBelongToUser--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
}
/** /**
* 构造返回结果 * 构造返回结果
*/ */
......
...@@ -8,6 +8,7 @@ import com.liquidnet.common.third.zxlnft.dto.nft.*; ...@@ -8,6 +8,7 @@ import com.liquidnet.common.third.zxlnft.dto.nft.*;
import com.liquidnet.common.third.zxlnft.exception.ZxlNftException; import com.liquidnet.common.third.zxlnft.exception.ZxlNftException;
import com.liquidnet.common.third.zxlnft.service.ZxlnftSdkService; import com.liquidnet.common.third.zxlnft.service.ZxlnftSdkService;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil; import com.liquidnet.commons.lang.util.StringUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -48,6 +49,8 @@ public class ZxlnftSdkUtil { ...@@ -48,6 +49,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -65,6 +68,8 @@ public class ZxlnftSdkUtil { ...@@ -65,6 +68,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -110,6 +115,8 @@ public class ZxlnftSdkUtil { ...@@ -110,6 +115,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -136,6 +143,8 @@ public class ZxlnftSdkUtil { ...@@ -136,6 +143,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -153,6 +162,8 @@ public class ZxlnftSdkUtil { ...@@ -153,6 +162,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -179,6 +190,8 @@ public class ZxlnftSdkUtil { ...@@ -179,6 +190,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -196,6 +209,8 @@ public class ZxlnftSdkUtil { ...@@ -196,6 +209,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -213,6 +228,8 @@ public class ZxlnftSdkUtil { ...@@ -213,6 +228,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -243,6 +260,8 @@ public class ZxlnftSdkUtil { ...@@ -243,6 +260,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -260,6 +279,8 @@ public class ZxlnftSdkUtil { ...@@ -260,6 +279,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -277,6 +298,8 @@ public class ZxlnftSdkUtil { ...@@ -277,6 +298,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -294,6 +317,8 @@ public class ZxlnftSdkUtil { ...@@ -294,6 +317,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -338,6 +363,8 @@ public class ZxlnftSdkUtil { ...@@ -338,6 +363,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -355,6 +382,8 @@ public class ZxlnftSdkUtil { ...@@ -355,6 +382,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -372,6 +401,8 @@ public class ZxlnftSdkUtil { ...@@ -372,6 +401,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -389,6 +420,8 @@ public class ZxlnftSdkUtil { ...@@ -389,6 +420,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -406,6 +439,8 @@ public class ZxlnftSdkUtil { ...@@ -406,6 +439,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -423,6 +458,8 @@ public class ZxlnftSdkUtil { ...@@ -423,6 +458,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -440,6 +477,8 @@ public class ZxlnftSdkUtil { ...@@ -440,6 +477,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -467,6 +506,8 @@ public class ZxlnftSdkUtil { ...@@ -467,6 +506,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -496,6 +537,8 @@ public class ZxlnftSdkUtil { ...@@ -496,6 +537,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -516,6 +559,8 @@ public class ZxlnftSdkUtil { ...@@ -516,6 +559,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -533,6 +578,8 @@ public class ZxlnftSdkUtil { ...@@ -533,6 +578,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -550,6 +597,8 @@ public class ZxlnftSdkUtil { ...@@ -550,6 +597,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -567,6 +616,8 @@ public class ZxlnftSdkUtil { ...@@ -567,6 +616,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -584,6 +635,8 @@ public class ZxlnftSdkUtil { ...@@ -584,6 +635,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -604,6 +657,8 @@ public class ZxlnftSdkUtil { ...@@ -604,6 +657,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -657,6 +712,8 @@ public class ZxlnftSdkUtil { ...@@ -657,6 +712,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -676,6 +733,8 @@ public class ZxlnftSdkUtil { ...@@ -676,6 +733,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -693,6 +752,8 @@ public class ZxlnftSdkUtil { ...@@ -693,6 +752,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -710,6 +771,8 @@ public class ZxlnftSdkUtil { ...@@ -710,6 +771,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -756,6 +819,8 @@ public class ZxlnftSdkUtil { ...@@ -756,6 +819,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -775,10 +840,11 @@ public class ZxlnftSdkUtil { ...@@ -775,10 +840,11 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
public ZxlnftResponseDto<Nft036InfoRespDto> nft036Info(Nft036InfoReqDto reqDto){ public ZxlnftResponseDto<Nft036InfoRespDto> nft036Info(Nft036InfoReqDto reqDto){
/** /**
* 构造请求 * 构造请求
...@@ -809,6 +875,8 @@ public class ZxlnftSdkUtil { ...@@ -809,6 +875,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -826,6 +894,8 @@ public class ZxlnftSdkUtil { ...@@ -826,6 +894,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -843,6 +913,8 @@ public class ZxlnftSdkUtil { ...@@ -843,6 +913,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -860,6 +932,8 @@ public class ZxlnftSdkUtil { ...@@ -860,6 +932,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -877,6 +951,8 @@ public class ZxlnftSdkUtil { ...@@ -877,6 +951,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -894,6 +970,8 @@ public class ZxlnftSdkUtil { ...@@ -894,6 +970,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -928,6 +1006,8 @@ public class ZxlnftSdkUtil { ...@@ -928,6 +1006,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -948,6 +1028,8 @@ public class ZxlnftSdkUtil { ...@@ -948,6 +1028,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -968,6 +1050,8 @@ public class ZxlnftSdkUtil { ...@@ -968,6 +1050,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -985,6 +1069,8 @@ public class ZxlnftSdkUtil { ...@@ -985,6 +1069,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -1002,6 +1088,8 @@ public class ZxlnftSdkUtil { ...@@ -1002,6 +1088,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -1019,6 +1107,8 @@ public class ZxlnftSdkUtil { ...@@ -1019,6 +1107,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -1036,6 +1126,8 @@ public class ZxlnftSdkUtil { ...@@ -1036,6 +1126,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -1053,6 +1145,8 @@ public class ZxlnftSdkUtil { ...@@ -1053,6 +1145,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -1070,6 +1164,8 @@ public class ZxlnftSdkUtil { ...@@ -1070,6 +1164,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -1087,6 +1183,8 @@ public class ZxlnftSdkUtil { ...@@ -1087,6 +1183,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -1104,6 +1202,8 @@ public class ZxlnftSdkUtil { ...@@ -1104,6 +1202,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
...@@ -1132,6 +1232,8 @@ public class ZxlnftSdkUtil { ...@@ -1132,6 +1232,8 @@ public class ZxlnftSdkUtil {
BeanUtil.copy(resp,respDto); BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){ }catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage()); 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); return ZxlnftResponseDto.success(respDto);
} }
......
...@@ -65,9 +65,9 @@ spring: ...@@ -65,9 +65,9 @@ spring:
password: ${liquidnet.redis.goblin.password} password: ${liquidnet.redis.goblin.password}
lettuce: lettuce:
pool: pool:
max-active: 20 max-active: 80
max-wait: -1 max-wait: -1
max-idle: 8 max-idle: 40
min-idle: 0 min-idle: 0
data: data:
mongodb: mongodb:
......
...@@ -404,6 +404,8 @@ public class XuperTradeCommonBiz { ...@@ -404,6 +404,8 @@ public class XuperTradeCommonBiz {
if(StringUtil.isNotNull(xuper007GrantShardRespDto)&&xuper007GrantShardRespDto.getErrNo()==0){ if(StringUtil.isNotNull(xuper007GrantShardRespDto)&&xuper007GrantShardRespDto.getErrNo()==0){
nftBuyTaskId = String.valueOf(assetId); nftBuyTaskId = String.valueOf(assetId);
nftOrderBo.setNftBuyTaskId(nftBuyTaskId); nftOrderBo.setNftBuyTaskId(nftBuyTaskId);
//更新nftBuyTaskId
dataUtils.updateNftOrderBuyInfo(routerType,nftOrderBo.getNftOrderPayId(),nftOrderBo);
} }
} }
......
...@@ -2,8 +2,10 @@ package com.liquidnet.service.galaxy.router.zxin.biz; ...@@ -2,8 +2,10 @@ package com.liquidnet.service.galaxy.router.zxin.biz;
import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz; import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz;
import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig; import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig;
import com.liquidnet.common.third.zxlnft.constant.ZxlErrorEnum;
import com.liquidnet.common.third.zxlnft.constant.ZxlnftEnum; import com.liquidnet.common.third.zxlnft.constant.ZxlnftEnum;
import com.liquidnet.common.third.zxlnft.dto.*; import com.liquidnet.common.third.zxlnft.dto.*;
import com.liquidnet.common.third.zxlnft.exception.ZxlNftException;
import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil; import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil;
import com.liquidnet.commons.lang.util.*; import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
...@@ -233,6 +235,9 @@ public class ZxinTradeCommonBiz { ...@@ -233,6 +235,9 @@ public class ZxinTradeCommonBiz {
Thread.sleep(500l); Thread.sleep(500l);
count++; count++;
ZxlnftResponseDto<Nft035PublishResultRespDto> nft035RespDtoTemp = zxlnftSdkUtil.nft035PublishResult(nft035ReqDto); ZxlnftResponseDto<Nft035PublishResultRespDto> nft035RespDtoTemp = zxlnftSdkUtil.nft035PublishResult(nft035ReqDto);
if(!nft035RespDtoTemp.isSuccess()){
throw new ZxlNftException(ZxlErrorEnum.SYSTEM_ERROR.getCode(),ZxlErrorEnum.SYSTEM_ERROR.getMsg());
}
log.info("=======执行第{}次查询,taskId:{}", count, nft035ReqDto.getTaskId()); log.info("=======执行第{}次查询,taskId:{}", count, nft035ReqDto.getTaskId());
if (nft035RespDtoTemp.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())) { if (nft035RespDtoTemp.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())) {
nftIdBegin = nft035RespDtoTemp.getData().getNftIdBegin(); nftIdBegin = nft035RespDtoTemp.getData().getNftIdBegin();
...@@ -414,6 +419,8 @@ public class ZxinTradeCommonBiz { ...@@ -414,6 +419,8 @@ public class ZxinTradeCommonBiz {
if(nft043RespDto.isSuccess()){ if(nft043RespDto.isSuccess()){
nftBuyTaskId = nft043RespDto.getData().getTaskId(); nftBuyTaskId = nft043RespDto.getData().getTaskId();
nftOrderBo.setNftBuyTaskId(nftBuyTaskId); nftOrderBo.setNftBuyTaskId(nftBuyTaskId);
//更新nftBuyTaskId
dataUtils.updateNftOrderBuyInfo(routerType,nftOrderBo.getNftOrderPayId(),nftOrderBo);
} }
} }
...@@ -432,6 +439,9 @@ public class ZxinTradeCommonBiz { ...@@ -432,6 +439,9 @@ public class ZxinTradeCommonBiz {
count++; count++;
log.info("=======执行第{}次查询,taskId:{}",count,nft044ReqDto.getTaskId()); log.info("=======执行第{}次查询,taskId:{}",count,nft044ReqDto.getTaskId());
ZxlnftResponseDto<Nft044BuyResultRespDto> nft044RespDto = zxlnftSdkUtil.nft044BuyResult(nft044ReqDto); ZxlnftResponseDto<Nft044BuyResultRespDto> nft044RespDto = zxlnftSdkUtil.nft044BuyResult(nft044ReqDto);
if(!nft044RespDto.isSuccess()){
throw new ZxlNftException(ZxlErrorEnum.SYSTEM_ERROR.getCode(),ZxlErrorEnum.SYSTEM_ERROR.getMsg());
}
if(nft044RespDto.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){ if(nft044RespDto.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){
nftBuyPayTaskId = nft044RespDto.getData().getPayTaskId(); nftBuyPayTaskId = nft044RespDto.getData().getPayTaskId();
nftBuyChainTimestamp = nft044RespDto.getData().getChainTimestamp(); nftBuyChainTimestamp = nft044RespDto.getData().getChainTimestamp();
......
package com.liquidnet.service.galaxy.router.xuper.biz; package com.liquidnet.service.galaxy.router.xuper.biz;
import com.liquidnet.common.exception.constant.ErrorCode;
import com.liquidnet.common.third.xuper.config.XuperConfig; import com.liquidnet.common.third.xuper.config.XuperConfig;
import com.liquidnet.common.third.xuper.dto.Xuper010QuerySdsReqDto;
import com.liquidnet.common.third.xuper.dto.Xuper010QuerySdsRespDto;
import com.liquidnet.common.third.xuper.dto.XuperResponseDto;
import com.liquidnet.common.third.xuper.exception.XupterException;
import com.liquidnet.common.third.xuper.util.XuperSdkUtil; import com.liquidnet.common.third.xuper.util.XuperSdkUtil;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil; import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.galaxy.biz.GalaxyBeanTransferBiz; import com.liquidnet.service.galaxy.biz.GalaxyBeanTransferBiz;
import com.liquidnet.service.galaxy.biz.GalaxyEnumBiz;
import com.liquidnet.service.galaxy.constant.GalaxyEnum; import com.liquidnet.service.galaxy.constant.GalaxyEnum;
import com.liquidnet.service.galaxy.constant.GalaxyErrorEnum; import com.liquidnet.service.galaxy.constant.GalaxyErrorEnum;
import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBindBo;
import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBo; import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBo;
import com.liquidnet.service.galaxy.dto.param.*; import com.liquidnet.service.galaxy.dto.param.*;
import com.liquidnet.service.galaxy.utils.GalaxyDataUtils; import com.liquidnet.service.galaxy.utils.GalaxyDataUtils;
...@@ -16,6 +25,9 @@ import lombok.extern.slf4j.Slf4j; ...@@ -16,6 +25,9 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.Date;
/** /**
* @author AnJiabin <anjiabin@zhengzai.tv> * @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0 * @version V1.0
...@@ -31,21 +43,12 @@ public class XuperTradeBiz { ...@@ -31,21 +43,12 @@ public class XuperTradeBiz {
@Autowired @Autowired
private XuperSdkUtil xuperSdkUtil; private XuperSdkUtil xuperSdkUtil;
@Autowired
private XuperConfig xuperConfig;
@Autowired @Autowired
private GalaxyDataUtils dataUtils; private GalaxyDataUtils dataUtils;
@Autowired
private GalaxyBeanTransferBiz galaxyBeanTransferBiz;
@Autowired @Autowired
private XuperTradeCommonBiz xuperTradeCommonBiz; private XuperTradeCommonBiz xuperTradeCommonBiz;
@Autowired
private QueueUtil queueUtil;
@Autowired @Autowired
private XuperPublishBiz xuperPublishBiz; private XuperPublishBiz xuperPublishBiz;
...@@ -86,10 +89,6 @@ public class XuperTradeBiz { ...@@ -86,10 +89,6 @@ public class XuperTradeBiz {
nftPublishResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId()); nftPublishResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId());
nftPublishResultQueryReqDto.setRouterType(reqDto.getRouterType()); nftPublishResultQueryReqDto.setRouterType(reqDto.getRouterType());
ResponseDto<GalaxyNftPublishResultQueryRespDto> publishResultQueryRespDto = xuperPublishBiz.nftPublishResultQuery(nftPublishResultQueryReqDto); ResponseDto<GalaxyNftPublishResultQueryRespDto> publishResultQueryRespDto = xuperPublishBiz.nftPublishResultQuery(nftPublishResultQueryReqDto);
if(publishResultQueryRespDto.isSuccess()){
GalaxyNftPublishResultQueryRespDto nftPublishResultQueryRespDtoTemp = publishResultQueryRespDto.getData();
BeanUtil.copy(nftPublishResultQueryRespDtoTemp,nftOrderBo);
}
}else if(StringUtil.isNotEmpty(nftOrderBo.getNftBuyStatus()) }else if(StringUtil.isNotEmpty(nftOrderBo.getNftBuyStatus())
&& (GalaxyEnum.TaskStatusEnum.INIT.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus()) && (GalaxyEnum.TaskStatusEnum.INIT.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus())
||GalaxyEnum.TaskStatusEnum.PROCESSING.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus()))){ ||GalaxyEnum.TaskStatusEnum.PROCESSING.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus()))){
...@@ -101,11 +100,7 @@ public class XuperTradeBiz { ...@@ -101,11 +100,7 @@ public class XuperTradeBiz {
GalaxyNftBuyResultQueryReqDto nftBuyResultQueryReqDto = GalaxyNftBuyResultQueryReqDto.getNew(); GalaxyNftBuyResultQueryReqDto nftBuyResultQueryReqDto = GalaxyNftBuyResultQueryReqDto.getNew();
nftBuyResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId()); nftBuyResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId());
nftBuyResultQueryReqDto.setRouterType(reqDto.getRouterType()); nftBuyResultQueryReqDto.setRouterType(reqDto.getRouterType());
ResponseDto<GalaxyNftBuyResultQueryRespDto> buyResultQueryRespDto= xuperTradeCommonBiz.nftBuyResultQuery(nftBuyResultQueryReqDto,nftOrderBo); ResponseDto<GalaxyNftBuyResultQueryRespDto> buyResultQueryRespDto= this.nftBuyResultQuery(nftBuyResultQueryReqDto,nftOrderBo);
if(buyResultQueryRespDto.isSuccess()){
GalaxyNftBuyResultQueryRespDto nftBuyResultQueryRespDtoTemp = buyResultQueryRespDto.getData();
BeanUtil.copy(nftBuyResultQueryRespDtoTemp,nftOrderBo);
}
} }
GalaxyNftPublishAndBuyResultQueryRespDto resultQueryRespDto = GalaxyNftPublishAndBuyResultQueryRespDto.getNew(); GalaxyNftPublishAndBuyResultQueryRespDto resultQueryRespDto = GalaxyNftPublishAndBuyResultQueryRespDto.getNew();
...@@ -116,4 +111,63 @@ public class XuperTradeBiz { ...@@ -116,4 +111,63 @@ public class XuperTradeBiz {
} }
return ResponseDto.failure(GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getCode(),GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getMessage(),resultQueryRespDto); return ResponseDto.failure(GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getCode(),GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getMessage(),resultQueryRespDto);
} }
private ResponseDto<GalaxyNftBuyResultQueryRespDto> nftBuyResultQuery(GalaxyNftBuyResultQueryReqDto reqDto,GalaxyNftOrderBo nftOrderBo) {
//获取订单信息
// GalaxyNftOrderBo nftOrderBo = dataUtils.getNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId());
// if(StringUtil.isNull(nftOrderBo)){
// return ResponseDto.failure(GalaxyErrorEnum.PUBLISH_ORDER_NOT_EXIST.getCode(), GalaxyErrorEnum.PUBLISH_ORDER_NOT_EXIST.getMessage());
// }
if(StringUtil.isEmpty(nftOrderBo.getNftBuyTaskId())){
return ResponseDto.failure(GalaxyErrorEnum.NFT_BUY_TASK_NOT_EXIST.getCode(), GalaxyErrorEnum.NFT_BUY_TASK_NOT_EXIST.getMessage());
}
try {
//执行资产碎片授予查询
Xuper010QuerySdsReqDto xuper010QuerySdsReqDto = Xuper010QuerySdsReqDto.getNew();
// 定义返回结果对象
Xuper010QuerySdsRespDto xuper010QuerySdsRespDto = null;
long shardId = -1l;
GalaxyNftOrderBindBo nftOrderBindBo = dataUtils.getGalaxyNftOrderBindBo(reqDto.getRouterType(),nftOrderBo.getNftOrderPayId());
if(StringUtil.isNotNull(nftOrderBindBo)){
shardId = nftOrderBindBo.getNftIdIndex().longValue();
}
xuper010QuerySdsReqDto.setAssetId(Long.parseLong(nftOrderBo.getSeriesId()));
xuper010QuerySdsReqDto.setShardId(shardId);
XuperResponseDto<Xuper010QuerySdsRespDto> xuperResponseDto = xuperSdkUtil.xuper010QuerySds(xuper010QuerySdsReqDto);
log.info("xuper010QuerySds resp : "+ JsonUtils.toJson(xuperResponseDto));
if(xuperResponseDto.isSuccess()){
xuper010QuerySdsRespDto = xuperResponseDto.getParseData(Xuper010QuerySdsRespDto.class);
if(String.valueOf(xuper010QuerySdsRespDto.getErrNo()).equalsIgnoreCase(ErrorCode.SUCCESS.getCode())){
//更新订单缓存数据状态
String nowTimeStr = DateUtil.getNowTime();
//转换任务状态
Integer taskStatus = Integer.valueOf(GalaxyEnumBiz.getGrantStatusEnum(reqDto.getRouterType(),String.valueOf(xuper010QuerySdsRespDto.getMeta().getStatus())).getCode());
//设置时间
String nftBuyChainTimestampStr = DateUtil.format(new Date(),DateUtil.Formatter.yyyyMMddHHmmss);
nftOrderBo.setNftBuyChainTimestamp(nftBuyChainTimestampStr);
nftOrderBo.setNftBuyStatus(taskStatus.toString());
nftOrderBo.setNftBuyTradeHash(xuper010QuerySdsRespDto.getMeta().getTxId());
nftOrderBo.setNftBuyPayTaskId(nftOrderBo.getNftBuyTaskId());
nftOrderBo.setUpdatedAt(LocalDateTime.now());
//先更新nft购买数据
dataUtils.updateNftOrderBuyInfo(nftOrderBo.getRouterType(),nftOrderBo.getNftOrderPayId(),nftOrderBo);
GalaxyNftBuyResultQueryRespDto resultQueryRespDto = GalaxyNftBuyResultQueryRespDto.getNew();
resultQueryRespDto.setTaskStatus(taskStatus);
resultQueryRespDto.setChainTimestamp(nowTimeStr);
resultQueryRespDto.setPayTaskId(xuper010QuerySdsRespDto.getMeta().getTxId());
resultQueryRespDto.setTxHash(xuper010QuerySdsRespDto.getMeta().getTxId());
return ResponseDto.success(resultQueryRespDto);
}
}
}catch (XupterException e) {
log.error("biz error msg "+e.getMessage(),e);
}catch (Exception e) {
log.error("sys error msg "+e.getMessage(),e);
}
return ResponseDto.failure(GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getCode(),GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getMessage());
}
} }
...@@ -3,6 +3,7 @@ package com.liquidnet.service.galaxy.router.zxin.biz; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.galaxy.router.zxin.biz;
import com.liquidnet.common.exception.LiquidnetServiceException; import com.liquidnet.common.exception.LiquidnetServiceException;
import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz; import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz;
import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig; import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig;
import com.liquidnet.common.third.zxlnft.constant.ZxlnftEnum;
import com.liquidnet.common.third.zxlnft.dto.*; import com.liquidnet.common.third.zxlnft.dto.*;
import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil; import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil;
import com.liquidnet.commons.lang.util.*; import com.liquidnet.commons.lang.util.*;
...@@ -22,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -22,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -108,13 +110,55 @@ public class ZxinTradeBiz { ...@@ -108,13 +110,55 @@ public class ZxinTradeBiz {
ZxlnftResponseDto<Nft044BuyResultRespDto> nft044RespDto = zxlnftSdkUtil.nft044BuyResult(nft044ReqDto); ZxlnftResponseDto<Nft044BuyResultRespDto> nft044RespDto = zxlnftSdkUtil.nft044BuyResult(nft044ReqDto);
GalaxyNftBuyResultQueryRespDto resultQueryRespDto = GalaxyNftBuyResultQueryRespDto.getNew(); GalaxyNftBuyResultQueryRespDto resultQueryRespDto = GalaxyNftBuyResultQueryRespDto.getNew();
BeanUtil.copy(nft044RespDto.getData(),resultQueryRespDto); if(nft044RespDto.isSuccess()){
String nowTimeStr = DateUtil.format(new Date(nft044RespDto.getData().getChainTimestamp().longValue()*1000),DateUtil.Formatter.yyyyMMddHHmmss); if(nft044RespDto.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_SUCCESS.getCode())){
Long nftBuyChainTimestamp = nft044RespDto.getData().getChainTimestamp();
Integer nftBuyStatus = nft044RespDto.getData().getTaskStatus();
String nftBuyTradeHash = nft044RespDto.getData().getTxHash();;
String nftBuyPayTaskId = nft044RespDto.getData().getPayTaskId();
//更新订单缓存数据状态
if(StringUtil.isNotNull(nftBuyChainTimestamp)&&nftBuyChainTimestamp!=0){
//设置时间
String nftBuyChainTimestampStr = DateUtil.format(new Date(nftBuyChainTimestamp*1000),DateUtil.Formatter.yyyyMMddHHmmss);
nftOrderBo.setNftBuyChainTimestamp(nftBuyChainTimestampStr);
}
if(StringUtil.isNotNull(nftBuyStatus)){
//转换任务状态 //转换任务状态
Integer taskStatus = Integer.valueOf(GalaxyEnumBiz.getTaskStatusEnum(reqDto.getRouterType(),nft044RespDto.getData().getTaskStatus().toString()).getCode()); String nftBuyStatusStr = GalaxyEnumBiz.getTaskStatusEnum(nftOrderBo.getRouterType(),nftBuyStatus.toString()).getCode();
resultQueryRespDto.setTaskStatus(taskStatus);
resultQueryRespDto.setChainTimestamp(nowTimeStr); nftOrderBo.setNftBuyStatus(nftBuyStatusStr);
}
nftOrderBo.setNftBuyTradeHash(nftBuyTradeHash);
nftOrderBo.setNftBuyPayTaskId(nftBuyPayTaskId);
nftOrderBo.setUpdatedAt(LocalDateTime.now());
//先更新nft购买数据
dataUtils.updateNftOrderBuyInfo(nftOrderBo.getRouterType(),nftOrderBo.getNftOrderPayId(),nftOrderBo);
}else if(nft044RespDto.getData().getTaskStatus().toString().equals(ZxlnftEnum.TaskStatusEnum.TASK_FAIL.getCode())){
Long nftBuyChainTimestamp = nft044RespDto.getData().getChainTimestamp();
Integer nftBuyStatus = nft044RespDto.getData().getTaskStatus();
//更新订单缓存数据状态
if(StringUtil.isNotNull(nftBuyChainTimestamp)&&nftBuyChainTimestamp!=0){
//设置时间
String nftBuyChainTimestampStr = DateUtil.format(new Date(nftBuyChainTimestamp*1000),DateUtil.Formatter.yyyyMMddHHmmss);
nftOrderBo.setNftBuyChainTimestamp(nftBuyChainTimestampStr);
}
if(StringUtil.isNotNull(nftBuyStatus)){
//转换任务状态
String nftBuyStatusStr = GalaxyEnumBiz.getTaskStatusEnum(nftOrderBo.getRouterType(),nftBuyStatus.toString()).getCode();
nftOrderBo.setNftBuyStatus(nftBuyStatusStr);
}
nftOrderBo.setUpdatedAt(LocalDateTime.now());
//先更新nft购买数据
dataUtils.updateNftOrderBuyInfo(nftOrderBo.getRouterType(),nftOrderBo.getNftOrderPayId(),nftOrderBo);
}
resultQueryRespDto.setTaskStatus(Integer.parseInt(nftOrderBo.getNftBuyStatus()));
resultQueryRespDto.setChainTimestamp(nftOrderBo.getNftBuyChainTimestamp());
return ResponseDto.success(resultQueryRespDto); return ResponseDto.success(resultQueryRespDto);
}else{
return ResponseDto.failure(GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getCode(), GalaxyErrorEnum.NFT_PUBLISH_AND_BUY_QUERY_FAIL.getMessage());
}
} }
public ResponseDto<GalaxyNftBuyPayResultQueryRespDto> nftBuyPayResultQuery(GalaxyNftBuyPayResultQueryReqDto reqDto) { public ResponseDto<GalaxyNftBuyPayResultQueryRespDto> nftBuyPayResultQuery(GalaxyNftBuyPayResultQueryReqDto reqDto) {
...@@ -168,10 +212,6 @@ public class ZxinTradeBiz { ...@@ -168,10 +212,6 @@ public class ZxinTradeBiz {
nftPublishResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId()); nftPublishResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId());
nftPublishResultQueryReqDto.setRouterType(reqDto.getRouterType()); nftPublishResultQueryReqDto.setRouterType(reqDto.getRouterType());
ResponseDto<GalaxyNftPublishResultQueryRespDto> publishResultQueryRespDto = zxinPublishBiz.nftPublishResultQuery(nftPublishResultQueryReqDto); ResponseDto<GalaxyNftPublishResultQueryRespDto> publishResultQueryRespDto = zxinPublishBiz.nftPublishResultQuery(nftPublishResultQueryReqDto);
if(publishResultQueryRespDto.isSuccess()){
GalaxyNftPublishResultQueryRespDto nftPublishResultQueryRespDtoTemp = publishResultQueryRespDto.getData();
BeanUtil.copy(nftPublishResultQueryRespDtoTemp,nftOrderBo);
}
}else if(StringUtil.isNotEmpty(nftOrderBo.getNftBuyStatus()) }else if(StringUtil.isNotEmpty(nftOrderBo.getNftBuyStatus())
&& (GalaxyEnum.TaskStatusEnum.INIT.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus()) && (GalaxyEnum.TaskStatusEnum.INIT.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus())
||GalaxyEnum.TaskStatusEnum.PROCESSING.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus()))){ ||GalaxyEnum.TaskStatusEnum.PROCESSING.getCode().equalsIgnoreCase(nftOrderBo.getNftBuyStatus()))){
...@@ -184,10 +224,6 @@ public class ZxinTradeBiz { ...@@ -184,10 +224,6 @@ public class ZxinTradeBiz {
nftBuyResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId()); nftBuyResultQueryReqDto.setNftOrderPayId(reqDto.getNftOrderPayId());
nftBuyResultQueryReqDto.setRouterType(reqDto.getRouterType()); nftBuyResultQueryReqDto.setRouterType(reqDto.getRouterType());
ResponseDto<GalaxyNftBuyResultQueryRespDto> buyResultQueryRespDto= this.nftBuyResultQuery(nftBuyResultQueryReqDto); ResponseDto<GalaxyNftBuyResultQueryRespDto> buyResultQueryRespDto= this.nftBuyResultQuery(nftBuyResultQueryReqDto);
if(buyResultQueryRespDto.isSuccess()){
GalaxyNftBuyResultQueryRespDto nftBuyResultQueryRespDtoTemp = buyResultQueryRespDto.getData();
BeanUtil.copy(nftBuyResultQueryRespDtoTemp,nftOrderBo);
}
} }
//判断是否需要二次购买 //判断是否需要二次购买
......
...@@ -42,11 +42,13 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr ...@@ -42,11 +42,13 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr
return ResponseDto.success(); return ResponseDto.success();
} }
@Deprecated
@Override @Override
public ResponseDto<GalaxyNftBuyResultQueryRespDto> nftBuyResultQuery(GalaxyNftBuyResultQueryReqDto reqDto) { public ResponseDto<GalaxyNftBuyResultQueryRespDto> nftBuyResultQuery(GalaxyNftBuyResultQueryReqDto reqDto) {
return zxinTradeBiz.nftBuyResultQuery(reqDto); return zxinTradeBiz.nftBuyResultQuery(reqDto);
} }
@Deprecated
@Override @Override
public ResponseDto<GalaxyNftBuyPayResultQueryRespDto> nftBuyPayResultQuery(GalaxyNftBuyPayResultQueryReqDto reqDto) { public ResponseDto<GalaxyNftBuyPayResultQueryRespDto> nftBuyPayResultQuery(GalaxyNftBuyPayResultQueryReqDto reqDto) {
return zxinTradeBiz.nftBuyPayResultQuery(reqDto); return zxinTradeBiz.nftBuyPayResultQuery(reqDto);
...@@ -57,11 +59,13 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr ...@@ -57,11 +59,13 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr
return zxinTradeBiz.nftPublishAndBuyResultQuery(reqDto); return zxinTradeBiz.nftPublishAndBuyResultQuery(reqDto);
} }
@Deprecated
@Override @Override
public ResponseDto<GalaxyNftPublishAndBuyRouterBatchQueryRespDto> nftPublishAndBuyResultBatchQuery(GalaxyNftPublishAndBuyRouterBatchQueryReqDto reqDto) { public ResponseDto<GalaxyNftPublishAndBuyRouterBatchQueryRespDto> nftPublishAndBuyResultBatchQuery(GalaxyNftPublishAndBuyRouterBatchQueryReqDto reqDto) {
return zxinTradeBiz.nftPublishAndBuyResultBatchQuery(reqDto); return zxinTradeBiz.nftPublishAndBuyResultBatchQuery(reqDto);
} }
@Deprecated
@Override @Override
public ResponseDto<GalaxyNftBuyRespDto> nftBuy(GalaxyNftBuyReqDto reqDto) { public ResponseDto<GalaxyNftBuyRespDto> nftBuy(GalaxyNftBuyReqDto reqDto) {
return zxinTradeBiz.nftBuy(reqDto); return zxinTradeBiz.nftBuy(reqDto);
......
...@@ -25,7 +25,8 @@ public class GalaxyTradeServiceImpl implements IGalaxyTradeService { ...@@ -25,7 +25,8 @@ public class GalaxyTradeServiceImpl implements IGalaxyTradeService {
@Override @Override
public ResponseDto<GalaxyNftBuyRespDto> nftBuy(GalaxyNftBuyReqDto reqDto) { public ResponseDto<GalaxyNftBuyRespDto> nftBuy(GalaxyNftBuyReqDto reqDto) {
return galaxyRouterStrategyContext.getTradeStrategy(reqDto.getRouterType()).nftBuy(reqDto); // return galaxyRouterStrategyContext.getTradeStrategy(reqDto.getRouterType()).nftBuy(reqDto);
return null;
} }
@Override @Override
...@@ -35,12 +36,14 @@ public class GalaxyTradeServiceImpl implements IGalaxyTradeService { ...@@ -35,12 +36,14 @@ public class GalaxyTradeServiceImpl implements IGalaxyTradeService {
@Override @Override
public ResponseDto<GalaxyNftBuyResultQueryRespDto> nftBuyResultQuery(GalaxyNftBuyResultQueryReqDto reqDto) { public ResponseDto<GalaxyNftBuyResultQueryRespDto> nftBuyResultQuery(GalaxyNftBuyResultQueryReqDto reqDto) {
return galaxyRouterStrategyContext.getTradeStrategy(reqDto.getRouterType()).nftBuyResultQuery(reqDto); // return galaxyRouterStrategyContext.getTradeStrategy(reqDto.getRouterType()).nftBuyResultQuery(reqDto);
return null;
} }
@Override @Override
public ResponseDto<GalaxyNftBuyPayResultQueryRespDto> nftBuyPayResultQuery(GalaxyNftBuyPayResultQueryReqDto reqDto) { public ResponseDto<GalaxyNftBuyPayResultQueryRespDto> nftBuyPayResultQuery(GalaxyNftBuyPayResultQueryReqDto reqDto) {
return galaxyRouterStrategyContext.getTradeStrategy(reqDto.getRouterType()).nftBuyPayResultQuery(reqDto); // return galaxyRouterStrategyContext.getTradeStrategy(reqDto.getRouterType()).nftBuyPayResultQuery(reqDto);
return null;
} }
@Override @Override
...@@ -50,6 +53,7 @@ public class GalaxyTradeServiceImpl implements IGalaxyTradeService { ...@@ -50,6 +53,7 @@ public class GalaxyTradeServiceImpl implements IGalaxyTradeService {
@Override @Override
public ResponseDto<GalaxyNftPublishAndBuyRouterBatchQueryRespDto> nftPublishAndBuyResultBatchQuery(GalaxyNftPublishAndBuyRouterBatchQueryReqDto reqDto) { public ResponseDto<GalaxyNftPublishAndBuyRouterBatchQueryRespDto> nftPublishAndBuyResultBatchQuery(GalaxyNftPublishAndBuyRouterBatchQueryReqDto reqDto) {
return galaxyRouterStrategyContext.getTradeStrategy(reqDto.getRouterType()).nftPublishAndBuyResultBatchQuery(reqDto); // return galaxyRouterStrategyContext.getTradeStrategy(reqDto.getRouterType()).nftPublishAndBuyResultBatchQuery(reqDto);
return null;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment