记得上下班打卡 | 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
ebe30d8b
Commit
ebe30d8b
authored
Apr 01, 2022
by
anjiabin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nft修改购买逻辑
parent
c7fb31ff
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
159 additions
and
191 deletions
+159
-191
GalaxyNftPublishAndBuyResultBatchQueryReqDto.java
...o/param/GalaxyNftPublishAndBuyResultBatchQueryReqDto.java
+18
-4
GalaxyNftPublishAndBuyResultBatchQueryRespDto.java
.../param/GalaxyNftPublishAndBuyResultBatchQueryRespDto.java
+1
-28
GalaxyNftPublishAndBuyRouterBatchQueryReqDto.java
...o/param/GalaxyNftPublishAndBuyRouterBatchQueryReqDto.java
+48
-0
GalaxyNftPublishAndBuyRouterBatchQueryRespDto.java
.../param/GalaxyNftPublishAndBuyRouterBatchQueryRespDto.java
+52
-0
IGalaxyTradeService.java
...liquidnet/service/galaxy/service/IGalaxyTradeService.java
+1
-1
application-dev.yml
liquidnet-bus-config/liquidnet-config/application-dev.yml
+0
-6
liquidnet-service-consumer-galaxy-dev.yml
...iquidnet-config/liquidnet-service-consumer-galaxy-dev.yml
+0
-21
liquidnet-service-consumer-galaxy-test.yml
...quidnet-config/liquidnet-service-consumer-galaxy-test.yml
+0
-21
liquidnet-service-consumer-galaxy.yml
...ig/liquidnet-config/liquidnet-service-consumer-galaxy.yml
+0
-87
liquidnet-service-galaxy.yml
...-bus-config/liquidnet-config/liquidnet-service-galaxy.yml
+5
-5
GalaxyTradeController.java
...dnet/service/galaxy/controller/GalaxyTradeController.java
+20
-1
GalaxyRouterStrategyEthTradeImpl.java
.../router/eth/service/GalaxyRouterStrategyEthTradeImpl.java
+1
-1
ZxinTradeBiz.java
...iquidnet/service/galaxy/router/zxin/biz/ZxinTradeBiz.java
+11
-10
GalaxyRouterStrategyZxlTradeImpl.java
...router/zxin/service/GalaxyRouterStrategyZxlTradeImpl.java
+1
-5
GalaxyTradeServiceImpl.java
...t/service/galaxy/service/impl/GalaxyTradeServiceImpl.java
+1
-1
No files found.
liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyNftPublishAndBuyResultBatchQueryReqDto.java
View file @
ebe30d8b
...
@@ -22,7 +22,7 @@ import java.util.List;
...
@@ -22,7 +22,7 @@ import java.util.List;
*/
*/
@ApiModel
(
value
=
"GalaxyNftPublishResultQueryReqDto"
,
description
=
"NFT发行结果查询"
)
@ApiModel
(
value
=
"GalaxyNftPublishResultQueryReqDto"
,
description
=
"NFT发行结果查询"
)
@Data
@Data
public
class
GalaxyNftPublishAndBuyResultBatchQueryReqDto
extends
GalaxyBaseReqDto
implements
Serializable
,
Cloneable
{
public
class
GalaxyNftPublishAndBuyResultBatchQueryReqDto
implements
Serializable
,
Cloneable
{
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"用户ID[30]"
)
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"用户ID[30]"
)
@NotBlank
(
message
=
"用户ID不能为空!"
)
@NotBlank
(
message
=
"用户ID不能为空!"
)
@Size
(
min
=
1
,
max
=
30
,
message
=
"用户ID限制2-30位且不能包含特殊字符"
)
@Size
(
min
=
1
,
max
=
30
,
message
=
"用户ID限制2-30位且不能包含特殊字符"
)
...
@@ -33,7 +33,8 @@ public class GalaxyNftPublishAndBuyResultBatchQueryReqDto extends GalaxyBaseReqD
...
@@ -33,7 +33,8 @@ public class GalaxyNftPublishAndBuyResultBatchQueryReqDto extends GalaxyBaseReqD
*/
*/
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"nft订单支付idList不能为空"
)
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"nft订单支付idList不能为空"
)
@NotNull
(
message
=
"nft订单支付idList不能为空"
)
@NotNull
(
message
=
"nft订单支付idList不能为空"
)
private
List
<
String
>
orderInfoList
;
private
List
<
RouterOrderInfo
>
routerOrderInfoList
;
@Override
@Override
public
String
toString
(){
public
String
toString
(){
...
@@ -49,8 +50,21 @@ public class GalaxyNftPublishAndBuyResultBatchQueryReqDto extends GalaxyBaseReqD
...
@@ -49,8 +50,21 @@ public class GalaxyNftPublishAndBuyResultBatchQueryReqDto extends GalaxyBaseReqD
return
new
GalaxyNftPublishAndBuyResultBatchQueryReqDto
();
return
new
GalaxyNftPublishAndBuyResultBatchQueryReqDto
();
}
}
}
}
public
static
class
OrderInfo
{
@Data
public
static
class
RouterOrderInfo
{
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"用户ID[30]"
)
@NotBlank
(
message
=
"用户ID不能为空!"
)
@Size
(
min
=
1
,
max
=
30
,
message
=
"用户ID限制2-30位且不能包含特殊字符"
)
private
String
userId
;
/**
* 路由类型(至信链zxinchain、以太坊eth)
*/
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"路由类型(至信链zxinchain、以太坊eth)"
)
@NotBlank
(
message
=
"路由类型不能为空!"
)
private
String
routerType
;
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"nft订单支付id"
)
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"nft订单支付id"
)
private
String
nftOrderPayId
;
private
List
<
String
>
nftOrderPayIdList
;
}
}
}
}
liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyNftPublishAndBuyResultBatchQueryRespDto.java
View file @
ebe30d8b
...
@@ -25,7 +25,7 @@ public class GalaxyNftPublishAndBuyResultBatchQueryRespDto implements Serializab
...
@@ -25,7 +25,7 @@ public class GalaxyNftPublishAndBuyResultBatchQueryRespDto implements Serializab
private
String
userId
;
private
String
userId
;
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"用户购买信息List"
)
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"用户购买信息List"
)
private
List
<
BuyInfo
>
b
uyInfoList
;
private
List
<
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
>
routerB
uyInfoList
;
@Override
@Override
...
@@ -42,31 +42,4 @@ public class GalaxyNftPublishAndBuyResultBatchQueryRespDto implements Serializab
...
@@ -42,31 +42,4 @@ public class GalaxyNftPublishAndBuyResultBatchQueryRespDto implements Serializab
return
new
GalaxyNftPublishAndBuyResultBatchQueryRespDto
();
return
new
GalaxyNftPublishAndBuyResultBatchQueryRespDto
();
}
}
}
}
@Data
public
static
class
BuyInfo
{
@ApiModelProperty
(
position
=
2
,
required
=
true
,
value
=
"nft订单唯一id"
)
private
String
nftOrderPayId
;
@ApiModelProperty
(
position
=
2
,
required
=
true
,
value
=
"nftId"
)
private
String
nftId
;
@ApiModelProperty
(
position
=
3
,
required
=
true
,
value
=
"nft发行时间"
)
private
String
nftPublishChainTimestamp
;
@ApiModelProperty
(
position
=
4
,
required
=
true
,
value
=
"nft发行状态"
)
private
String
nftPublishStatus
;
@ApiModelProperty
(
position
=
5
,
required
=
true
,
value
=
"nft发行交易hash"
)
private
String
nftPublishTxHash
;
@ApiModelProperty
(
position
=
6
,
required
=
true
,
value
=
"nft购买时间"
)
private
String
nftBuyChainTimestamp
;
@ApiModelProperty
(
position
=
7
,
required
=
true
,
value
=
"nft购买状态"
)
private
String
nftBuyStatus
;
@ApiModelProperty
(
position
=
8
,
required
=
true
,
value
=
"nft购买交易hash"
)
private
String
nftBuyTxHash
;
}
}
}
liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyNftPublishAndBuyRouterBatchQueryReqDto.java
0 → 100644
View file @
ebe30d8b
package
com
.
liquidnet
.
service
.
galaxy
.
dto
.
param
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: NFT购买(涉及NFT发行、NFT购买)
* @class: GalaxyNftPublishAndBuyReqDto
* @Package com.liquidnet.service.galaxy.dto.param
* @Copyright: LightNet @ Copyright (c) 2022
* @date 2022/3/17 13:51
*/
@ApiModel
(
value
=
"GalaxyNftPublishAndBuyReqDto"
,
description
=
"NFT发行购买"
)
@Data
public
class
GalaxyNftPublishAndBuyRouterBatchQueryReqDto
extends
GalaxyBaseReqDto
implements
Serializable
,
Cloneable
{
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"用户ID[30]"
)
@NotBlank
(
message
=
"用户ID不能为空!"
)
@Size
(
min
=
1
,
max
=
30
,
message
=
"用户ID限制2-30位且不能包含特殊字符"
)
private
String
userId
;
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"nft订单支付id"
)
private
List
<
String
>
nftOrderPayIdList
;
@Override
public
String
toString
(){
return
JsonUtils
.
toJson
(
this
);
}
private
static
final
GalaxyNftPublishAndBuyRouterBatchQueryReqDto
obj
=
new
GalaxyNftPublishAndBuyRouterBatchQueryReqDto
();
public
static
GalaxyNftPublishAndBuyRouterBatchQueryReqDto
getNew
()
{
try
{
return
(
GalaxyNftPublishAndBuyRouterBatchQueryReqDto
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
GalaxyNftPublishAndBuyRouterBatchQueryReqDto
();
}
}
}
liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/param/GalaxyNftPublishAndBuyRouterBatchQueryRespDto.java
0 → 100644
View file @
ebe30d8b
package
com
.
liquidnet
.
service
.
galaxy
.
dto
.
param
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: 发行+购买结果查询
* @class: GalaxyNftPublishResultQueryRespDto
* @Package com.liquidnet.service.galaxy.dto.param
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2022/3/28 11:22
*/
@ApiModel
(
value
=
"GalaxyNftPublishResultQueryRespDto"
,
description
=
"NFT发行结果查询"
)
@Data
public
class
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
implements
Serializable
,
Cloneable
{
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"用户ID[30]"
)
private
String
userId
;
/**
* 路由类型(至信链zxinchain、以太坊eth)
*/
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"路由类型(至信链zxinchain、以太坊eth)"
)
@NotBlank
(
message
=
"路由类型不能为空!"
)
private
String
routerType
;
@ApiModelProperty
(
position
=
1
,
required
=
true
,
value
=
"用户购买信息List"
)
private
List
<
GalaxyNftPublishAndBuyResultQueryRespDto
>
buyInfoList
;
@Override
public
String
toString
()
{
return
JsonUtils
.
toJson
(
this
);
}
private
static
final
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
obj
=
new
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
();
public
static
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
getNew
()
{
try
{
return
(
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
();
}
}
}
liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/service/IGalaxyTradeService.java
View file @
ebe30d8b
...
@@ -24,5 +24,5 @@ public interface IGalaxyTradeService {
...
@@ -24,5 +24,5 @@ public interface IGalaxyTradeService {
ResponseDto
<
GalaxyNftPublishAndBuyResultQueryRespDto
>
nftPublishAndBuyResultQuery
(
GalaxyNftPublishAndBuyResultQueryReqDto
reqDto
);
ResponseDto
<
GalaxyNftPublishAndBuyResultQueryRespDto
>
nftPublishAndBuyResultQuery
(
GalaxyNftPublishAndBuyResultQueryReqDto
reqDto
);
ResponseDto
<
GalaxyNftPublishAndBuyR
esultBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyResult
BatchQueryReqDto
reqDto
);
ResponseDto
<
GalaxyNftPublishAndBuyR
outerBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyRouter
BatchQueryReqDto
reqDto
);
}
}
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @
ebe30d8b
...
@@ -78,12 +78,6 @@ liquidnet:
...
@@ -78,12 +78,6 @@ liquidnet:
host
:
39.107.71.112
host
:
39.107.71.112
port
:
6379
port
:
6379
password
:
3Xa%8p
password
:
3Xa%8p
galaxy
:
dbs
:
0,16
database
:
15
host
:
39.107.71.112
port
:
6379
password
:
3Xa%8p
# goblin:
# goblin:
# dbs: 0,256
# dbs: 0,256
# database: 255
# database: 255
...
...
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-galaxy-dev.yml
deleted
100644 → 0
View file @
c7fb31ff
liquidnet
:
system
:
updating
:
switch
:
false
info
:
port
:
9992
context
:
# context: /service-consumer
name
:
liquidnet-service-consumer-galaxy
logfile
:
path
:
/data/logs
name
:
service-consumer-galaxy
config
:
classpath:logback-spring.xml
level
:
debug
mysql
:
database-name
:
dev_ln_scene
mongodb
:
sslEnabled
:
false
database
:
dev_ln_scene
#以下为spring各环境个性配置
\ No newline at end of file
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-galaxy-test.yml
deleted
100644 → 0
View file @
c7fb31ff
liquidnet
:
system
:
updating
:
switch
:
false
info
:
port
:
9998
context
:
# context: /service-consumer
name
:
liquidnet-service-consumer-galaxy
logfile
:
path
:
/data/logs
name
:
service-consumer-galaxy
config
:
classpath:logback-spring.xml
level
:
info
mysql
:
database-name
:
test_ln_scene
mongodb
:
sslEnabled
:
false
database
:
test_ln_scene
#以下为spring各环境个性配置
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-galaxy.yml
deleted
100644 → 0
View file @
c7fb31ff
server
:
port
:
${liquidnet.info.port}
tomcat
:
uri-encoding
:
UTF-8
servlet
:
context-path
:
${liquidnet.info.context}
# -----------------------------------------------------------
knife4j
:
production
:
${liquidnet.knife4j.disable}
basic
:
enable
:
true
username
:
${liquidnet.security.username}
password
:
${liquidnet.security.password}
# -----------------------------------------------------------
logging
:
# config: ${liquidnet.logfile.config}
file
:
name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
max-size
:
200MB
pattern
:
file
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{36}:%line]
-
%msg%n'
console
:
'
%d{yyyy-MM-dd
HH:mm:ss.SSS}
[
%-5level]
%thread
[%logger{36}:%line]
-
%msg%n'
rolling-file-name
:
${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level
:
root
:
error
#以下是为指定包设置日志级别
com.liquidnet
:
${liquidnet.logfile.level}
# -----------------------------------------------------------
eureka
:
# client:
# register-with-eureka: true
# fetch-registry: true
# serviceUrl:
# defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
instance
:
hostname
:
${spring.cloud.client.ip-address}
lease-expiration-duration-in-seconds
:
15
#服务过期时间配置,超过这个时间没有接收到心跳EurekaServer就会将这个实例剔除
lease-renewal-interval-in-seconds
:
5
#服务刷新时间配置,每隔这个时间会主动心跳一次
prefer-ip-address
:
true
instance-id
:
${spring.application.name}:${spring.cloud.client.ip-address}:${spring.application.instance_id:${server.port}}
# -----------------------------------------------------------
#actuator/info
info
:
app
:
name
:
${liquidnet.info.name}
company
:
name
:
zhengzai.tv
build
:
groupId
:
'
@project.groupId@'
artifactId
:
'
@project.artifactId@'
version
:
'
@project.version@'
# -----------------------------------------------------------
spring
:
application
:
name
:
${liquidnet.info.name}
profiles
:
include
:
common-service
#这里加载management相关公共配置
redis
:
database
:
${liquidnet.redis.galaxy.database}
port
:
${liquidnet.redis.galaxy.port}
host
:
${liquidnet.redis.galaxy.host}
password
:
${liquidnet.redis.galaxy.password}
lettuce
:
pool
:
max-active
:
8
max-wait
:
-1
max-idle
:
8
min-idle
:
0
datasource
:
name
:
${liquidnet.mysql.database-name}
url
:
jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&useSSL=false
username
:
${liquidnet.mysql.username}
password
:
${liquidnet.mysql.password}
# type: org.apache.tomcat.jdbc.pool.DataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
hikari
:
maximum-pool-size
:
45
minimum-idle
:
8
connection-test-query
:
SELECT 1
data
:
mongodb
:
uri
:
mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
sslEnabled
:
${liquidnet.mongodb.sslEnabled}
database
:
${liquidnet.mongodb.database}
# -----------------------------------------------------------
# -----------------------------------------------------------
liquidnet-bus-config/liquidnet-config/liquidnet-service-galaxy.yml
View file @
ebe30d8b
...
@@ -70,11 +70,11 @@ spring:
...
@@ -70,11 +70,11 @@ spring:
profiles
:
profiles
:
include
:
common-service
#这里加载management相关公共配置
include
:
common-service
#这里加载management相关公共配置
redis
:
redis
:
database
:
${liquidnet.redis.
galaxy
.database}
database
:
${liquidnet.redis.
kylin
.database}
dbs
:
${liquidnet.redis.
galaxy
.dbs}
dbs
:
${liquidnet.redis.
kylin
.dbs}
port
:
${liquidnet.redis.
galaxy
.port}
port
:
${liquidnet.redis.
kylin
.port}
host
:
${liquidnet.redis.
galaxy
.host}
host
:
${liquidnet.redis.
kylin
.host}
password
:
${liquidnet.redis.
galaxy
.password}
password
:
${liquidnet.redis.
kylin
.password}
lettuce
:
lettuce
:
pool
:
pool
:
max-active
:
8
max-active
:
8
...
...
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/controller/GalaxyTradeController.java
View file @
ebe30d8b
...
@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.validation.Valid
;
import
javax.validation.Valid
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @author AnJiabin <anjiabin@zhengzai.tv>
...
@@ -72,7 +74,24 @@ public class GalaxyTradeController {
...
@@ -72,7 +74,24 @@ public class GalaxyTradeController {
@ApiOperation
(
value
=
"NFT发行购买结果批量查询"
)
@ApiOperation
(
value
=
"NFT发行购买结果批量查询"
)
@PostMapping
(
value
=
{
"nftPublishAndBuyResultBatchQuery"
})
@PostMapping
(
value
=
{
"nftPublishAndBuyResultBatchQuery"
})
public
ResponseDto
<
GalaxyNftPublishAndBuyResultBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
@Valid
@RequestBody
GalaxyNftPublishAndBuyResultBatchQueryReqDto
reqDto
){
public
ResponseDto
<
GalaxyNftPublishAndBuyResultBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
@Valid
@RequestBody
GalaxyNftPublishAndBuyResultBatchQueryReqDto
reqDto
){
return
galaxyTradeService
.
nftPublishAndBuyResultBatchQuery
(
reqDto
);
//定义返回结果
List
<
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
>
routerBuyInfoList
=
new
ArrayList
<>();
List
<
GalaxyNftPublishAndBuyResultBatchQueryReqDto
.
RouterOrderInfo
>
routerOrderInfoList
=
reqDto
.
getRouterOrderInfoList
();
routerOrderInfoList
.
forEach
(
routerOrderInfo
->
{
GalaxyNftPublishAndBuyRouterBatchQueryReqDto
batchQueryReqDto
=
GalaxyNftPublishAndBuyRouterBatchQueryReqDto
.
getNew
();
batchQueryReqDto
.
setUserId
(
routerOrderInfo
.
getUserId
());
batchQueryReqDto
.
setRouterType
(
routerOrderInfo
.
getRouterType
());
batchQueryReqDto
.
setNftOrderPayIdList
(
routerOrderInfo
.
getNftOrderPayIdList
());
ResponseDto
<
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
>
responseDtoTemp
=
galaxyTradeService
.
nftPublishAndBuyResultBatchQuery
(
batchQueryReqDto
);
if
(
responseDtoTemp
.
isSuccess
()){
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
routerBatchQueryRespDto
=
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
.
getNew
();
routerBuyInfoList
.
add
(
routerBatchQueryRespDto
);
}
});
GalaxyNftPublishAndBuyResultBatchQueryRespDto
respDto
=
GalaxyNftPublishAndBuyResultBatchQueryRespDto
.
getNew
();
respDto
.
setUserId
(
reqDto
.
getUserId
());
respDto
.
setRouterBuyInfoList
(
routerBuyInfoList
);
return
ResponseDto
.
success
(
respDto
);
}
}
// @ControllerLog(description = "NFT购买支付结果查询")
// @ControllerLog(description = "NFT购买支付结果查询")
...
...
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/eth/service/GalaxyRouterStrategyEthTradeImpl.java
View file @
ebe30d8b
...
@@ -48,7 +48,7 @@ public class GalaxyRouterStrategyEthTradeImpl implements IGalaxyRouterStrategyTr
...
@@ -48,7 +48,7 @@ public class GalaxyRouterStrategyEthTradeImpl implements IGalaxyRouterStrategyTr
}
}
@Override
@Override
public
ResponseDto
<
GalaxyNftPublishAndBuyR
esultBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyResult
BatchQueryReqDto
reqDto
)
{
public
ResponseDto
<
GalaxyNftPublishAndBuyR
outerBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyRouter
BatchQueryReqDto
reqDto
)
{
return
null
;
return
null
;
}
}
}
}
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinTradeBiz.java
View file @
ebe30d8b
...
@@ -351,23 +351,24 @@ public class ZxinTradeBiz {
...
@@ -351,23 +351,24 @@ public class ZxinTradeBiz {
* @param reqDto
* @param reqDto
* @return
* @return
*/
*/
public
ResponseDto
<
GalaxyNftPublishAndBuyR
esultBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyResult
BatchQueryReqDto
reqDto
)
{
public
ResponseDto
<
GalaxyNftPublishAndBuyR
outerBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyRouter
BatchQueryReqDto
reqDto
)
{
List
<
GalaxyNftPublishAndBuyResultBatchQueryRespDto
.
BuyInfo
>
buyInfoList
=
new
ArrayList
<>
();
List
<
String
>
nftOrderPayIdList
=
reqDto
.
getNftOrderPayIdList
();
List
<
String
>
nftOrderPayIdList
=
reqDto
.
getOrderInfoList
();
List
<
GalaxyNftPublishAndBuyResultQueryRespDto
>
buyInfoList
=
new
ArrayList
<>
();
nftOrderPayIdList
.
stream
().
forEach
(
nftOrderPayId
->
{
nftOrderPayIdList
.
stream
().
forEach
(
nftOrderPayId
->
{
GalaxyNftPublishAndBuyResultQueryReqDto
resultQueryReqDto
=
GalaxyNftPublishAndBuyResultQueryReqDto
.
getNew
();
GalaxyNftPublishAndBuyResultQueryReqDto
resultQueryReqDto
=
GalaxyNftPublishAndBuyResultQueryReqDto
.
getNew
();
resultQueryReqDto
.
setUserId
(
reqDto
.
getUserId
());
resultQueryReqDto
.
setUserId
(
reqDto
.
getUserId
());
resultQueryReqDto
.
setNftOrderPayId
(
nftOrderPayId
);
resultQueryReqDto
.
setNftOrderPayId
(
nftOrderPayId
);
resultQueryReqDto
.
setRouterType
(
reqDto
.
getRouterType
());
resultQueryReqDto
.
setRouterType
(
reqDto
.
getRouterType
());
ResponseDto
<
GalaxyNftPublishAndBuyResultQueryRespDto
>
resultQueryRespDto
=
this
.
nftPublishAndBuyResultQuery
(
resultQueryReqDto
);
ResponseDto
<
GalaxyNftPublishAndBuyResultQueryRespDto
>
resultQueryRespDto
=
this
.
nftPublishAndBuyResultQuery
(
resultQueryReqDto
);
GalaxyNftPublishAndBuyResultBatchQueryRespDto
.
BuyInfo
buyInfo
=
new
GalaxyNftPublishAndBuyResultBatchQueryRespDto
.
BuyInfo
();
if
(
resultQueryRespDto
.
isSuccess
()){
BeanUtil
.
copy
(
resultQueryRespDto
,
buyInfo
);
buyInfoList
.
add
(
resultQueryRespDto
.
getData
()
);
buyInfoList
.
add
(
buyInfo
);
}
});
});
GalaxyNftPublishAndBuyResultBatchQueryRespDto
resultBatchQueryRespDto
=
GalaxyNftPublishAndBuyResultBatchQueryRespDto
.
getNew
();
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
routerBatchQueryRespDto
=
GalaxyNftPublishAndBuyRouterBatchQueryRespDto
.
getNew
();
resultBatchQueryRespDto
.
setUserId
(
reqDto
.
getUserId
());
routerBatchQueryRespDto
.
setUserId
(
reqDto
.
getUserId
());
resultBatchQueryRespDto
.
setBuyInfoList
(
buyInfoList
);
routerBatchQueryRespDto
.
setRouterType
(
reqDto
.
getRouterType
());
return
ResponseDto
.
success
(
resultBatchQueryRespDto
);
routerBatchQueryRespDto
.
setBuyInfoList
(
buyInfoList
);
return
ResponseDto
.
success
(
routerBatchQueryRespDto
);
}
}
private
GalaxyNftBuyRespDto
nftBuyBusiness
(
String
routerType
,
String
nftId
,
GalaxyUserInfoBo
userInfoBo
,
GalaxySeriesNftInfoBo
seriesNftInfoBo
,
GalaxyNftOrderBo
nftOrderBo
){
private
GalaxyNftBuyRespDto
nftBuyBusiness
(
String
routerType
,
String
nftId
,
GalaxyUserInfoBo
userInfoBo
,
GalaxySeriesNftInfoBo
seriesNftInfoBo
,
GalaxyNftOrderBo
nftOrderBo
){
...
...
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/service/GalaxyRouterStrategyZxlTradeImpl.java
View file @
ebe30d8b
...
@@ -6,7 +6,6 @@ import com.liquidnet.service.galaxy.dto.param.*;
...
@@ -6,7 +6,6 @@ import com.liquidnet.service.galaxy.dto.param.*;
import
com.liquidnet.service.galaxy.router.strategy.IGalaxyRouterStrategyTrade
;
import
com.liquidnet.service.galaxy.router.strategy.IGalaxyRouterStrategyTrade
;
import
com.liquidnet.service.galaxy.router.strategy.annotation.StrategyGalaxyRouterTradeHandler
;
import
com.liquidnet.service.galaxy.router.strategy.annotation.StrategyGalaxyRouterTradeHandler
;
import
com.liquidnet.service.galaxy.router.zxin.biz.ZxinTradeBiz
;
import
com.liquidnet.service.galaxy.router.zxin.biz.ZxinTradeBiz
;
import
com.liquidnet.service.galaxy.utils.QueueUtil
;
import
lombok.extern.slf4j.Slf4j
;
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
;
...
@@ -27,9 +26,6 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr
...
@@ -27,9 +26,6 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr
@Autowired
@Autowired
private
ZxinTradeBiz
zxinTradeBiz
;
private
ZxinTradeBiz
zxinTradeBiz
;
@Autowired
private
QueueUtil
queueUtil
;
@Override
@Override
public
ResponseDto
<
GalaxyNftPublishAndBuyRespDto
>
nftPublishAndBuy
(
GalaxyNftPublishAndBuyReqDto
reqDto
)
{
public
ResponseDto
<
GalaxyNftPublishAndBuyRespDto
>
nftPublishAndBuy
(
GalaxyNftPublishAndBuyReqDto
reqDto
)
{
// queueUtil.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), JsonUtils.toJson(reqDto));
// queueUtil.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), JsonUtils.toJson(reqDto));
...
@@ -53,7 +49,7 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr
...
@@ -53,7 +49,7 @@ public class GalaxyRouterStrategyZxlTradeImpl implements IGalaxyRouterStrategyTr
}
}
@Override
@Override
public
ResponseDto
<
GalaxyNftPublishAndBuyR
esultBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyResult
BatchQueryReqDto
reqDto
)
{
public
ResponseDto
<
GalaxyNftPublishAndBuyR
outerBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyRouter
BatchQueryReqDto
reqDto
)
{
return
zxinTradeBiz
.
nftPublishAndBuyResultBatchQuery
(
reqDto
);
return
zxinTradeBiz
.
nftPublishAndBuyResultBatchQuery
(
reqDto
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/service/impl/GalaxyTradeServiceImpl.java
View file @
ebe30d8b
...
@@ -49,7 +49,7 @@ public class GalaxyTradeServiceImpl implements IGalaxyTradeService {
...
@@ -49,7 +49,7 @@ public class GalaxyTradeServiceImpl implements IGalaxyTradeService {
}
}
@Override
@Override
public
ResponseDto
<
GalaxyNftPublishAndBuyR
esultBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyResult
BatchQueryReqDto
reqDto
)
{
public
ResponseDto
<
GalaxyNftPublishAndBuyR
outerBatchQueryRespDto
>
nftPublishAndBuyResultBatchQuery
(
GalaxyNftPublishAndBuyRouter
BatchQueryReqDto
reqDto
)
{
return
galaxyRouterStrategyContext
.
getTradeStrategy
(
reqDto
.
getRouterType
()).
nftPublishAndBuyResultBatchQuery
(
reqDto
);
return
galaxyRouterStrategyContext
.
getTradeStrategy
(
reqDto
.
getRouterType
()).
nftPublishAndBuyResultBatchQuery
(
reqDto
);
}
}
}
}
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