记得上下班打卡 | 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
c5521639
Commit
c5521639
authored
Aug 29, 2022
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~api:藏品详情+受赠人判断+转赠人UID;
parent
c3e164af
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
GoblinUserDigitalArtworkInfoVo.java
...service/goblin/dto/vo/GoblinUserDigitalArtworkInfoVo.java
+2
-0
GoblinUserDigitalArtworkServiceImpl.java
...lin/service/impl/GoblinUserDigitalArtworkServiceImpl.java
+3
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkInfoVo.java
View file @
c5521639
...
@@ -76,6 +76,8 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
...
@@ -76,6 +76,8 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
33
,
value
=
"转赠过期时间[yyyy-MM-dd HH:mm:ss],发生转赠时有效"
)
@ApiModelProperty
(
position
=
33
,
value
=
"转赠过期时间[yyyy-MM-dd HH:mm:ss],发生转赠时有效"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
transferExpireTime
;
private
LocalDateTime
transferExpireTime
;
@ApiModelProperty
(
position
=
34
,
value
=
"转赠人UID,发生转赠且受赠人查取详情时有效"
)
private
String
transferUid
;
private
static
final
GoblinUserDigitalArtworkInfoVo
obj
=
new
GoblinUserDigitalArtworkInfoVo
();
private
static
final
GoblinUserDigitalArtworkInfoVo
obj
=
new
GoblinUserDigitalArtworkInfoVo
();
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinUserDigitalArtworkServiceImpl.java
View file @
c5521639
...
@@ -220,6 +220,9 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
...
@@ -220,6 +220,9 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
if
(
transferState
.
equals
(
GoblinStatusConst
.
TransferState
.
WAITING
.
name
())
&&
null
!=
artworkInfoVo
.
getTransferTime
())
{
if
(
transferState
.
equals
(
GoblinStatusConst
.
TransferState
.
WAITING
.
name
())
&&
null
!=
artworkInfoVo
.
getTransferTime
())
{
artworkInfoVo
.
setTransferExpireTime
(
artworkInfoVo
.
getTransferTime
().
plusDays
(
1
));
artworkInfoVo
.
setTransferExpireTime
(
artworkInfoVo
.
getTransferTime
().
plusDays
(
1
));
}
}
if
(
uid
.
equals
(
userDigitalArtworkVo
.
getReceiverUid
()))
{
// 受赠人查取详情返回转赠人UID,用于前端查取转赠人身份信息使用
artworkInfoVo
.
setTransferUid
(
userDigitalArtworkVo
.
getUid
());
}
}
}
if
(
"0"
.
equals
(
goodsSkuInfoVo
.
getUnbox
())
&&
1
==
userDigitalArtworkVo
.
getState
()
&&
!
transferFlg
)
{
// 非盲盒 & 已上链 & 非转赠(转赠中、已转赠)
if
(
"0"
.
equals
(
goodsSkuInfoVo
.
getUnbox
())
&&
1
==
userDigitalArtworkVo
.
getState
()
&&
!
transferFlg
)
{
// 非盲盒 & 已上链 & 非转赠(转赠中、已转赠)
artworkInfoVo
.
setMaterialType
(
goodsSkuInfoVo
.
getMaterialType
());
artworkInfoVo
.
setMaterialType
(
goodsSkuInfoVo
.
getMaterialType
());
...
...
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