记得上下班打卡 | 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
418168ef
Commit
418168ef
authored
Sep 02, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix;
parent
81b12c69
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
AdamUserMemberVo.java
...a/com/liquidnet/service/adam/dto/vo/AdamUserMemberVo.java
+3
-2
db_ln_adam_initialdata.sql
...quidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql
+1
-1
No files found.
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserMemberVo.java
View file @
418168ef
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.adam.entity.AdamUserMember
;
import
io.swagger.annotations.ApiModel
;
...
...
@@ -61,7 +62,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
*
* @return true-有效
*/
//
@JsonIgnore
@JsonIgnore
public
boolean
isActive
()
{
LocalDateTime
expiryAt
=
this
.
getExpiryAt
();
return
this
.
getState
()
==
1
&&
null
!=
expiryAt
&&
expiryAt
.
isAfter
(
LocalDateTime
.
now
());
...
...
@@ -72,7 +73,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
*
* @return true-是
*/
//
@JsonIgnore
@JsonIgnore
public
boolean
isOldMember
()
{
LocalDateTime
expiryAt
=
this
.
getExpiryAt
();
return
expiryAt
.
isBefore
(
oldMemberSpotTime
);
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql
View file @
418168ef
...
...
@@ -346,7 +346,7 @@ alter table adam_member add integral_rate decimal(8, 2) default 0 null comment '
alter
table
adam_member
add
onsale
tinyint
default
0
null
comment
'是否开售:1-开售|2-停售'
after
integral_rate
;
#
添加限购逻辑,新增限购开始、结束时间字段
alter
table
adam_member
add
limitb_at
datetime
(
3
)
null
comment
'限购开始时间'
after
limitation
;
alter
table
adam_member
add
limite_at
datetime
(
3
)
null
comment
'限购结束时间'
after
limit
_star
t
;
alter
table
adam_member
add
limite_at
datetime
(
3
)
null
comment
'限购结束时间'
after
limit
b_a
t
;
#
添加会员价格字段
...
...
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