From e828225de7636d0195db2c3c9b1701a5b2f12049 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 14 九月 2023 18:01:33 +0800
Subject: [PATCH] Merge branch '滲透' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into 滲透
---
pamapi/src/main/java/com/pollex/pam/service/CustomerService.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/CustomerService.java b/pamapi/src/main/java/com/pollex/pam/service/CustomerService.java
index 98af88a..77f2f75 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/CustomerService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/CustomerService.java
@@ -60,16 +60,23 @@
String account = getCustomerAccount(registDTO);
OtpTmp otpTmp = otpTmpService.findByAccountAndIndexKey(account, registDTO.getIndexKey());
- if(otpTmp.getStatus() == OtpTmpStatusEnum.VERRIFIED) {
- Customer customer = customerDTOMapper.toCustomer(registDTO);
- customer.setDataFrom(DataFromEnum.PAM);
- save(customer);
- return customer;
- }else {
- throw new IllegalArgumentException("Invalid indexKey state error. IndexKey: "
- + registDTO.getIndexKey()
- + " => status: " + otpTmp.getStatus());
- }
+
+ if(otpTmp!=null) {
+ if(otpTmp.getStatus() == OtpTmpStatusEnum.VERRIFIED) {
+ Customer customer = customerDTOMapper.toCustomer(registDTO);
+ customer.setDataFrom(DataFromEnum.PAM);
+ save(customer);
+ return customer;
+ }else {
+ throw new IllegalArgumentException("Invalid indexKey state error. IndexKey: "
+ + registDTO.getIndexKey()
+ + " => status: " + otpTmp.getStatus());
+ }
+ }else {
+ throw new IllegalArgumentException("otp tmp not exist");
+ }
+
+
}
}
--
Gitblit v1.8.0