记得上下班打卡 | 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
7814648f
Commit
7814648f
authored
Jun 06, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
活动表增加新活动id标识;列表判断只能操作一次
parent
082e57ab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
10 deletions
+20
-10
GoblinNftExActivity.java
.../liquidnet/service/goblin/entity/GoblinNftExActivity.java
+5
-0
GoblinNftExActivityMapper.xml
...idnet.service.goblin.mapper/GoblinNftExActivityMapper.xml
+2
-1
db_0418_jxl_nft_exchange.sql
...net-service-goblin-impl/docu/db_0418_jxl_nft_exchange.sql
+2
-0
GoblinNftExActivityServiceImpl.java
...m/service/impl/goblin/GoblinNftExActivityServiceImpl.java
+11
-9
No files found.
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinNftExActivity.java
View file @
7814648f
...
@@ -37,6 +37,11 @@ public class GoblinNftExActivity implements Serializable,Cloneable {
...
@@ -37,6 +37,11 @@ public class GoblinNftExActivity implements Serializable,Cloneable {
*/
*/
private
String
title
;
private
String
title
;
/**
* 延期后的新活动id
*/
private
String
newActivityId
;
/**
/**
* 创建时间
* 创建时间
*/
*/
...
...
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExActivityMapper.xml
View file @
7814648f
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
<result
column=
"activity_id"
property=
"activityId"
jdbcType=
"VARCHAR"
/>
<result
column=
"activity_id"
property=
"activityId"
jdbcType=
"VARCHAR"
/>
<result
column=
"uid"
property=
"uid"
jdbcType=
"VARCHAR"
/>
<result
column=
"uid"
property=
"uid"
jdbcType=
"VARCHAR"
/>
<result
column=
"title"
property=
"title"
jdbcType=
"VARCHAR"
/>
<result
column=
"title"
property=
"title"
jdbcType=
"VARCHAR"
/>
<result
column=
"new_activity_id"
property=
"newActivityId"
jdbcType=
"VARCHAR"
/>
<result
column=
"created_at"
property=
"createdAt"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"created_at"
property=
"createdAt"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"updated_at"
property=
"updatedAt"
jdbcType=
"TIMESTAMP"
/>
<result
column=
"updated_at"
property=
"updatedAt"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
</resultMap>
...
@@ -17,7 +18,7 @@
...
@@ -17,7 +18,7 @@
</select>
</select>
<select
id=
"selectPageList"
resultMap=
"BaseResult"
>
<select
id=
"selectPageList"
resultMap=
"BaseResult"
>
select activity_id,uid,title,created_at from goblin_nft_ex_activity
select activity_id,uid,title,created_at
,new_activity_id
from goblin_nft_ex_activity
<where>
<where>
<if
test=
"uid != null and uid != ''"
>
<if
test=
"uid != null and uid != ''"
>
and uid = #{uid,jdbcType=VARCHAR}
and uid = #{uid,jdbcType=VARCHAR}
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0418_jxl_nft_exchange.sql
View file @
7814648f
...
@@ -38,6 +38,8 @@ CREATE TABLE `goblin_nft_ex_activity`
...
@@ -38,6 +38,8 @@ CREATE TABLE `goblin_nft_ex_activity`
PRIMARY
KEY
(
`mid`
)
USING
BTREE
,
PRIMARY
KEY
(
`mid`
)
USING
BTREE
,
INDEX
`idx_nft_activity_id`
(
`activity_id`
)
USING
BTREE
INDEX
`idx_nft_activity_id`
(
`activity_id`
)
USING
BTREE
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
1
CHARACTER
SET
=
utf8mb4
COLLATE
=
utf8mb4_unicode_ci
COMMENT
=
'NFT兑换活动表'
ROW_FORMAT
=
Dynamic
;
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
1
CHARACTER
SET
=
utf8mb4
COLLATE
=
utf8mb4_unicode_ci
COMMENT
=
'NFT兑换活动表'
ROW_FORMAT
=
Dynamic
;
ALTER
TABLE
`goblin_nft_ex_activity`
ADD
`new_activity_id`
varchar
(
64
)
NOT
NULL
DEFAULT
''
COMMENT
'延期后的新活动id'
after
title
;
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExActivityServiceImpl.java
View file @
7814648f
...
@@ -153,15 +153,17 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
...
@@ -153,15 +153,17 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
// 获取该活动最大的失效时间
// 获取该活动最大的失效时间
goblinNftExActivityVo
.
setIsDelay
(
0
);
goblinNftExActivityVo
.
setIsDelay
(
0
);
List
<
GoblinNftExSku
>
goblinNftExSkus
=
goblinNftExSkuMapper
.
selectList
(
if
(
goblinNftExActivity
.
getNewActivityId
().
isEmpty
())
{
Wrappers
.
lambdaQuery
(
GoblinNftExSku
.
class
)
List
<
GoblinNftExSku
>
goblinNftExSkus
=
goblinNftExSkuMapper
.
selectList
(
.
eq
(
GoblinNftExSku:
:
getActivityId
,
goblinNftExActivity
.
getActivityId
())
Wrappers
.
lambdaQuery
(
GoblinNftExSku
.
class
)
.
orderByDesc
(
GoblinNftExSku:
:
getExStopTime
)
.
eq
(
GoblinNftExSku:
:
getActivityId
,
goblinNftExActivity
.
getActivityId
())
);
.
orderByDesc
(
GoblinNftExSku:
:
getExStopTime
)
if
(!
CollectionUtil
.
isEmpty
(
goblinNftExSkus
))
{
);
LocalDateTime
exStopTime
=
goblinNftExSkus
.
get
(
0
).
getExStopTime
();
if
(!
CollectionUtil
.
isEmpty
(
goblinNftExSkus
))
{
if
(
LocalDateTime
.
now
().
isAfter
(
exStopTime
)
&&
invalidNumber
>
0
)
{
LocalDateTime
exStopTime
=
goblinNftExSkus
.
get
(
0
).
getExStopTime
();
goblinNftExActivityVo
.
setIsDelay
(
1
);
if
(
LocalDateTime
.
now
().
isAfter
(
exStopTime
)
&&
invalidNumber
>
0
)
{
goblinNftExActivityVo
.
setIsDelay
(
1
);
}
}
}
}
}
...
...
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