From 3d4d6480a947f2f6e032b7b4b7d04c2744115ad7 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 30 十一月 2021 20:42:15 +0800
Subject: [PATCH] [update] 嚴選配對年資欄位改單純字串比對，而非用enum接
---
pamapi/src/main/java/com/pollex/pam/domain/Customer.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 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..9a94a8c 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
@@ -110,7 +106,11 @@
public void setContactType(OtpLoginTypeEnum contactType) {
this.contactType = contactType;
}
-
-
+
+ public String toAccountString() {
+ return Optional.ofNullable(getPhone())
+ .filter(StringUtils::hasText)
+ .orElseGet(this::getEmail);
+ }
}
--
Gitblit v1.8.0