From bd94a3d7572bcb3d87e3a0c89cb764e873e8b4a8 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期一, 24 一月 2022 12:05:50 +0800 Subject: [PATCH] [update] 批次中若顧問沒有手機或email就不要發 --- pamapi/src/main/java/com/pollex/pam/domain/Customer.java | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/domain/Customer.java b/pamapi/src/main/java/com/pollex/pam/domain/Customer.java index 359d0a3..c3055cc 100644 --- a/pamapi/src/main/java/com/pollex/pam/domain/Customer.java +++ b/pamapi/src/main/java/com/pollex/pam/domain/Customer.java @@ -4,49 +4,43 @@ import java.time.Instant; import java.util.Optional; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import org.springframework.util.StringUtils; import com.fasterxml.jackson.annotation.JsonIgnore; import com.pollex.pam.enums.OtpLoginTypeEnum; +@EntityListeners(AuditingEntityListener.class) @Entity @Table(name = "customer") public class Customer implements Serializable { - - + /** - * + * */ private static final long serialVersionUID = 1L; - + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - + @Column(name = "name") private String name; - + @Column(name = "phone") private String phone; - + @Column(name = "email") private String email; - + @Enumerated(value = EnumType.STRING) @Column(name = "contact_type") private OtpLoginTypeEnum contactType; - + @CreatedDate @Column(name = "created_date", updatable = false) @JsonIgnore @@ -56,6 +50,11 @@ @Column(name = "last_modified_date") @JsonIgnore private Instant lastModifiedDate = Instant.now(); + + @CreatedDate + @Column(name = "agree_personal_information_time", updatable = false) + @JsonIgnore + private Instant agreePersonalInformationTime; public Long getId() { return id; @@ -112,7 +111,15 @@ public void setContactType(OtpLoginTypeEnum contactType) { this.contactType = contactType; } - + + public Instant getAgreePersonalInformationTime() { + return agreePersonalInformationTime; + } + + public void setAgreePersonalInformationTime(Instant agreePersonalInformationTime) { + this.agreePersonalInformationTime = agreePersonalInformationTime; + } + public String toAccountString() { return Optional.ofNullable(getPhone()) .filter(StringUtils::hasText) -- Gitblit v1.8.0