From bdae23a40c461c2c6b6ee614f661eac731c949c8 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 22 十二月 2021 14:12:05 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/domain/Customer.java | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 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 580dea9..c3055cc 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/Customer.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/Customer.java
@@ -2,49 +2,45 @@
import java.io.Serializable;
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
@@ -54,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;
@@ -110,7 +111,19 @@
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)
+ .orElseGet(this::getEmail);
+ }
}
--
Gitblit v1.8.0