记得上下班打卡 | git大法好,push需谨慎

Commit 418168ef authored by 张国柄's avatar 张国柄

fix;

parent 81b12c69
package com.liquidnet.service.adam.dto.vo; package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.adam.entity.AdamUserMember; import com.liquidnet.service.adam.entity.AdamUserMember;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -61,7 +62,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable { ...@@ -61,7 +62,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
* *
* @return true-有效 * @return true-有效
*/ */
// @JsonIgnore @JsonIgnore
public boolean isActive() { public boolean isActive() {
LocalDateTime expiryAt = this.getExpiryAt(); LocalDateTime expiryAt = this.getExpiryAt();
return this.getState() == 1 && null != expiryAt && expiryAt.isAfter(LocalDateTime.now()); return this.getState() == 1 && null != expiryAt && expiryAt.isAfter(LocalDateTime.now());
...@@ -72,7 +73,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable { ...@@ -72,7 +73,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
* *
* @return true-是 * @return true-是
*/ */
// @JsonIgnore @JsonIgnore
public boolean isOldMember() { public boolean isOldMember() {
LocalDateTime expiryAt = this.getExpiryAt(); LocalDateTime expiryAt = this.getExpiryAt();
return expiryAt.isBefore(oldMemberSpotTime); return expiryAt.isBefore(oldMemberSpotTime);
......
...@@ -346,7 +346,7 @@ alter table adam_member add integral_rate decimal(8, 2) default 0 null comment ' ...@@ -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 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 limitb_at datetime(3) null comment '限购开始时间' after limitation;
alter table adam_member add limite_at datetime(3) null comment '限购结束时间' after limit_start; alter table adam_member add limite_at datetime(3) null comment '限购结束时间' after limitb_at;
# 添加会员价格字段 # 添加会员价格字段
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment