From fa337ec3a7ac56acd92b445fa73bf6c2e8ad78d4 Mon Sep 17 00:00:00 2001
From: jazz <jazz>
Date: Tue, 17 Mar 2026 17:57:16 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=9D=B4=EB=A9=94=EC=9D=BC/sms?=
 =?UTF-8?q?=EB=B0=9C=EC=86=A1=ED=99=94=EB=A9=B4=20=ED=98=B8=EC=B6=9C?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/ntcn/email/vo/BOMaEmailSrchVO.java  |  8 +++
 .../gcone/ntcn/mssage/vo/BOMssageVO.java      |  7 +++
 .../email/controller/EmailController.java     |  4 +-
 .../mssage/controller/MssageController.java   |  7 ++-
 .../ntcn/email/EmailPassivSndngManage.jsp     |  9 ++++
 .../mngr/ntcn/email/EmailSndngPopupC.jsp      |  7 +--
 .../ntcn/mssage/MssagePassivSndngManage.jsp   | 10 +++-
 .../mngr/ntcn/mssage/MssageSndngPopupC.jsp    | 17 ++++--
 .../mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp     | 53 +++++++++++++++++--
 9 files changed, 105 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/wb/domainserver/domain/admin/ntcn/email/vo/BOMaEmailSrchVO.java b/src/main/java/com/wb/domainserver/domain/admin/ntcn/email/vo/BOMaEmailSrchVO.java
index 0bbe8a52..99c4514c 100644
--- a/src/main/java/com/wb/domainserver/domain/admin/ntcn/email/vo/BOMaEmailSrchVO.java
+++ b/src/main/java/com/wb/domainserver/domain/admin/ntcn/email/vo/BOMaEmailSrchVO.java
@@ -28,4 +28,12 @@ public class BOMaEmailSrchVO extends AbstractVO {
 
 	/*secretkey*/
 	private String secretKey;
+
+	/** 셋팅용 파라미터 tab구분
+	 * send : 이메일 수동발송
+	 * search : 이메일 발송내역*/
+	private String reqTab;
+
+	/** 셋팅용 파라미터 받는사람 이메일주소*/
+	private String email;
 }
diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/vo/BOMssageVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/vo/BOMssageVO.java
index 92a36581..6c0d6306 100644
--- a/src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/vo/BOMssageVO.java
+++ b/src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/vo/BOMssageVO.java
@@ -156,4 +156,11 @@ public class BOMssageVO extends AbstractVO {
     /** 메세지 취소 구분코드 */
     private String cancelDvCd;
 
+    /** 셋팅용 파라미터 tab구분
+     * send : 메시지수동바송
+     * search : 메시지 발송내역*/
+    private String reqTab;
+
+    /** 셋팅용 파라미터 받는사람 휴대전화번호*/
+    private String mbtlnb;
 }
diff --git a/src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java b/src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java
index e68fb0cc..56b907a7 100644
--- a/src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java
+++ b/src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java
@@ -116,8 +116,8 @@ public class EmailController {
 	 */
 	@Policy(AuthPolicy.RESTRICTED)
 	@RequestMapping(value="/selectEmailPassivSndngManage")
-	public String selectEmailPassivSndngManage(){
-
+	public String selectEmailPassivSndngManage(ModelMap model, BOMaEmailSrchVO bOMaEmailSrchVO){
+		model.addAttribute("emailSrchVO", bOMaEmailSrchVO);
 		return "mngr/ntcn/email/EmailPassivSndngManage";
 	}
 
diff --git a/src/main/java/com/wb/domainserver/domain/mngr/ntcn/mssage/controller/MssageController.java b/src/main/java/com/wb/domainserver/domain/mngr/ntcn/mssage/controller/MssageController.java
index 6a98d770..7eb336e5 100644
--- a/src/main/java/com/wb/domainserver/domain/mngr/ntcn/mssage/controller/MssageController.java
+++ b/src/main/java/com/wb/domainserver/domain/mngr/ntcn/mssage/controller/MssageController.java
@@ -122,10 +122,11 @@ public class MssageController {
 	 */
 	@Policy(AuthPolicy.RESTRICTED)
 	@RequestMapping(value="/selectMssagePassivSndngManage")
-	public String selectMessagePassivSndngManage(MssageVO vo, ModelMap model,
+	public String selectMessagePassivSndngManage(BOMssageVO vo, ModelMap model,
 												 @CookieValue(value = "authSopmalCd") String authSopmalCd){
 
 		vo.setSopmalCd(authSopmalCd);
+		model.addAttribute("mssageVO", vo);
 
 		return "mngr/ntcn/mssage/MssagePassivSndngManage";
 	}
@@ -149,6 +150,7 @@ public class MssageController {
 		}
 
 		DataMap content = new DataMap();
+		content.put("mssageVO", vo);
 		content.put("shopInfoMap", service.selectBOShopInfoInqire(vo));
 		content.put("sopmalCd", user.getSopmalCd());
 
@@ -178,6 +180,7 @@ public class MssageController {
 			vo.setSopmalCd(user.getSopmalCd());
 		}
 		DataMap content = new DataMap();
+		content.put("mssageVO", vo);
 		content.put("shopInfoMap", service.selectBOShopInfoInqire(vo));
 		content.put("sopmalCd", user.getSopmalCd());
 
@@ -188,7 +191,7 @@ public class MssageController {
 //				"resultMap"
 //		);
 
-		return "mngr/ntcn/mssage/MssageSndngPopupC";
+				return "mngr/ntcn/mssage/MssageSndngPopupC";
 	}
 
 
diff --git a/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailPassivSndngManage.jsp b/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailPassivSndngManage.jsp
index dc045af3..d7c4ace9 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailPassivSndngManage.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailPassivSndngManage.jsp
@@ -25,7 +25,16 @@
 </head>
 <script>
 	$(document).ready(function () {
+		<c:choose>
+			<c:when test="${emailSrchVO != null && emailSrchVO.reqTab eq 'search'}">
+		fn_select_listForm(1);
+			</c:when>
+			<c:otherwise>
 		fn_select_Sndng();
+			</c:otherwise>
+		</c:choose>
+
+
 	});
 
 	/* ********************************************************
diff --git a/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailSndngPopupC.jsp b/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailSndngPopupC.jsp
index ee33fdf5..49f123a4 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailSndngPopupC.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailSndngPopupC.jsp
@@ -14,6 +14,7 @@
 	------- -------- ---------------------------
 	2024-05-22 이대환	최초 생성
 --%>
+<spring:eval expression="@environment.getProperty('mail.username')" var="sndrEmail"/>
 <!DOCTYPE html>
 <html lang="ko">
 <head>
@@ -239,8 +240,8 @@
 						<th>보내는 사람</th>
 						<td>
 							<div class="td-inner">
-								<input class="input-text xl" type="text" title="해당 인풋에 대한 설명" name="sndrEmail" id="sndrEmail"
-									   placeholder="메일 주소 입력">
+								<input class="input-text xl" type="text" title="해당 인풋에 대한 설명" name="sndrEmail" id="sndrEmail" value='<c:out value="${sndrEmail}"/>'
+									   placeholder="메일 주소 입력" readonly>
 							</div>
 						</td>
 					</tr>
@@ -264,7 +265,7 @@
 						<th>받는 사람 (직접 입력)</th>
 						<td>
 							<div class="td-inner">
-								<input class="input-text xl" type="text" title="해당 인풋에 대한 설명" name="recpntEmail" id="recpntEmail"
+								<input class="input-text xl" type="text" title="해당 인풋에 대한 설명" name="recpntEmail" id="recpntEmail" value="<c:if test="${emailSrchVO.reqTab eq 'send'}">${emailSrchVO.email}</c:if>"
 									   placeholder="메일 주소는 ,(콤마)로 구분하여 입력">
 							</div>
 						</td>
diff --git a/src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssagePassivSndngManage.jsp b/src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssagePassivSndngManage.jsp
index 9f6922aa..7f6d4259 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssagePassivSndngManage.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssagePassivSndngManage.jsp
@@ -34,8 +34,14 @@
             }
         })
 
-        fn_select_Sndng();
-
+        <c:choose>
+            <c:when test="${mssageVO != null && mssageVO.reqTab eq 'search'}">
+                fn_select_listForm();
+            </c:when>
+            <c:otherwise>
+                fn_select_Sndng();
+            </c:otherwise>
+        </c:choose>
     });
 
 
diff --git a/src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssageSndngPopupC.jsp b/src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssageSndngPopupC.jsp
index d3a9e700..e641f6e6 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssageSndngPopupC.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssageSndngPopupC.jsp
@@ -24,9 +24,15 @@
 </head>
 <script>
     $(document).ready(function () {
-
+        var reqTab = '${resultMap.mssageVO.reqTab}';
     	fn_preview();
-        fn_select_Sndng();
+    	if (reqTab == 'send'){
+            fn_select_Sndng('${resultMap.mssageVO.mbtlnb}');
+        }else if (reqTab == 'search'){
+            fn_select_listForm();
+        }else {
+            fn_select_Sndng();
+        }
 
         //특수문자 버튼
    	    $("#special_cont").click(function(){
@@ -55,8 +61,8 @@
     /* ********************************************************
      * 메시지 수동 발송 TAB
      ******************************************************** */
-    const fn_select_Sndng = function () {
-
+    const fn_select_Sndng = function (mbtlnb) {
+        console.log("==========mbtlnb",mbtlnb);
         $.ajax({
             type: 'post',
             url: '/mngr/ntcn/mssage/selectMssagePassivSndng',
@@ -67,6 +73,9 @@
                 $("#selectSndngBtn").addClass("active");
                 $("#selectSndng").addClass("active");
                 $('#selectSndng').html(resultHtml);
+                if (mbtlnb != null){
+                    $('#inputData').text(mbtlnb);
+                }
             }
         });
     }
diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
index 5dadbf98..bac99424 100644
--- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
+++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
@@ -1240,7 +1240,29 @@
                 return false;
             }
 
-            PopupCenter('/mngr/ntcn/mssage/selectMssageSndngPopupForm', 'SMS 발송', '1400', '840');
+            PopupCenter('', 'SMS 발송', '1400', '840');
+
+            var form = document.createElement("form");
+            form.setAttribute("method", "post");
+            form.setAttribute("action", "/mngr/ntcn/mssage/selectMssageSndngPopupForm"); // 데이터를 받을 URL
+            form.setAttribute("target", "SMS 발송"); // 위에서 생성한 팝업 이름
+
+            var reqTab = document.createElement("input");
+            reqTab.setAttribute("type", "hidden");
+            reqTab.setAttribute("name", "reqTab");
+            reqTab.setAttribute("value", "send");
+            form.appendChild(reqTab);
+
+            var mbtlnbObj = document.createElement("input");
+            mbtlnbObj.setAttribute("type", "hidden");
+            mbtlnbObj.setAttribute("name", "mbtlnb");
+            mbtlnbObj.setAttribute("value", mbtlnb);
+            form.appendChild(mbtlnbObj);
+
+            document.body.appendChild(form);
+
+            form.submit();
+            document.body.removeChild(form);
         }
 
         /* EMAIL 발송 팝업 화면 이동 */
@@ -1251,7 +1273,30 @@
                 return false;
             }
 
-            PopupCenter('/mngr/ntcn/email/selectEmailSndngPopupForm','EMAIL 발송','1400','840');
+            PopupCenter('','EMAIL 발송','1400','840');
+
+            var form = document.createElement("form");
+            form.setAttribute("method", "post");
+            form.setAttribute("action", "/mngr/ntcn/email/selectEmailSndngPopupForm"); // 데이터를 받을 URL
+            form.setAttribute("target", "EMAIL 발송"); // 위에서 생성한 팝업 이름
+
+            var reqTab = document.createElement("input");
+            reqTab.setAttribute("type", "hidden");
+            reqTab.setAttribute("name", "reqTab");
+            reqTab.setAttribute("value", "send");
+            form.appendChild(reqTab);
+
+            var emailObj = document.createElement("input");
+            emailObj.setAttribute("type", "hidden");
+            emailObj.setAttribute("name", "email");
+            emailObj.setAttribute("value", email);
+            form.appendChild(emailObj);
+
+            document.body.appendChild(form);
+
+            form.submit();
+            document.body.removeChild(form);
+
         }
 
         /* 메일 발송 내역 화면 이동 */
@@ -1262,7 +1307,7 @@
 
             $(form).attr('method', 'post');
             $(form).attr('target', '_blank');
-            $(form).attr('action', '<c:url value="/mngr/ntcn/email/selectEmailPassivSndngManage"/>');
+            $(form).attr('action', '<c:url value="/mngr/ntcn/email/selectEmailPassivSndngManage?reqTab=search"/>');
 
             $(form).appendTo('body');
 
@@ -1278,7 +1323,7 @@
 
             $(form).attr('method', 'post');
             $(form).attr('target', '_blank');
-            $(form).attr('action', '<c:url value="/mngr/ntcn/mssage/selectMssagePassivSndngManage"/>');
+            $(form).attr('action', '<c:url value="/mngr/ntcn/mssage/selectMssagePassivSndngManage?reqTab=search"/>');
 
             $(form).appendTo('body');