From f318ee591db44b76e610a58463301205c013327b Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Thu, 5 Jan 2023 18:40:07 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20VerifyMail=E5=B8=B6=E5=85=A5=E4=B9=8B?=
 =?UTF-8?q?=E5=8F=83=E6=95=B8=E8=AA=BF=E6=95=B4=20[WHY]=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs | 15 +++++++--------
 EuroTran/WebApp/Controllers/SignupController.cs  |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
index 552f84d..44d9fad 100644
--- a/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
+++ b/EuroTran/EasyBL.WEBAPP/ShowEasy/SignupService.cs
@@ -28,7 +28,7 @@ namespace EasyBL.WEBAPP.SYS
         //使用者以信箱註冊(API Function)
         public HttpResponseMessage SignupWithEmail(SETB_CMS_Member newUser)
         {
-            string sMsg = null;
+            //string sMsg = null;
             SuccessResponseMessage srm = SugarBase.ExecTran(db =>
             {
                 do
@@ -81,15 +81,15 @@ namespace EasyBL.WEBAPP.SYS
         }
 
         //重新寄送認證信
-        public HttpResponseMessage ReSendVerifyMail(string OrgID, string MemberID)
+        public HttpResponseMessage ReSendVerifyMail(string Email)
         {
-            string sMsg = null;
+            //string sMsg = null;
             SuccessResponseMessage srm = SugarBase.ExecTran(db =>
             {
                 do
                 {
-                    var Mailto = db.Queryable<SETB_CMS_Member>().Single(x => x.OrgID == OrgID && x.MemberID == MemberID);
-                    string sEmail = Mailto.Email;
+                    var Mailto = db.Queryable<SETB_CMS_Member>().Single(x => x.Email == Email);
+                    string sMemberID = Mailto.MemberID;
                     string sOrgID = Mailto.OrgID; 
                     string sError = "";
 
@@ -105,7 +105,7 @@ namespace EasyBL.WEBAPP.SYS
                     toEmail.Add(oEmailTo);
                     oEmail.FromUserName = "【ShowEasy 會員認證】";   //取fonfig
                     oEmail.Title = "感謝您註冊ShowEasy";   //取fonfig
-                    oEmail.EmailBody = createEmail(OrgID, MemberID, Mailto.FirstName);
+                    oEmail.EmailBody = createEmail(Mailto.OrgID, Mailto.MemberID, Mailto.FirstName);
                     oEmail.IsCCSelf = false;
                     oEmail.Attachments = null;
                     oEmail.EmailTo = toEmail;
@@ -130,8 +130,7 @@ namespace EasyBL.WEBAPP.SYS
         //會員認證
         public HttpResponseMessage VerifyAccount(string OrgID, string MemberID)
         {
-            string sMsg = null;
-
+            //string sMsg = null;
             SuccessResponseMessage srm = SugarBase.ExecTran(db =>
             {
                 do
diff --git a/EuroTran/WebApp/Controllers/SignupController.cs b/EuroTran/WebApp/Controllers/SignupController.cs
index 837ed6b..e212bbc 100644
--- a/EuroTran/WebApp/Controllers/SignupController.cs
+++ b/EuroTran/WebApp/Controllers/SignupController.cs
@@ -26,10 +26,10 @@ namespace WebApp.Controllers
 
         //重新寄送認證信
         [HttpGet]
-        public HttpResponseMessage ReSendVerifyMail(string OrgID, string MemberID)
+        public HttpResponseMessage ReSendVerifyMail(string Email)
         {
 
-            return new SignupService().ReSendVerifyMail(OrgID, MemberID);
+            return new SignupService().ReSendVerifyMail(Email);
 
         }