记得上下班打卡 | 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
cfd6d596
Commit
cfd6d596
authored
Aug 31, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交 混合售列表和数字藏品列表 是否可转赠字段
parent
77c2e6d7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
0 deletions
+23
-0
GoblinMixAppListVo.java
...m/liquidnet/service/goblin/dto/vo/GoblinMixAppListVo.java
+2
-0
GoblinNftGoodsSkuListVo.java
...uidnet/service/goblin/dto/vo/GoblinNftGoodsSkuListVo.java
+2
-0
GoblinMixAppServiceImpl.java
.../service/goblin/service/impl/GoblinMixAppServiceImpl.java
+18
-0
GoblinNftGoodsAppServiceImpl.java
...ice/goblin/service/impl/GoblinNftGoodsAppServiceImpl.java
+1
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinMixAppListVo.java
View file @
cfd6d596
...
@@ -39,6 +39,8 @@ public class GoblinMixAppListVo implements Serializable, Cloneable {
...
@@ -39,6 +39,8 @@ public class GoblinMixAppListVo implements Serializable, Cloneable {
private
String
shelvesTime
;
private
String
shelvesTime
;
@ApiModelProperty
(
position
=
23
,
value
=
"预约开启标识[0:未开启,1开启]"
)
@ApiModelProperty
(
position
=
23
,
value
=
"预约开启标识[0:未开启,1开启]"
)
private
int
reserve
;
private
int
reserve
;
@ApiModelProperty
(
position
=
24
,
value
=
"是否可转债[0-否|1-是]"
)
private
Integer
transferable
;
private
static
final
GoblinMixAppListVo
obj
=
new
GoblinMixAppListVo
();
private
static
final
GoblinMixAppListVo
obj
=
new
GoblinMixAppListVo
();
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftGoodsSkuListVo.java
View file @
cfd6d596
...
@@ -56,6 +56,8 @@ public class GoblinNftGoodsSkuListVo implements Serializable, Cloneable {
...
@@ -56,6 +56,8 @@ public class GoblinNftGoodsSkuListVo implements Serializable, Cloneable {
private
String
routeType
;
private
String
routeType
;
@ApiModelProperty
(
position
=
64
,
value
=
"转赠时间[单位秒]"
)
@ApiModelProperty
(
position
=
64
,
value
=
"转赠时间[单位秒]"
)
private
Long
transferTimeLimit
;
private
Long
transferTimeLimit
;
@ApiModelProperty
(
position
=
65
,
value
=
"是否可转债[0-否|1-是]"
)
private
Integer
transferable
;
private
static
final
GoblinNftGoodsSkuListVo
obj
=
new
GoblinNftGoodsSkuListVo
();
private
static
final
GoblinNftGoodsSkuListVo
obj
=
new
GoblinNftGoodsSkuListVo
();
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinMixAppServiceImpl.java
View file @
cfd6d596
...
@@ -53,6 +53,15 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
...
@@ -53,6 +53,15 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
GoblinMixDetailsVo
vo
=
redisUtils
.
getMixDetails
(
mixId
);
GoblinMixDetailsVo
vo
=
redisUtils
.
getMixDetails
(
mixId
);
GoblinMixAppListVo
itemVo
=
GoblinMixAppListVo
.
getNew
().
copy
(
vo
,
nowTime
);
GoblinMixAppListVo
itemVo
=
GoblinMixAppListVo
.
getNew
().
copy
(
vo
,
nowTime
);
itemVo
.
setStatus
(
6
);
itemVo
.
setStatus
(
6
);
for
(
GoblinMixDetailsItemVo
data:
vo
.
getItem
()){
String
spuId
=
data
.
getSpuId
();
if
(
redisUtils
.
getGoodsInfoVo
(
spuId
).
getSpuType
()==
1
){
itemVo
.
setTransferable
(
1
);
break
;
}
else
{
itemVo
.
setTransferable
(
0
);
}
}
voList
.
add
(
itemVo
);
voList
.
add
(
itemVo
);
}
}
...
@@ -60,6 +69,15 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
...
@@ -60,6 +69,15 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
GoblinMixDetailsVo
vo
=
redisUtils
.
getMixDetails
(
mixId
);
GoblinMixDetailsVo
vo
=
redisUtils
.
getMixDetails
(
mixId
);
GoblinMixAppListVo
itemVo
=
GoblinMixAppListVo
.
getNew
().
copy
(
vo
,
nowTime
);
GoblinMixAppListVo
itemVo
=
GoblinMixAppListVo
.
getNew
().
copy
(
vo
,
nowTime
);
itemVo
.
setStatus
(
8
);
itemVo
.
setStatus
(
8
);
for
(
GoblinMixDetailsItemVo
data:
vo
.
getItem
()){
String
spuId
=
data
.
getSpuId
();
if
(
redisUtils
.
getGoodsInfoVo
(
spuId
).
getSpuType
()==
1
){
itemVo
.
setTransferable
(
1
);
break
;
}
else
{
itemVo
.
setTransferable
(
0
);
}
}
voList
.
add
(
itemVo
);
voList
.
add
(
itemVo
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinNftGoodsAppServiceImpl.java
View file @
cfd6d596
...
@@ -101,6 +101,7 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
...
@@ -101,6 +101,7 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
Map
<
String
,
Long
>
artworkTransferConfMap
=
goblinRedisUtils
.
getUserDigitalArtworkTransferConfMap
();
Map
<
String
,
Long
>
artworkTransferConfMap
=
goblinRedisUtils
.
getUserDigitalArtworkTransferConfMap
();
goblinNftGoodsSkuListVo
.
setRouteType
(
routeType
);
goblinNftGoodsSkuListVo
.
setRouteType
(
routeType
);
goblinNftGoodsSkuListVo
.
setTransferTimeLimit
(
artworkTransferConfMap
.
get
(
routeType
));
goblinNftGoodsSkuListVo
.
setTransferTimeLimit
(
artworkTransferConfMap
.
get
(
routeType
));
goblinNftGoodsSkuListVo
.
setTransferable
(
1
);
// 库存、预约
// 库存、预约
if
(
soldOutSkuIdList
.
contains
(
skuId
))
{
// 是售罄的
if
(
soldOutSkuIdList
.
contains
(
skuId
))
{
// 是售罄的
...
...
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