记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
128cf2bd
Commit
128cf2bd
authored
Jun 20, 2022
by
anjiabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加系列声明异常处理逻辑
parent
568d09bb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
97 additions
and
58 deletions
+97
-58
GalaxyErrorEnum.java
...om/liquidnet/service/galaxy/constant/GalaxyErrorEnum.java
+3
-2
ZxlnftBiz.java
...java/com/liquidnet/common/third/zxlnft/biz/ZxlnftBiz.java
+12
-5
ZxinArtworkBiz.java
...uidnet/service/galaxy/router/zxin/biz/ZxinArtworkBiz.java
+82
-51
No files found.
liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/constant/GalaxyErrorEnum.java
View file @
128cf2bd
...
@@ -20,7 +20,6 @@ public enum GalaxyErrorEnum {
...
@@ -20,7 +20,6 @@ public enum GalaxyErrorEnum {
SERIES_CLAIM_PROCESSING
(
"NFT0010008"
,
"系列声明正在处理中,不允许重复声明!"
),
SERIES_CLAIM_PROCESSING
(
"NFT0010008"
,
"系列声明正在处理中,不允许重复声明!"
),
SERIES_CLAIM_SUCCESSED
(
"NFT0010009"
,
"系列已声明成功,不允许重复声明!"
),
SERIES_CLAIM_SUCCESSED
(
"NFT0010009"
,
"系列已声明成功,不允许重复声明!"
),
SERIES_CLAIM_NOT_EXIST
(
"NFT0010010"
,
"系列声明初始化信息不存在,请检查是否已上传对应素材!"
),
SERIES_CLAIM_NOT_EXIST
(
"NFT0010010"
,
"系列声明初始化信息不存在,请检查是否已上传对应素材!"
),
SERIES_NFT_INFO_NOT_EXIST
(
"NFT0010015"
,
"系列NFT信息查询不存在!"
),
PUBLISH_ORDER_NOT_EXIST
(
"NFT0010011"
,
"NFT购买订单不存在!"
),
PUBLISH_ORDER_NOT_EXIST
(
"NFT0010011"
,
"NFT购买订单不存在!"
),
NFT_BUY_TASK_NOT_EXIST
(
"NFT0010012"
,
"NFT购买执行任务不存在"
),
NFT_BUY_TASK_NOT_EXIST
(
"NFT0010012"
,
"NFT购买执行任务不存在"
),
NFT_BUY_TASK_HAVE_EXIST
(
"NFT0010013"
,
"NFT购买执行任务已存在,不可以重复购买!"
),
NFT_BUY_TASK_HAVE_EXIST
(
"NFT0010013"
,
"NFT购买执行任务已存在,不可以重复购买!"
),
...
@@ -33,7 +32,9 @@ public enum GalaxyErrorEnum {
...
@@ -33,7 +32,9 @@ public enum GalaxyErrorEnum {
NFT_QUERY_FAIL_ORDER_NOT_EXIST
(
"NFT0010020"
,
"NFT订单不存在!"
),
NFT_QUERY_FAIL_ORDER_NOT_EXIST
(
"NFT0010020"
,
"NFT订单不存在!"
),
NFT_QUERY_FAIL_NFT_NOT_EXIST
(
"NFT0010021"
,
"NFT信息查询不存在!"
),
NFT_QUERY_FAIL_NFT_NOT_EXIST
(
"NFT0010021"
,
"NFT信息查询不存在!"
),
NFT_QUERY_FAIL_SERIES_NOT_EXIST
(
"NFT0010022"
,
"系列信息查询不存在!"
),
NFT_QUERY_FAIL_SERIES_NOT_EXIST
(
"NFT0010022"
,
"系列信息查询不存在!"
),
NFT_USER_HAS_OPEN_ACCOUNT
(
"NFT0010023"
,
"用户已经开通过数字账户!"
);
NFT_USER_HAS_OPEN_ACCOUNT
(
"NFT0010023"
,
"用户已经开通过数字账户!"
),
SERIES_NFT_INFO_NOT_EXIST
(
"NFT0010024"
,
"系列NFT信息查询不存在!"
),
SERIES_NFT_HASH_CREATE_FAIL
(
"NFT0010025"
,
"系列NFT的介质hash生成失败!"
);
private
String
code
;
private
String
code
;
...
...
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/biz/ZxlnftBiz.java
View file @
128cf2bd
...
@@ -135,11 +135,18 @@ public class ZxlnftBiz {
...
@@ -135,11 +135,18 @@ public class ZxlnftBiz {
* @return
* @return
*/
*/
public
String
getHashString
(
String
data
){
public
String
getHashString
(
String
data
){
SM3HashEncodeResp
sm3HashEncodeResp
=
null
;
try
{
SM3HashEncodeReq
req
=
SM3HashEncodeReq
.
getNew
();
SM3HashEncodeReq
req
=
SM3HashEncodeReq
.
getNew
();
byte
[]
fileByteArray
=
this
.
getNftFileByteArray
(
data
);
byte
[]
fileByteArray
=
this
.
getNftFileByteArray
(
data
);
req
.
setData
(
fileByteArray
);
req
.
setData
(
fileByteArray
);
SM3HashEncodeResp
sm3HashEncodeResp
=
walletSdkService
.
sM3HashEncode
(
req
);
sm3HashEncodeResp
=
walletSdkService
.
sM3HashEncode
(
req
);
return
sm3HashEncodeResp
.
getDigest
();
return
sm3HashEncodeResp
.
getDigest
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
log
.
error
(
e
.
getMessage
(),
e
);
}
return
null
;
}
}
/**
/**
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinArtworkBiz.java
View file @
128cf2bd
...
@@ -25,6 +25,7 @@ import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftInfoBo;
...
@@ -25,6 +25,7 @@ import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftInfoBo;
import
com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftUploadBo
;
import
com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftUploadBo
;
import
com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftUploadTempSecretBo
;
import
com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftUploadTempSecretBo
;
import
com.liquidnet.service.galaxy.dto.param.*
;
import
com.liquidnet.service.galaxy.dto.param.*
;
import
com.liquidnet.service.galaxy.exception.GalaxyNftUserException
;
import
com.liquidnet.service.galaxy.utils.GalaxyDataUtils
;
import
com.liquidnet.service.galaxy.utils.GalaxyDataUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -168,7 +169,12 @@ public class ZxinArtworkBiz {
...
@@ -168,7 +169,12 @@ public class ZxinArtworkBiz {
}
}
}
}
//业务失败信息
String
bizFailDesc
=
null
;
//系统失败信息
String
sysFailDesc
=
null
;
GalaxyArtSeriesClaimRespDto
seriesClaimRespDto
=
null
;
try
{
/**
/**
* 进行系列声明
* 进行系列声明
*/
*/
...
@@ -189,7 +195,7 @@ public class ZxinArtworkBiz {
...
@@ -189,7 +195,7 @@ public class ZxinArtworkBiz {
String
seriesId
=
null
;
String
seriesId
=
null
;
String
taskId
=
null
;
String
taskId
=
null
;
GalaxyArtSeriesClaimRespDto
seriesClaimRespDto
=
GalaxyArtSeriesClaimRespDto
.
getNew
();
seriesClaimRespDto
=
GalaxyArtSeriesClaimRespDto
.
getNew
();
if
(
nft30RespDto
.
isSuccess
()){
if
(
nft30RespDto
.
isSuccess
()){
//第零个系列 无限制系列
//第零个系列 无限制系列
taskId
=
nft30RespDto
.
getData
().
getTaskId
();
taskId
=
nft30RespDto
.
getData
().
getTaskId
();
...
@@ -210,6 +216,11 @@ public class ZxinArtworkBiz {
...
@@ -210,6 +216,11 @@ public class ZxinArtworkBiz {
//构造系列nft信息
//构造系列nft信息
GalaxySeriesNftInfoBo
seriesNftInfoBo
=
this
.
buildSeriesNftInfoBo
(
reqDto
,
seriesInfoBo
,
seriesNftUploadBo
);
GalaxySeriesNftInfoBo
seriesNftInfoBo
=
this
.
buildSeriesNftInfoBo
(
reqDto
,
seriesInfoBo
,
seriesNftUploadBo
);
dataUtils
.
setSeriesNftInfoBo
(
reqDto
.
getRouterType
(),
reqDto
.
getSkuId
(),
seriesInfoBo
,
seriesNftInfoBo
);
dataUtils
.
setSeriesNftInfoBo
(
reqDto
.
getRouterType
(),
reqDto
.
getSkuId
(),
seriesInfoBo
,
seriesNftInfoBo
);
if
(
StringUtil
.
isEmpty
(
seriesNftInfoBo
.
getNftHash
())){
log
.
error
(
"生成nftHash error skuId:{} nftUrl is :{} "
,
seriesNftInfoBo
.
getSkuId
(),
seriesNftInfoBo
.
getNftUrl
());
throw
new
ZxlNftException
(
GalaxyErrorEnum
.
SERIES_NFT_HASH_CREATE_FAIL
.
getCode
(),
GalaxyErrorEnum
.
SERIES_NFT_HASH_CREATE_FAIL
.
getMessage
());
}
}
}
}
else
{
}
else
{
return
ResponseDto
.
failure
(
GalaxyErrorEnum
.
SERIES_CLAIM_ERROR
.
getCode
(),
GalaxyErrorEnum
.
SERIES_CLAIM_ERROR
.
getMessage
());
return
ResponseDto
.
failure
(
GalaxyErrorEnum
.
SERIES_CLAIM_ERROR
.
getCode
(),
GalaxyErrorEnum
.
SERIES_CLAIM_ERROR
.
getMessage
());
...
@@ -221,6 +232,19 @@ public class ZxinArtworkBiz {
...
@@ -221,6 +232,19 @@ public class ZxinArtworkBiz {
seriesClaimRespDto
.
setSeriesId
(
seriesId
);
seriesClaimRespDto
.
setSeriesId
(
seriesId
);
seriesClaimRespDto
.
setSeriesName
(
seriesName
);
seriesClaimRespDto
.
setSeriesName
(
seriesName
);
}
catch
(
ZxlNftException
e
){
sysFailDesc
=
e
.
getMessage
();
log
.
error
(
e
.
getMessage
(),
e
);
}
catch
(
Exception
e
){
sysFailDesc
=
e
.
getMessage
();
log
.
error
(
e
.
getMessage
(),
e
);
}
if
(
StringUtil
.
isNotEmpty
(
sysFailDesc
)){
return
ResponseDto
.
failure
(
sysFailDesc
);
}
if
(
StringUtil
.
isNotEmpty
(
bizFailDesc
)){
return
ResponseDto
.
failure
(
bizFailDesc
);
}
return
ResponseDto
.
success
(
seriesClaimRespDto
);
return
ResponseDto
.
success
(
seriesClaimRespDto
);
}
}
...
@@ -329,6 +353,13 @@ public class ZxinArtworkBiz {
...
@@ -329,6 +353,13 @@ public class ZxinArtworkBiz {
}
}
String
seriesCode
=
seriesNftInfoBo
.
getSeriesCode
();
String
seriesCode
=
seriesNftInfoBo
.
getSeriesCode
();
//如果nftUrl介质hash为空,则重新生成
if
(
StringUtil
.
isEmpty
(
seriesNftInfoBo
.
getNftHash
())){
//更新系列对应的系列nft状态
seriesNftInfoBo
.
setNftHash
(
zxlnftBiz
.
getHashString
(
seriesNftInfoBo
.
getNftUrl
()));
dataUtils
.
updateSeriesNftStatus
(
reqDto
.
getRouterType
(),
reqDto
.
getSkuId
(),
seriesNftInfoBo
);
}
//获取任务ID
//获取任务ID
GalaxySeriesInfoBo
seriesInfoBo
=
dataUtils
.
getSeriesInfoBo
(
reqDto
.
getRouterType
(),
seriesCode
);
GalaxySeriesInfoBo
seriesInfoBo
=
dataUtils
.
getSeriesInfoBo
(
reqDto
.
getRouterType
(),
seriesCode
);
if
(
StringUtil
.
isNull
(
seriesInfoBo
)||
StringUtil
.
isEmpty
(
seriesInfoBo
.
getSeriesClaimTaskId
())){
if
(
StringUtil
.
isNull
(
seriesInfoBo
)||
StringUtil
.
isEmpty
(
seriesInfoBo
.
getSeriesClaimTaskId
())){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment