From 035621f9e0fd3e74b845d6a2402c93852f4c1736 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 24 一月 2022 11:24:40 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 7 +------
pamapi/src/doc/sql/20220122_w.sql | 2 +-
pamapi/src/doc/預約單/客戶取得最新預約的未處理預約單.txt | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/pamapi/src/doc/sql/20220122_w.sql b/pamapi/src/doc/sql/20220122_w.sql
index 1acd577..39a28b8 100644
--- a/pamapi/src/doc/sql/20220122_w.sql
+++ b/pamapi/src/doc/sql/20220122_w.sql
@@ -2,5 +2,5 @@
id bigserial NOT NULL,
appointment_id bigserial NOT NULL,
send_time timestamp NULL,
- CONSTRAINT appointment_pending_notify_record_pk PRIMARY KEY (id)
+ CONSTRAINT appointment_expiring_notify_record_pk PRIMARY KEY (id)
);
diff --git "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\345\256\242\346\210\266\345\217\226\345\276\227\346\234\200\346\226\260\351\240\220\347\264\204\347\232\204\346\234\252\350\231\225\347\220\206\351\240\220\347\264\204\345\226\256.txt" "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\345\256\242\346\210\266\345\217\226\345\276\227\346\234\200\346\226\260\351\240\220\347\264\204\347\232\204\346\234\252\350\231\225\347\220\206\351\240\220\347\264\204\345\226\256.txt"
index d31a4ea..f4e02f9 100644
--- "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\345\256\242\346\210\266\345\217\226\345\276\227\346\234\200\346\226\260\351\240\220\347\264\204\347\232\204\346\234\252\350\231\225\347\220\206\351\240\220\347\264\204\345\226\256.txt"
+++ "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\345\256\242\346\210\266\345\217\226\345\276\227\346\234\200\346\226\260\351\240\220\347\264\204\347\232\204\346\234\252\350\231\225\347\220\206\351\240\220\347\264\204\345\226\256.txt"
@@ -4,7 +4,7 @@
蝪∟��mail��誑閰脩雯���脣擐�� -> http://localhost:3000?notContactAppointmentId={���銝�蝑�����}
-response body: ����200銝衣策隞乩�����(���遙雿�暹������嚗����404)
+response body: ����200銝衣策隞乩�����(���遙雿�暹������嚗���ull)
{
"id": 385,
"phone": "0911223344",
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
index ac19b72..6ac1d5f 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
@@ -86,12 +86,7 @@
Long customerId = SecurityUtils.getCustomerDBId();
AppointmentCustomerViewDTO customerNewestExpiringAppointment = appointmentService.getCustomerNewestExpiringAppointment(customerId);
- if(Objects.nonNull(customerNewestExpiringAppointment)) {
- return new ResponseEntity<>(customerNewestExpiringAppointment, HttpStatus.OK);
- }
- else {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
+ return new ResponseEntity<>(customerNewestExpiringAppointment, HttpStatus.OK);
}
@GetMapping("/consultant/pending/sum")
--
Gitblit v1.8.0