배송비 계산 수정(4)

fix : 상품 메뉴(카테고리) column 수 변경

Jenkinsfile

@@ -5,32 +5,23 @@ pipeline {
         jdk 'JDK17'
     }
 
-    // parameters {
-    //     choice(name: 'ENVIRONMENT', choices: ['dev'], description: '배포할 어플리케이션 profile 선택')
-    //     choice(name: 'DEPLOY_SERVER_IP', choices: ['172.31.14.11'], description: '배포할 WAS 서버 IP 선택')
-    //     string(name: 'GIT_REPO', defaultValue: 'http://172.31.18.11:3000/gcone/gconebo.git', description: 'Git 레파지토리 주소')
-    // }
-
-    // parameters {
-    //     choice(name: 'ENVIRONMENT', choices: ['stage'], description: '배포할 어플리케이션 profile 선택')
-    //     choice(name: 'DEPLOY_SERVER_IP', choices: ['10.100.51.11','10.100.51.12'], description: '배포할 WAS 서버 IP 선택')
-    //     string(name: 'GIT_REPO', defaultValue: 'http://172.31.18.11:3000/gcone/gconebo.git', description: 'Git 레파지토리 주소')
-    // }
-
     environment {
-        SERVER_IP = "${DEPLOY_SERVER_IP}"
+        SERVER_IP = "${DEPLOY_WAS_SERVER_IP}"
         SERVER_USER = "tomcat"
         TOMCAT_HOME = "${ENVIRONMENT == 'dev' ? '/var/lib/tomcat' : '/usr/local/tomcat'}"
         APP_NAME = "sakemall"
         ROOT_NAME = "ROOT"
         DEPLOY_PATH = "${TOMCAT_HOME}/webapps"
-        PROPERTY_PATH = "${DEPLOY_PATH}/${APP_NAME}/WEB-INF/classes"
+        PROPERTY_PATH = "${DEPLOY_PATH}/${ROOT_NAME}/WEB-INF/classes"
         BACKUP_PATH = "${DEPLOY_PATH}/backup"
         WAR_FILE = "${APP_NAME}.war"
         DEPLOY_FILE = "${DEPLOY_PATH}/${WAR_FILE}"
         BACKUP_FILE = "${BACKUP_PATH}/${WAR_FILE}.bak"
         PROPERTY_FILE = "${PROPERTY_PATH}/application-${ENVIRONMENT}.yml"
         GIT_BRANCH = "${ENVIRONMENT == 'dev' ? 'develop' : 'master'}"
+        NGINX_STATIC_PATH = "/var/www/sopmall"
+        NGINX_SERVER_IP = "${DEPLOY_WEB_SERVER_IP}"
+        NGINX_USER = "${ENVIRONMENT == 'dev' ? 'dev1' : 'ubuntu'}"
 //         SSH_KEY_PATH = "C:/Users/CHAMDAHAN-41/.ssh/id_rsa"
     }
 
@@ -40,33 +31,39 @@ pipeline {
             steps {
                 script {
                     try {
-						echo "Setup parameters ${ENVIRONMENT}"
+						echo "Setup parameters 출력"
 						echo "tomcat home here ${env.TOMCAT_HOME}"
+						echo "Setup parameters ${ENVIRONMENT}"
+						echo "Setup parameters 출력 종료"
 
 
 						if("${ENVIRONMENT}" == "dev" ) {
 							properties([
 		                        parameters([
                                     choice(name: 'ENVIRONMENT', choices: ['dev'], description: '배포할 어플리케이션 profile 선택'),
-                                    choice(name: 'DEPLOY_SERVER_IP', choices: ['172.31.14.11'], description: '배포할 WAS 서버 IP 선택'),
+                                    choice(name: 'DEPLOY_WAS_SERVER_IP', choices: ['00.00.00.00'], description: 'WAR 배포할 서버IP 선택'),
-                                    choice(name: 'DEPLOY_TARGET', choices: ['ALL', 'WEB_ONLY', 'WAS_ONLY', 'PROPERTY_ONLY'], description: '배포 대상 선택'),
+                                    choice(name: 'DEPLOY_WEB_SERVER_IP', choices: ['00.00.00.00'], description: 'STATIC RESOURCE 배포할 서버IP 선택'),
-                                    string(name: 'GIT_REPO', defaultValue: 'http://172.31.18.11:3000/gcone/gconebo.git', description: 'Git 레파지토리 주소')
+//                                     choice(name: 'DEPLOY_TARGET', choices: ['ALL', 'WEB_ONLY', 'WAS_ONLY', 'PROPERTY_ONLY'], description: '배포 대상 선택'),
+                                    string(name: 'GIT_REPO', defaultValue: 'http://115.68.207.90:3000/itfirst/sake.git', description: 'Git 레파지토리 URL'),
+                                    choice(name: 'DEPLOY_TARGET', choices: ['ALL', 'WEB_ONLY', 'WAS_ONLY'], description: '배포 대상 선택')
 		                        ])
 		                    ])
 						}else{
 							properties([
 		                        parameters([
                                     choice(name: 'ENVIRONMENT', choices: ['stage'], description: '배포할 어플리케이션 profile 선택'),
-                                    choice(name: 'DEPLOY_SERVER_IP', choices: ['10.100.51.11','10.100.51.12'], description: '배포할 WAS 서버 IP 선택'),
+                                    choice(name: 'DEPLOY_WAS_SERVER_IP', choices: ['10.2.2.148'], description: 'WAR 배포할 서버IP 선택'),
-                                    choice(name: 'DEPLOY_TARGET', choices: ['ALL', 'WEB_ONLY', 'WAS_ONLY', 'PROPERTY_ONLY'], description: '배포 대상 선택'),
+                                    choice(name: 'DEPLOY_WEB_SERVER_IP', choices: ['10.2.2.237'], description: 'STATIC RESOURCE 배포할 서버IP 선택'),
-                                    string(name: 'GIT_REPO', defaultValue: 'http://172.31.18.11:3000/gcone/gconebo.git', description: 'Git 레파지토리 주소')
+//                                     choice(name: 'DEPLOY_TARGET', choices: ['ALL', 'WEB_ONLY', 'WAS_ONLY', 'PROPERTY_ONLY'], description: '배포 대상 선택'),
+                                    string(name: 'GIT_REPO', defaultValue: 'http://115.68.207.90:3000/itfirst/sake.git', description: 'Git 레파지토리 URL'),
+                                    choice(name: 'DEPLOY_TARGET', choices: ['ALL', 'WEB_ONLY', 'WAS_ONLY'], description: '배포 대상 선택')
 		                        ])
 		                    ])
 						}
 
 
                     } catch (Exception e) {
-                        error "Checkout 실패: ${e.getMessage()}"
+                        error "Setup parameters 실패: ${e.getMessage()}"
                     }
                 }
             }
@@ -87,41 +84,93 @@ pipeline {
             }
         }
 
-        stage('Deploy only property') {
+        stage('Prepare and Deploy Static Resources') {
             when {
-                expression { params.DEPLOY_TARGET in ['PROPERTY_ONLY'] }
+                expression { params.DEPLOY_TARGET in ['ALL', 'WEB_ONLY'] }
             }
             steps {
                 script {
-                    sshPut remote: [
+                    // Static 리소스 준비 (Windows 환경)
-                        name: 'WAS Server',
+                    sh 'mkdir static_resources'
-                        host: "${env.SERVER_IP}",
+                    sh 'cp -rf src/main/resources/static/* static_resources/'
-                        user: "${env.SERVER_USER}",
-                        identityFile: "${env.SSH_KEY_PATH}",
-                        allowAnyHosts: true
-                    ], from: "src/main/resources/application-${params.ENVIRONMENT}.yml", into: "${env.PROPERTY_FILE}"
 
-                    // acutuator 호출
+                    // Static 리소스 압축 (static_resources 디렉토리 안의 내용만 압축)
+                    sh 'tar -cvf static_resources.tar -C static_resources .'
+
+                    // Nginx 서버로 Static 리소스 압축 파일 배포
                     sshCommand remote: [
                         name: 'Nginx Server',
-                        host: "${env.SERVER_IP}",
+                        host: "${env.NGINX_SERVER_IP}",
-                        user: "${env.SERVER_USER}",
+                        user: "${env.NGINX_USER}",
                         identityFile: "${env.SSH_KEY_PATH}",
                         allowAnyHosts: true
-                    ], command: "curl -X POST http://${env.SERVER_IP}:18210/actuator/refresh"
+                    ], command: "mkdir -p ${env.NGINX_STATIC_PATH}"
 
-                    echo "application-${params.ENVIRONMENT}.yml 배포 완료"
+                    sshPut remote: [
+                        name: 'Nginx Server',
+                        host: "${env.NGINX_SERVER_IP}",
+                        user: "${env.NGINX_USER}",
+                        identityFile: "${env.SSH_KEY_PATH}",
+                        allowAnyHosts: true
+                    ], from: 'static_resources.tar', into: "${env.NGINX_STATIC_PATH}"
+
+                    // Nginx 서버에서 압축 해제
+                    sshCommand remote: [
+                        name: 'Nginx Server',
+                        host: "${env.NGINX_SERVER_IP}",
+                        user: "${env.NGINX_USER}",
+                        identityFile: "${env.SSH_KEY_PATH}",
+                        allowAnyHosts: true
+                    ], command: """
+                        cd ${env.NGINX_STATIC_PATH}
+                        tar -xvf static_resources.tar
+                        rm static_resources.tar
+                    """
+
+                    echo "Static 리소스가 압축되어 Nginx 서버로 배포 및 압축 해제 완료"
                 }
             }
         }
 
+//         stage('Deploy only property') {
+//             when {
+//                 expression { params.DEPLOY_TARGET in ['PROPERTY_ONLY'] }
+//             }
+//             steps {
+//                 script {
+//                     sshPut remote: [
+//                         name: 'WAS Server',
+//                         host: "${env.SERVER_IP}",
+//                         user: "${env.SERVER_USER}",
+//                         identityFile: "${env.SSH_KEY_PATH}",
+//                         allowAnyHosts: true
+//                     ], from: "src/main/resources/application-${params.ENVIRONMENT}.yml", into: "${env.PROPERTY_FILE}"
+//
+//                     // acutuator 호출
+//                     sshCommand remote: [
+//                         name: 'Nginx Server',
+//                         host: "${env.SERVER_IP}",
+//                         user: "${env.SERVER_USER}",
+//                         identityFile: "${env.SSH_KEY_PATH}",
+//                         allowAnyHosts: true
+//                     ], command: "curl -X POST http://${env.SERVER_IP}:18210/actuator/refresh"
+//
+//                     echo "application-${params.ENVIRONMENT}.yml 배포 완료"
+//                 }
+//             }
+//         }
+
+
+
         stage('Build') {
+            when {
+                expression { params.DEPLOY_TARGET in ['ALL', 'WAS_ONLY'] }
+            }
             steps {
                 script {
                     try {
-                        // sh 'chmod +x gradlew'
+                        sh 'chmod +x gradlew'
-                        // sh "./gradlew clean war -x test -Pprofile=${params.ENVIRONMENT}"
+                        sh "./gradlew clean war -x test -Pprofile=${params.ENVIRONMENT}"
-                        bat "./gradlew.bat clean build -Pprofile=${params.ENVIRONMENT}"
                         echo "Build 성공"
                     } catch (Exception e) {
                         error "Build 실패: ${e.getMessage()}"
@@ -131,11 +180,13 @@ pipeline {
         }
 
         stage('Unit Tests') {
+            when {
+                expression { params.DEPLOY_TARGET in ['ALL', 'WAS_ONLY'] }
+            }
             steps {
                 script {
                     try {
-                        // sh "./gradlew test"
+                        sh "./gradlew test"
-                        bat "./gradlew.bat test"
                         echo "Unit Tests 성공"
                     } catch (Exception e) {
                         error "Unit Tests 실패: ${e.getMessage()}"
@@ -145,6 +196,9 @@ pipeline {
         }
 
         stage('Backup') {
+            when {
+                expression { params.DEPLOY_TARGET in ['ALL', 'WAS_ONLY'] }
+            }
             steps {
                 script {
                     sshCommand remote: [
@@ -168,6 +222,9 @@ pipeline {
         }
 
         stage('Deploy to Tomcat') {
+            when {
+                expression { params.DEPLOY_TARGET in ['ALL', 'WAS_ONLY'] }
+            }
             steps {
                 script {
                     sshPut remote: [
@@ -185,13 +242,12 @@ pipeline {
                         identityFile: "${env.SSH_KEY_PATH}",
                         allowAnyHosts: true
                     ], command: """
-                        if nc -z localhost 8006; then
+                        if nc -z localhost 8005; then
                             echo "Tomcat이 실행 중입니다. 종료 중..."
                             ${env.TOMCAT_HOME}/bin/shutdown.sh
-                            sleep 60
+                            sleep 5
-                            rm -rf ${env.TOMCAT_HOME}/webapps/${env.APP_NAME}
                             rm -rf ${env.TOMCAT_HOME}/webapps/${env.ROOT_NAME}
-                            sleep 60
+                            sleep 5
                         else
                             echo "Tomcat이 실행 중이지 않습니다."
                         fi
@@ -211,32 +267,44 @@ pipeline {
         failure {
             script {
                 echo '배포에 실패했습니다. 이전 버전으로 롤백을 시도합니다.'
-                sshCommand remote: [
+                if (params.DEPLOY_TARGET in ['ALL', 'WAS_ONLY']) {
-                    name: 'WAS Server',
+                    // WAR 파일 롤백
-                    host: "${env.SERVER_IP}",
+                    sshCommand remote: [
-                    user: "${env.SERVER_USER}",
+                        name: 'WAS Server',
-                    identityFile: "${env.SSH_KEY_PATH}",
+                        host: "${env.SERVER_IP}",
-                    allowAnyHosts: true
+                        user: "${env.SERVER_USER}",
-                ], command: """
+                        identityFile: "${env.SSH_KEY_PATH}",
-                    if [ -f ${env.BACKUP_FILE} ]; then
+                        allowAnyHosts: true
-                        cp ${env.BACKUP_FILE} ${env.DEPLOY_FILE}
+                    ], command: """
-                        if nc -z localhost 8006; then
+                        if [ -f ${env.BACKUP_FILE} ]; then
-                            echo "Tomcat이 실행 중입니다. 종료 중..."
+                            cp ${env.BACKUP_FILE} ${env.DEPLOY_FILE}
-                            ${env.TOMCAT_HOME}/bin/shutdown.sh
+                            if nc -z localhost 8005; then
-                            sleep 10
+                                echo "Tomcat이 실행 중입니다. 종료 중..."
+                                ${env.TOMCAT_HOME}/bin/shutdown.sh
+                                sleep 5
+                            else
+                                echo "Tomcat이 실행 중이지 않습니다."
+                            fi
+                            ${env.TOMCAT_HOME}/bin/startup.sh
+                            echo "롤백 완료"
                         else
-                            echo "Tomcat이 실행 중이지 않습니다."
+                            echo "백업 파일이 존재하지 않아 롤백할 수 없습니다."
                         fi
-                        ${env.TOMCAT_HOME}/bin/startup.sh
+                    """
-                        echo "롤백 완료"
+                }
-                    else
+                if (params.DEPLOY_TARGET in ['ALL', 'WEB_ONLY']) {
-                        echo "백업 파일이 존재하지 않아 롤백할 수 없습니다."
+                    echo "Static 리소스 롤백이 필요합니다. 수동으로 진행해 주세요."
-                    fi
+                }
-                """
             }
         }
         always {
-            echo '파이프라인 실행이 종료되었습니다.'
+            script {
+                echo '파이프라인 실행이 종료되었습니다.'
+                if (params.DEPLOY_TARGET in ['ALL', 'WEB_ONLY']) {
+                    // 임시 디렉토리 정리
+                    sh 'rm -rf static_resources'
+                }
+            }
         }
     }
 }

build.gradle

@@ -33,8 +33,8 @@ repositories {
 
 dependencies {
 
-    implementation 'javax.mail:javax.mail-api:1.6.2'
+//    implementation 'javax.mail:javax.mail-api:1.6.2'
-    implementation 'com.sun.mail:javax.mail:1.6.2'
+    implementation 'com.sun.mail:jakarta.mail:2.0.1'
 
     implementation 'org.springframework.cloud:spring-cloud-starter'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'

src/main/java/com/wb/domainserver/common/mvc/tags/ui/pagination/ImagePaginationRenderer.java

@@ -34,7 +34,7 @@ public class ImagePaginationRenderer extends AbstractPaginationRenderer implemen
 		//previousPageLabel = "<li><a href=\"?pageIndex={1}\" onclick=\"{0}({1});return false; \"><img src=\"" + servletContext.getContextPath() +  "/images/egovframework/com/cmm/mod/icon/icon_prev.gif\"    alt=\"이전\"   border=\"0\"/></a></li>";
 		previousPageLabel = "<button class=\"pagination__item prev\" onclick=\"{0}({1});return false; \"><span class=\"visually-hidden\">이전 페이지로</span></button>";
         //currentPageLabel  = "<li><strong>{0}</strong></li>";
-		currentPageLabel  = "<li><button class=\"pagination__item active\"><span>{0}</span></button></li>";
+		currentPageLabel  = "<li><button class=\"pagination__item active\" onclick=\"return false; \"><span>{0}</span></button></li>";
         //otherPageLabel    = "<li><a href=\"?pageIndex={1}\" onclick=\"{0}({1});return false; \">{2}</a></li>";
 		otherPageLabel    = "<li><button class=\"pagination__item\" onclick=\"{0}({1});return false; \"><span>{2}</span></button></li>";
         //nextPageLabel     = "<li>&#160;<a href=\"?pageIndex={1}\" onclick=\"{0}({1});return false; \"><img src=\"" + servletContext.getContextPath() +  "/images/egovframework/com/cmm/mod/icon/icon_next.gif\"    alt=\"다음\"   border=\"0\"/></a></li>";

src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/controller/BOMaMtngController.java

@@ -286,6 +286,13 @@ public class BOMaMtngController {
 				return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
 			}
 		} else {
+//			if (CollectionUtils.isEmpty(multiOrdrDlvylc)) {
+//				log.info("배송지 정보를 찾을 수 없습니다.");
+//				content.put("result","Y");
+//				content.put("message", "배송지 정보를 찾을 수 없습니다.");
+//				//            throw new WnbtRestException("주문유형 정보를 찾을 수 없습니다.");
+//				return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
+//			}
 			if (CollectionUtils.isEmpty(shipping)) {
 				log.info("배송지 정보를 찾을 수 없습니다.");
 				content.put("result","Y");
@@ -322,27 +329,91 @@ public class BOMaMtngController {
 		String[] receptMbtlnbArray = null; // 배송지 받는이 휴대폰번호
 
         if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원개인결제, 정기배송
-			if (
+			if (!CollectionUtils.isEmpty(multiOrdrDlvylc)) {
-					StringUtil.isEmpty((String) shipping.get("dlvylcZip")) ||
+
-					StringUtil.isEmpty((String) shipping.get("dlvylcAdresDvCd")) ||
+				// 배송지 리스트
-					( "01".equals(shipping.get("dlvylcAdresDvCd")) && StringUtil.isEmpty((String) shipping.get("dlvylcRnmAdres")) ) ||
+				List<LinkedHashMap<String, Object>> dlvylcListMulti = (List<LinkedHashMap<String, Object>>) multiOrdrDlvylc.get("dlvylc");
-					( "02".equals(shipping.get("dlvylcAdresDvCd")) && StringUtil.isEmpty((String) shipping.get("dlvylcLnbAdres")) ) ||
+
-					StringUtil.isEmpty((String) shipping.get("dlvylcAdresDtl"))
+				/** ----------------------------------------------- 배송지별 주문 상품 수량 검사 START ----------------------------------------------- */
-			) {
+				content = checkDistributedQyMatchesOrder(goodsList, dlvylcListMulti);
-				content.put("result","Y");
+				if (!"0".equals(content.get("status"))) {
-				content.put("message", "배송지 정보를 찾을 수 없습니다. 다시 시도해 주세요.");
+					return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
-				return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
+				}
+				/** ----------------------------------------------- 배송지별 주문 상품 수량 검사 END ----------------------------------------------- */
+
+				// 부정판매 체크를 위한 배송지 정렬
+				if (!CollectionUtils.isEmpty(dlvylcListMulti)) {
+
+					boolean hasInvalidAddress = dlvylcListMulti.stream().anyMatch(map -> {
+						String dlvylcZip = StringUtil.isNullToString(map.get("dlvylcZip"));
+						String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
+						String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
+						String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
+						String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
+
+						return StringUtil.isEmpty(dlvylcZip)
+								|| StringUtil.isEmpty(adresDvCd)
+								|| ("01".equals(adresDvCd) && StringUtil.isEmpty(dlvylcRnmAdres))
+								|| ("02".equals(adresDvCd) && StringUtil.isEmpty(dlvylcLnbAdres))
+								|| StringUtil.isEmpty(adresDtl);
+					});
+
+					if (hasInvalidAddress) {
+						content.put("result","Y");
+						content.put("message", "배송지 정보를 찾을 수 없습니다. 다시 시도해 주세요.");
+						return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
+					}
+
+					List<String> adresList = dlvylcListMulti.stream()
+							.map(map -> {
+								String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
+								String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
+								String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
+								String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
+								String adresMulti;
+								if ("01".equals(adresDvCd)) {
+									adresMulti = dlvylcRnmAdres + " " + adresDtl;
+								} else {
+									adresMulti = dlvylcLnbAdres + " " + adresDtl;
+								}
+
+								return adresMulti;
+							})
+							.collect(Collectors.toList());
+
+					adresArray = adresList.toArray(new String[0]);
+
+					List<String> receptMbtlnbList = dlvylcListMulti.stream()
+							.map(map -> {
+								return StringUtil.isNullToString(map.get("recpntMbtlnb"));
+							})
+							.collect(Collectors.toList());
+
+					receptMbtlnbArray = receptMbtlnbList.toArray(new String[0]);
+
+				}
 			}
-
+//			if (
-            String dlvylcAdresDvCd = (String) shipping.get("dlvylcAdresDvCd");
+//					StringUtil.isEmpty((String) shipping.get("dlvylcZip")) ||
-            String dlvylcLnbAdres = (String) shipping.get("dlvylcLnbAdres");
+//					StringUtil.isEmpty((String) shipping.get("dlvylcAdresDvCd")) ||
-            String dlvylcRnmAdres = (String) shipping.get("dlvylcRnmAdres");
+//					( "01".equals(shipping.get("dlvylcAdresDvCd")) && StringUtil.isEmpty((String) shipping.get("dlvylcRnmAdres")) ) ||
-            String dlvylcAdresDtl = (String) shipping.get("dlvylcAdresDtl");
+//					( "02".equals(shipping.get("dlvylcAdresDvCd")) && StringUtil.isEmpty((String) shipping.get("dlvylcLnbAdres")) ) ||
-
+//					StringUtil.isEmpty((String) shipping.get("dlvylcAdresDtl"))
-            adres = "01".equals(dlvylcAdresDvCd) ? dlvylcRnmAdres + " " + dlvylcAdresDtl : dlvylcLnbAdres + " " + dlvylcAdresDtl;
+//			) {
-
+//				content.put("result","Y");
-			String recpntMbtlnb = StringUtil.isNullToString(shipping.get("recpntMbtlnb"));
+//				content.put("message", "배송지 정보를 찾을 수 없습니다. 다시 시도해 주세요.");
-			receptMbtlnbArray = new String[]{recpntMbtlnb};
+//				return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
+//			}
+//
+//            String dlvylcAdresDvCd = (String) shipping.get("dlvylcAdresDvCd");
+//            String dlvylcLnbAdres = (String) shipping.get("dlvylcLnbAdres");
+//            String dlvylcRnmAdres = (String) shipping.get("dlvylcRnmAdres");
+//            String dlvylcAdresDtl = (String) shipping.get("dlvylcAdresDtl");
+//
+//            adres = "01".equals(dlvylcAdresDvCd) ? dlvylcRnmAdres + " " + dlvylcAdresDtl : dlvylcLnbAdres + " " + dlvylcAdresDtl;
+//
+//			String recpntMbtlnb = StringUtil.isNullToString(shipping.get("recpntMbtlnb"));
+//			receptMbtlnbArray = new String[]{recpntMbtlnb};
         } else if ("05".equals(ordrTyCd)) { // 여러곳 배송
 			if (!CollectionUtils.isEmpty(multiOrdrDlvylc)) {
 

src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/service/BOMaMtngService.java

@@ -406,6 +406,8 @@ public class BOMaMtngService {
 		List<LinkedHashMap> goodsList = (List<LinkedHashMap>) param.get("goodsList"); // 상품정보
 		LinkedHashMap enuri = (LinkedHashMap) param.get("enuri"); // 할인정보
 
+		log.debug("selectBOPreOrderValidationList-goodsList: {}",goodsList);
+
 		//사용한 장바구니 쿠폰
 		//비회원의 경우 enuri 자체가 없어서 isEmpty 확인
 		List<LinkedHashMap> usedCartCouponList = new ArrayList<>();

src/main/java/com/wb/domainserver/domain/admin/login/AdminLoginController.java

@@ -116,6 +116,10 @@ public class AdminLoginController {
 
        loginRequest.setConectBrwsr(browser);
 
+       String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
+       log.debug("admin loginProcess accessUrl :: {}", accessUrl);
+       loginRequest.setAccessUrl(accessUrl);
+
        loginUser = service.adminLogin(loginRequest);
        loginUser.setSysDvCd("02");
 
@@ -262,6 +266,10 @@ public class AdminLoginController {
         vo.setMngrId(loginRequest.getUsername());
         vo.setPassword(loginRequest.getPassword());
 
+        String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
+        log.debug("admin loginCheck accessUrl :: {}", accessUrl);
+        loginRequest.setAccessUrl(accessUrl);
+
         String secretKey = commonService.selectSecretkey();
         vo.setSecretKey(secretKey);
 

src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java

@@ -133,7 +133,7 @@ public class MaMbrgradController {
 		srchData.put("maMbrGradVO", vo);
 		srchData.put("mbrGradInfo", mbrGradInfo);
 
-		model.addAttribute("resultMap", mbrGradInfo);
+		model.addAttribute("resultMap", srchData);
 //		responseHandler.handleResponse(
 //				sendToResrc.ofPost(RESRC.GCONEBO, "/admin/store/mbrgrad/selectBOMbrGradUpdtForm", vo),
 //				model,

src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java

@@ -97,4 +97,6 @@ public class BOMaMbrgradVO extends AbstractVO {
 	/*서버구분*/
 	private String serverDv;
 	private String pageDv;
+
+	private String srchCalcCndDvCds;
 }

src/main/java/com/wb/domainserver/domain/admin/store/sopmal/vo/BOMaSopmalVO.java

@@ -138,6 +138,12 @@ public class BOMaSopmalVO extends AbstractVO {
 	/** 주문 자동 구매확정 기간 */
 	private String ordrAtmcPurchsDcsnPd;
 
+	/** 1엔 환율(살때) */
+	private String buyRate;
+
+	/** 1엔 환율(팔때) */
+	private String sellRate;
+
 	/** 마일리지 보유 사용 금액 */
 	private String mlgHoldUseAmt;
 
@@ -495,6 +501,9 @@ public class BOMaSopmalVO extends AbstractVO {
 	/** 회원가입 주요문구 */
 	private String joinComptWords;
 
+	/** 구독서비스 안내문구 */
+	private String subsvcGuidanceWords;
+
 	/** 회원등급 정보 */
 	private String mbrGradGroupNm;
 	private String pageDv;

src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java

@@ -126,7 +126,6 @@ public class MaCtgryController {
 	@RequestMapping(value = "/updateCtgryUpdt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<WnbtResponse> updateCtgryUpdt(BOMaCtgryVO vo, HttpServletRequest request) {
 
-
 		request.setAttribute("shopCd", vo.getSopmalCd());
 		request.setAttribute("pathGubun", "ETCM");
 		request.setAttribute("subPathId", "");

src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/vo/BOMaCtgryVO.java

@@ -40,9 +40,9 @@ public class BOMaCtgryVO extends AbstractVO {
     /**	노출구분	*/
     private String expsrCd;
     /**	노출구분 시작일자	*/
-    private java.sql.Timestamp expsrBgnDt;
+    private String expsrBgnDt;
     /**	노출구분 종료자	*/
-    private java.sql.Timestamp expsrEndDt;
+    private String expsrEndDt;
     /**	url 자동여부	*/
     private String urlDvCd;
     /**	url	*/

src/main/java/com/wb/domainserver/domain/admin/user/mngr/service/BOJobUserService.java

@@ -322,13 +322,15 @@ public class BOJobUserService {
 
 
 			// 일치하면 1, 불일치하면 0 반환
+			log.debug("encodedPwd:{}", encodedPwd);
+			log.debug("newPwd:{}", newPwd);
 
 			if (encodedPwd.equals(newPwd)) {
 				result = 1;
 			} else {
 				result = 0;
 			}
-
+			log.debug("result:{}", result);
 		} catch (WnbtRestException wre){
 			throw new WnbtRestException(wre.getMessage());
 		} catch (Exception e) {

src/main/java/com/wb/domainserver/domain/gcone/bbs/bbs/vo/BOBbsVO.java

@@ -355,16 +355,16 @@ public class BOBbsVO extends AbstractVO {
 
 	private String bbscttlRedngAuthorDvCd;
 
-	public void setBbscttRedngAuthorDvCd_c(String[] bbscttRedngAuthorDvCd_c) {
+//	public void setBbscttRedngAuthorDvCd_c(String[] bbscttRedngAuthorDvCd_c) {
-		this.redngAuthorDvCdArr = bbscttRedngAuthorDvCd_c;
+//		this.redngAuthorDvCdArr = bbscttRedngAuthorDvCd_c;
-	}
+//	}
-	public void setBbscttRegistAuthorDvCd_c(String[] bbscttRegistAuthorDvCd_c) {
+//	public void setBbscttRegistAuthorDvCd_c(String[] bbscttRegistAuthorDvCd_c) {
-		this.registAuthorDvCdArr = bbscttRegistAuthorDvCd_c;
+//		this.registAuthorDvCdArr = bbscttRegistAuthorDvCd_c;
-	}
+//	}
-	public void setAnswRegistAuthorDvCd_c(String[] answRegistAuthorDvCd_c) {
+//	public void setAnswRegistAuthorDvCd_c(String[] answRegistAuthorDvCd_c) {
-		this.answRegistAuthorDvCdArr = answRegistAuthorDvCd_c;
+//		this.answRegistAuthorDvCdArr = answRegistAuthorDvCd_c;
-	}
+//	}
-	public void setCmRegistAuthorDvCd_c(String[] cmRegistAuthorDvCd_c) {
+//	public void setCmRegistAuthorDvCd_c(String[] cmRegistAuthorDvCd_c) {
-		this.cmRegistAuthorDvCdArrArr = cmRegistAuthorDvCd_c;
+//		this.cmRegistAuthorDvCdArrArr = cmRegistAuthorDvCd_c;
-	}
+//	}
 }

src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/mapper/BOGnrlbbscttMapper.java

@@ -81,6 +81,10 @@ public interface BOGnrlbbscttMapper {
 	/*사용자 > 이용안내 조회*/
 	public List<DataMap> selectUseGuidanceCn(BOGnrlbbscttVO bbsctt);
 
+	/**********1:1문의**********/
+	/*1:1문의 목록 조회*/
+	public List<DataMap> selectBOM2mBbscttListInqire(BOGnrlbbscttVO bbsctt);
+
 	/*******************
 	 * 게시글 상세 조회
 	 *******************/
@@ -181,6 +185,9 @@ public interface BOGnrlbbscttMapper {
 	/** 게시글 연관 상품 등록 */
 	public void insertBOBbscttGoods(BOGnrlbbscttVO bbsctt);
 
+	/** 게시글 연관 주문 등록 (1:1문의) */
+	public void insertBOBbscttM2mGoods(BOGnrlbbscttVO bbsctt);
+
 	/** 게시글 상세조회(연관상품목록) */
 	public List<DataMap> selectBOBbscttDtlGoods(BOGnrlbbscttVO bbsctt);
 	

src/main/java/com/wb/domainserver/domain/gcone/bbs/gnrlbbsctt/service/BOGnrlbbscttService.java

@@ -32,6 +32,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static java.lang.Integer.parseInt;
+
 /**
  * 게시글 관리 Service
  *
@@ -334,6 +336,15 @@ public class BOGnrlbbscttService {
                     resultList = mapper.selectBOEvtBbscttListInqire(bbsctt);
                 }
                 break;
+            case "12": //1:1문의
+                resultList = mapper.selectBOM2mBbscttListInqire(bbsctt);
+                if(resultList != null && resultList.size() !=0){
+                    resultCnt.setTotCnt(((BigInteger) resultList.get(0).get("totCnt")).intValue());
+                    bbsctt.getPaginationInfo().setTotalRecordCount(((BigInteger) resultList.get(0).get("totCnt")).intValue());
+                }else{
+                    resultCnt.setTotCnt(0);
+                }
+                break;
         }
 
         /*비속어 필터*/
@@ -888,6 +899,12 @@ public class BOGnrlbbscttService {
                             mapper.insertBOBbscttGoods(bbsctt);
                         }
                     }
+                    /*1:1문의 (반품문의)는 주문번호 등록*/
+                    if("12".equals(bbsctt.getBbsTyCd())){
+                        if(bbsctt.getOrdrInnb() != null){
+                            mapper.insertBOBbscttM2mGoods(bbsctt);
+                        }
+                    }
                     message.put("result", "success");
                     /*마일리지 적립 시 게시글고유번호 파라미터*/
                     message.put("bbscttInnb", bbsctt.getBbscttInnb());
@@ -1085,30 +1102,33 @@ public class BOGnrlbbscttService {
                         }
                     }
                 }
-                //게시글 연관 상품 삭제
+                /*1:1 문의 게시판이 아닌경우만 처리 */
-                mapper.deleteBOBbscttGoods(bbsctt);
+                if("12".equals(bbsctt.getBbsTyCd())){
-                //게시글 연관 상품 등록(fm_boarddata_goods)
+                    //게시글 연관 상품 삭제
-                if (bbsctt.getGoodsInnbArr() != null) {
+                    mapper.deleteBOBbscttGoods(bbsctt);
+                    //게시글 연관 상품 등록(fm_boarddata_goods)
                     if (bbsctt.getGoodsInnbArr() != null) {
-                        for (int i = 0; bbsctt.getGoodsInnbArr().size() > i; i++) {
+                        if (bbsctt.getGoodsInnbArr() != null) {
-                            bbsctt.setGoodsInnb(bbsctt.getGoodsInnbArr().get(i));
+                            for (int i = 0; bbsctt.getGoodsInnbArr().size() > i; i++) {
-                            if ("06".equals(bbsctt.getBbsTyCd()) || "07".equals(bbsctt.getBbsTyCd())) {
+                                bbsctt.setGoodsInnb(bbsctt.getGoodsInnbArr().get(i));
-                                if (bbsctt.getOrdrGoodsOptnInnbArr() != null) {
+                                if ("06".equals(bbsctt.getBbsTyCd()) || "07".equals(bbsctt.getBbsTyCd())) {
-                                    if (!"goodsNone".equals(bbsctt.getOrdrGoodsOptnInnbArr().get(i))) {
+                                    if (bbsctt.getOrdrGoodsOptnInnbArr() != null) {
-                                        bbsctt.setOrdrGoodsOptnInnb(bbsctt.getOrdrGoodsOptnInnbArr().get(i));
+                                        if (!"goodsNone".equals(bbsctt.getOrdrGoodsOptnInnbArr().get(i))) {
-                                    }
+                                            bbsctt.setOrdrGoodsOptnInnb(bbsctt.getOrdrGoodsOptnInnbArr().get(i));
-                                }
+                                        }
-                                if (bbsctt.getReOrderAtArr() != null) {
+                                    }
-                                    if (bbsctt.getReOrderAtArr().get(i) != null) {
+                                    if (bbsctt.getReOrderAtArr() != null) {
-                                        bbsctt.setReOrderAt(bbsctt.getReOrderAtArr().get(i));
+                                        if (bbsctt.getReOrderAtArr().get(i) != null) {
+                                            bbsctt.setReOrderAt(bbsctt.getReOrderAtArr().get(i));
+                                        }
                                     }
                                 }
+                                mapper.insertBOBbscttGoods(bbsctt);
                             }
-                            mapper.insertBOBbscttGoods(bbsctt);
                         }
                     }
                 }
-            }
+           }
             message.put("result", "success");
         } catch (WnbtRestException wre) {
             throw new WnbtRestException(wre.getMessage());

src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java

@@ -81,19 +81,6 @@ public class BOOrderService {
         log.debug("결제정보 => {} ", new Gson().toJson(setle));
         log.debug("사은품 => {} ", new Gson().toJson(prsntList));
 
-        /** 여러곳 배송 배송지 세팅 시작 */
-        LinkedHashMap<String, Object> multiOrdrDlvylcMap = new LinkedHashMap<>();
-        List<LinkedHashMap<String, Object>> dlvylcListMulti = new ArrayList<>();
-
-        multiOrdrDlvylcMap = (LinkedHashMap) param.get("multiOrdrDlvylc");
-        log.debug("multiOrdrDlvylcMap : {}", multiOrdrDlvylcMap);
-        if (!CollectionUtils.isEmpty(multiOrdrDlvylcMap)) {
-            // 배송지 리스트
-            dlvylcListMulti = (List<LinkedHashMap<String, Object>>) multiOrdrDlvylcMap.get("dlvylc");
-            log.debug("dlvylcListMulti : {}", dlvylcListMulti);
-        }
-        /** 여러곳 배송 배송지 세팅 종료 */
-
         String sopmalCd = "";
         if("01".equals(user.getSysDvCd())){
              sopmalCd = user.getSopmalCd();
@@ -103,6 +90,85 @@ public class BOOrderService {
 
         String ordrTyCd = (String) param.get("ordrTyCd");
 
+        log.debug("insertMngrOrdrRegist-param : {}", param);
+
+        /* *****************************
+            0. 여러곳 배송 배송지 세팅
+         ***************************** */
+        /** 여러곳 배송 배송지 세팅 시작 */
+        LinkedHashMap<String, Object> multiOrdrDlvylcMap = new LinkedHashMap<>();
+        List<LinkedHashMap<String, Object>> dlvylcListMulti = new ArrayList<>();
+        multiOrdrDlvylcMap = (LinkedHashMap) param.get("multiOrdrDlvylc");
+        log.debug("multiOrdrDlvylcMap : {}", multiOrdrDlvylcMap);
+
+        if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송
+
+            for(int i=0;i<goodsList.size();i++) {
+                int goodsQy = (int) goodsList.get(i).get("qy");
+                int dlvyGroupInnb = (int) goodsList.get(i).get("dlvyGroupInnb");
+                String sopmalCode = sopmalCd;
+
+                DataMap shippingParam = new DataMap() {{
+                    put("dlvyGroupInnb", dlvyGroupInnb);
+                    put("sopmalCd", sopmalCode);
+                }};
+
+                DataMap shippingGrouping = mapper.selectShippingGrouping(shippingParam);
+
+                BigDecimal itemDftDlvyAmt = (BigDecimal) shippingGrouping.get("dftDlvyAmt"); // 기본배송비
+                BigDecimal itemDlvyAmt = itemDftDlvyAmt; // 배송비
+//                String dlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt"); // 도서산간 추가 배송비 조건
+//                BigDecimal areaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt"); // 도서산간 추가 배송비
+
+                List<LinkedHashMap> itemGoodsList = new ArrayList<>();
+                itemGoodsList.add(goodsList.get(i));
+                for (LinkedHashMap<String, Object> itemGoodsMap : itemGoodsList) {
+                    itemGoodsMap.put("qy", 1);
+                }
+                List<LinkedHashMap> itempPrsntList = new ArrayList<>();
+                if(!prsntList.isEmpty()){
+                    itempPrsntList.add(prsntList.get(i));
+                    for (LinkedHashMap<String, Object> itemPrsntMap : itempPrsntList) {
+                        itemPrsntMap.put("qy", 1);
+                    }
+                }
+
+                for(int j=0;j<goodsQy;j++) {
+                    LinkedHashMap<String, Object> dlvyMap = new LinkedHashMap<>();
+
+                    dlvyMap.put("dftDlvyAmt", itemDftDlvyAmt.intValue());
+                    dlvyMap.put("dlvyAmt", itemDlvyAmt.intValue());
+                    dlvyMap.put("couponInnb", 0);
+                    dlvyMap.put("dwldCouponInnb", 0);
+                    dlvyMap.put("dplctDscntAt", "");
+                    dlvyMap.put("otrCouponSmtmUseAt", "");
+                    dlvyMap.put("mngrFreeDlvyUseAt", "N");
+                    dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip"));
+                    dlvyMap.put("recpntNm", shipping.get("recpntNm"));
+                    dlvyMap.put("recpntMbtlnb", shipping.get("recpntMbtlnb"));
+                    dlvyMap.put("dlvylcAdresDvCd", shipping.get("dlvylcAdresDvCd"));
+                    dlvyMap.put("dlvylcLnbAdres", shipping.get("dlvylcLnbAdres"));
+                    dlvyMap.put("dlvylcRnmAdres", shipping.get("dlvylcRnmAdres"));
+                    dlvyMap.put("dlvylcAdresDtl", shipping.get("dlvylcAdresDtl"));
+                    dlvyMap.put("dlvyMssageCn", shipping.get("dlvyMssageCn"));
+                    dlvyMap.put("goodsList", itemGoodsList);
+                    dlvyMap.put("prsntList", itempPrsntList); //prsntList.get(i));
+
+                    dlvylcListMulti.add(dlvyMap);
+                }
+            }
+
+
+
+        } else if ("05".equals(ordrTyCd)) { // 여러곳 배송, 선물하기
+            if (!CollectionUtils.isEmpty(multiOrdrDlvylcMap)) {
+                // 배송지 리스트
+                dlvylcListMulti = (List<LinkedHashMap<String, Object>>) multiOrdrDlvylcMap.get("dlvylc");
+                log.debug("dlvylcListMulti : {}", dlvylcListMulti);
+            }
+        }
+        /** 여러곳 배송 배송지 세팅 종료 */
+
         /* *****************************
             1. 주문등록(GC_ORDER)
          ***************************** */
@@ -128,122 +194,387 @@ public class BOOrderService {
 
         BOOrderShippingVO shippingEscrowVO = new BOOrderShippingVO();
         if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송
-            BOOrderShippingVO shippingVO = new BOOrderShippingVO();
+            log.debug("여러곳 배송 > 배송지별 배송정보 => {} ", new Gson().toJson(dlvylcListMulti));
 
-            shippingVO.setSopmalCd(sopmalCd);
+            // 짜투리 계산을 위해 상품별 수량 체크
-            shippingVO.setOrdrInnb(ordrInnb);
+            List<LinkedHashMap> goodsSetList = new ArrayList<>();
-            shippingVO.setMngrInnb(orderVO.getMngrInnb());
+            for (LinkedHashMap multiGoods : goodsList) {
-            shippingVO.setMbrInnb(orderVO.getMbrInnb());
+                int multiGoodsInnb = (int) multiGoods.get("goodsInnb");
-            shippingVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
+                int multiGoodsOptnInnb = (int) multiGoods.get("goodsOptnInnb");
-            shippingVO.setMngrFreeDlvyUseAt(StringUtil.isNullToString(shipping.get("mngrFreeDlvyUseAt")) != "" ? StringUtil.isNullToString(shipping.get("mngrFreeDlvyUseAt")) : "N");
 
-            /* *****************************************
+                LinkedHashMap baseGoods = goodsList.stream()
-                5. 주문배송 정보 등록(GC_ORDER_SHIPPING)
+                        .filter(goods ->
-             ***************************************** */
+                                Objects.equals((int) goods.get("goodsInnb"), multiGoodsInnb) &&
+                                        Objects.equals((int) goods.get("goodsOptnInnb"), multiGoodsOptnInnb)
+                        )
+                        .findFirst()
+                        .orElse(null);
 
-            insertShipping(ordrTyCd, shipping, shippingVO);
+                if (baseGoods != null) {
-            shippingEscrowVO = shippingVO;  //에스크로에 보낼 배송정보
+                    LinkedHashMap merged = new LinkedHashMap<>(baseGoods);
-
+                    merged.put("setQy", 0);
-            BigInteger ordrDlvyInnb = shippingVO.getOrdrDlvyInnb();
+                    goodsSetList.add(merged);
-
-            String mngrFreeDlvyUseAt = (String) shipping.get("mngrFreeDlvyUseAt");
-
-            if ("Y".equals(mngrFreeDlvyUseAt)) { // TODO : cjh : 2025-02-28 무료 배송비 : 'Y' 일 경우 애누리에 할인 금액 세팅 -> 배송비 0원에 여부 데이터만 세팅으로 변경 됌.
-//                BigDecimal dscntAmt = new BigDecimal(StringUtils.hasText((String) enuri.get("enuriAmt")) ? (String) enuri.get("enuriAmt") : "0");
-//                BigDecimal mngrFreeDlvyUseAmt = new BigDecimal((String) shipping.get("mngrFreeDlvyUseAmt"));
-
-                // enuri.put("enuriAmt", dscntAmt.add(mngrFreeDlvyUseAmt).toString());
-            }
-
-            // 분배된 할인 금액 누적
-            BOOrderRestAmtVO discountInfo = new BOOrderRestAmtVO();
-
-            int optionSeqIndex = 1;
-            BOOrderNoVO optionNoVO = new BOOrderNoVO();
-            optionNoVO.setOrdrInnb(ordrInnb);
-            for (int i = 0; i < goodsList.size(); i++) {
-                LinkedHashMap goods = goodsList.get(i);
-
-                boolean isLast = i == goodsList.size() - 1;
-
-                if (!CollectionUtils.isEmpty(goods)) {
-                    int goodsInnb = (int) goods.get("goodsInnb");
-                    int goodsOptnInnb = (int) goods.get("goodsOptnInnb");
-                    int ordrQy = (int) goods.get("qy");
-
-                    BOOrderItemVO orderItemVO = insertedGoodsList.stream().filter(obj-> Objects.equals(ordrInnb, obj.getOrdrInnb()) &&
-                                                                                  Objects.equals(BigInteger.valueOf(goodsInnb), obj.getGoodsInnb())).findAny().orElse(null);
-
-                    /* ***********************************************
-                        6. 주문 상품 옵션 정보 등록(GC_ORDER_ITEM_OPTION)
-                           주문 상품 입력 옵션 정보 등록
-                     *********************************************** */
-                    if (orderItemVO != null) {
-                        BOOrderItemOptnVO itemOptnVO = new BOOrderItemOptnVO();
-
-                        itemOptnVO.setSopmalCd(sopmalCd);
-                        itemOptnVO.setOrdrGoodsInnb(orderItemVO.getOrdrGoodsInnb());
-                        itemOptnVO.setOrdrDlvyInnb(ordrDlvyInnb);
-                        itemOptnVO.setOrdrInnb(ordrInnb);
-                        itemOptnVO.setOrdrSttusCd("0"); // 주문상태(99:결제실패)
-
-                        setGoodsOptn(sopmalCd, goodsInnb, goodsOptnInnb, ordrQy, itemOptnVO); // 상품 옵션정보 세팅
-
-                        setDscntDtls(goodsInnb, goodsOptnInnb, null, goodsList, shipping, enuri, itemOptnVO, isLast, isLast, discountInfo); // 상품 할인내역 세팅
-
-                        if (StringUtils.hasText((String) purchsr.get("mbrId"))) { // 회원
-                            setMlgAmt(ordrTyCd, goodsInnb, goodsOptnInnb, ordrQy, goodsList, itemOptnVO); // 상품 마일리지 정보 세팅
-                        } else {
-                            itemOptnVO.setMlgAccmlUnit(new BigDecimal(0)); // 마일리지적립금액(개당)
-                            itemOptnVO.setMlgAccmlRest(new BigDecimal(0)); // 마일리지적립금액(짜투리)
-                        }
-
-                        itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
-                        mapper.insertOrdrGoodsOption(itemOptnVO); // 주문 상품 옵션 정보 등록
-
-                        String inputOptn = (String) goods.get("inputOptn");
-
-                        if (StringUtils.hasText(inputOptn)) {
-                            String[] inputOptns = inputOptn.split("/");
-
-                            for (int j = 0; j < inputOptns.length; j++) {
-                                String optn = inputOptns[j];
-                                String[] optns = optn.split(",");
-
-                                BOOrderItemOptnVO inputOptnVO = new BOOrderItemOptnVO();
-
-                                inputOptnVO.setSopmalCd(sopmalCd); // 쇼핑몰 코드
-                                inputOptnVO.setOrdrGoodsInnb(orderItemVO.getOrdrGoodsInnb()); // 주문상품 고유번호
-                                inputOptnVO.setOrdrDlvyInnb(ordrDlvyInnb); // 주문배송 고유번호
-                                inputOptnVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
-                                inputOptnVO.setRelateOrdrGoodsOptnInnb(itemOptnVO.getOrdrGoodsOptnInnb());
-
-                                setGoodsOptn(optns[0], Integer.parseInt(optns[1]), Integer.parseInt(optns[2]), 0, inputOptnVO);
-
-                                if (i == 0) {
-                                    inputOptnVO.setOptnVal1(optns[3]);
-                                } else if (i == 1) {
-                                    inputOptnVO.setOptnVal2(optns[3]);
-                                } else if (i == 2) {
-                                    inputOptnVO.setOptnVal3(optns[3]);
-                                } else if (i == 3) {
-                                    inputOptnVO.setOptnVal4(optns[3]);
-                                }
-
-                                itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
-                                mapper.insertOrdrGoodsOption(inputOptnVO); // 주문 상품 입력 옵션 정보 등록
-                            }
-                        }
-                    }
                 }
             }
 
-            /* ***********************************************************
+            log.debug("상품별 수량 체크 : {}", goodsSetList);
-                7. 주문 상품 옵션(사은품) 정보 등록(GC_ORDER_ITEM_OPTION)
+
-             *********************************************************** */
+
-            if (!CollectionUtils.isEmpty(prsntList)) {
+            if (!CollectionUtils.isEmpty(dlvylcListMulti)) {
-                insertPrsnt(sopmalCd, ordrInnb, shippingVO.getOrdrDlvyInnb(), prsntList);
+
+                // 배송지별 상품 수량 합산 - isLast 찾기 위함.
+                List<LinkedHashMap<String, Object>> allMergedGoodsList = new ArrayList<>();
+
+                for (LinkedHashMap<String, Object> dlvylcMapMulti : dlvylcListMulti) {
+                    List<LinkedHashMap> goodsListMulti = (List<LinkedHashMap>) dlvylcMapMulti.get("goodsList");
+
+                    for (LinkedHashMap multiGoods : goodsListMulti) {
+                        int multiGoodsInnb = (int) multiGoods.get("goodsInnb");
+                        int multiGoodsOptnInnb = (int) multiGoods.get("goodsOptnInnb");
+
+                        LinkedHashMap baseGoods = goodsList.stream()
+                                .filter(goods ->
+                                        Objects.equals((int) goods.get("goodsInnb"), multiGoodsInnb) &&
+                                                Objects.equals((int) goods.get("goodsOptnInnb"), multiGoodsOptnInnb)
+                                )
+                                .findFirst()
+                                .orElse(null);
+
+                        if (baseGoods != null) {
+                            LinkedHashMap<String, Object> merged = new LinkedHashMap<>(baseGoods);
+                            allMergedGoodsList.add(merged);
+                        }
+                    }
+                }
+
+                // 분배된 할인 금액 누적
+                BOOrderRestAmtVO discountInfo = new BOOrderRestAmtVO();
+                int allGoodsCount = 0; // 전체 상품 순번
+
+                for (LinkedHashMap<String, Object> dlvylcMapMulti : dlvylcListMulti) {
+                    log.debug("dlvylcMapMulti : {}", dlvylcMapMulti);
+
+                    BOOrderShippingVO shippingVO = new BOOrderShippingVO();
+
+                    shippingVO.setSopmalCd(sopmalCd);
+                    shippingVO.setOrdrInnb(ordrInnb);
+                    shippingVO.setMngrInnb(orderVO.getMngrInnb());
+                    shippingVO.setMbrInnb(orderVO.getMbrInnb());
+                    shippingVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
+                    shippingVO.setMngrFreeDlvyUseAt(StringUtil.isNullToString(dlvylcMapMulti.get("mngrFreeDlvyUseAt")) != "" ? StringUtil.isNullToString(dlvylcMapMulti.get("mngrFreeDlvyUseAt")) : "N");
+
+                    /* *****************************************
+                        5. 주문배송 정보 등록(GC_ORDER_SHIPPING)
+                     ***************************************** */
+                    insertShipping(ordrTyCd, dlvylcMapMulti, shippingVO);
+                    shippingEscrowVO = shippingVO;  //에스크로에 보낼 배송정보
+
+                    BigInteger ordrDlvyInnb = shippingVO.getOrdrDlvyInnb();
+
+                    String mngrFreeDlvyUseAt = (String) dlvylcMapMulti.get("mngrFreeDlvyUseAt");
+
+                    if ("Y".equals(mngrFreeDlvyUseAt)) { // TODO : cjh : 2025-02-28 무료 배송비 : 'Y' 일 경우 애누리에 할인 금액 세팅 -> 배송비 0원에 여부 데이터만 세팅으로 변경 됌.
+//                        BigDecimal dscntAmt = new BigDecimal(StringUtils.hasText((String) enuri.get("enuriAmt")) ? (String) enuri.get("enuriAmt") : "0");
+//                        BigDecimal mngrFreeDlvyUseAmt = new BigDecimal((String) dlvylcMapMulti.get("mngrFreeDlvyUseAmt"));
+
+                        // enuri.put("enuriAmt", dscntAmt.add(mngrFreeDlvyUseAmt).toString());
+                    }
+
+
+                    List<LinkedHashMap> goodsListMulti = (List<LinkedHashMap>) dlvylcMapMulti.get("goodsList");
+
+                    List<LinkedHashMap> mergedGoodsList = new ArrayList<>();
+
+                    /** CJH
+                     * 배송지별 상품 정보 머지
+                     *   여러곳 배송일 경우 서버에서 계산해온 상품 정보를 배송지별 수량에 맞게 분배하다보니
+                     *   상품 정보와 배송지별 수량정보를 합쳐주는 작업이 필요함
+                     *   * 일반 주분에서 이벤트 할인 금액, 쿠폰 적용 처리, 적립 마일리지 계산을 배송지별로 계속해서 계산하는데에 어려움이 있어 상품은 유지하고 배송지별로 분배하는 방법을 채택함.
+                     */
+                    for (LinkedHashMap multiGoods : goodsListMulti) {
+                        int multiGoodsInnb = (int) multiGoods.get("goodsInnb");
+                        int multiGoodsOptnInnb = (int) multiGoods.get("goodsOptnInnb");
+
+                        // 머지대상
+                        int qy = (int) multiGoods.get("qy"); // 주문 수량
+
+                        // goodsList에서 상세 정보 찾기
+                        LinkedHashMap baseGoods = goodsList.stream()
+                                .filter(goods ->
+                                        Objects.equals((int) goods.get("goodsInnb"), multiGoodsInnb) &&
+                                                Objects.equals((int) goods.get("goodsOptnInnb"), multiGoodsOptnInnb)
+                                )
+                                .findFirst()
+                                .orElse(null);
+
+                        if (baseGoods != null) {
+                            // 병합
+                            LinkedHashMap<String, Object> merged = new LinkedHashMap<>(baseGoods);
+                            merged.put("baseQy", merged.get("qy")); // 총 상품별 주문 수량 유지
+                            merged.put("qy", qy); // 수량은 배송지별 정보 우선
+                            mergedGoodsList.add(merged);
+                        }
+                    }
+
+                    log.debug("머지 작업 후 mergedGoodsList : {}", mergedGoodsList);
+                    log.debug("머지 작업 후 goodsList : {}", goodsList);
+
+
+                    /** ------------------------------------------- 사은품 세팅 시작 ------------------------------------------- */
+                    List<LinkedHashMap> prsntListMulti = (List<LinkedHashMap>) dlvylcMapMulti.get("prsntList");
+
+                    List<LinkedHashMap> mergedPrsntList = new ArrayList<>();
+
+                    /** CJH
+                     * 배송지별 상품 정보 머지
+                     *   여러곳 배송일 경우 서버에서 계산해온 상품 정보를 배송지별 수량에 맞게 분배하다보니
+                     *   상품 정보와 배송지별 수량정보를 합쳐주는 작업이 필요함
+                     *   * 일반 주분에서 이벤트 할인 금액, 쿠폰 적용 처리, 적립 마일리지 계산을 배송지별로 계속해서 계산하는데에 어려움이 있어 상품은 유지하고 배송지별로 분배하는 방법을 채택함.
+                     */
+                    for (LinkedHashMap multiGoods : prsntListMulti) {
+                        int multiGoodsInnb = (int) multiGoods.get("goodsInnb");
+                        int multiGoodsOptnInnb = (int) multiGoods.get("goodsOptnInnb");
+
+                        // 머지대상
+                        int qy = (int) multiGoods.get("provdCnt"); // 주문 수량
+
+                        // goodsList에서 상세 정보 찾기
+                        LinkedHashMap baseGoods = prsntList.stream()
+                                .filter(goods ->
+                                        Objects.equals((int) goods.get("goodsInnb"), multiGoodsInnb) &&
+                                                Objects.equals((int) goods.get("goodsOptnInnb"), multiGoodsOptnInnb)
+                                )
+                                .findFirst()
+                                .orElse(null);
+
+                        if (baseGoods != null) {
+                            // 병합
+                            LinkedHashMap<String, Object> merged = new LinkedHashMap<>(baseGoods);
+                            merged.put("baseQy", merged.get("provdCnt")); // 총 상품별 주문 수량 유지
+                            merged.put("provdCnt", qy); // 수량은 배송지별 정보 우선
+                            mergedPrsntList.add(merged);
+                        }
+                    }
+
+                    log.debug("머지 작업 후 mergedPrsntList : {}", mergedPrsntList);
+                    log.debug("머지 작업 후 prsntList : {}", prsntList);
+                    /** ------------------------------------------- 사은품 세팅 끝 ------------------------------------------- */
+
+
+
+                    for (int i = 0; i < mergedGoodsList.size(); i++) {
+                        LinkedHashMap goods = mergedGoodsList.get(i);
+
+                        boolean isLast = allGoodsCount == allMergedGoodsList.size() - 1;
+
+                        if (!CollectionUtils.isEmpty(goods)) {
+                            int goodsInnb = (int) goods.get("goodsInnb");
+                            int goodsOptnInnb = (int) goods.get("goodsOptnInnb");
+                            int ordrQy = (int) goods.get("qy");
+
+                            BOOrderItemVO orderItemVO = insertedGoodsList.stream().filter(obj-> Objects.equals(ordrInnb, obj.getOrdrInnb()) &&
+                                    Objects.equals(BigInteger.valueOf(goodsInnb), obj.getGoodsInnb())).findAny().orElse(null);
+
+                            /* ***********************************************
+                                6. 주문 상품 옵션 정보 등록(GC_ORDER_ITEM_OPTION)
+                                   주문 상품 입력 옵션 정보 등록
+                             *********************************************** */
+                            if (orderItemVO != null) {
+                                BOOrderItemOptnVO itemOptnVO = new BOOrderItemOptnVO();
+
+                                itemOptnVO.setSopmalCd(sopmalCd);
+                                itemOptnVO.setOrdrGoodsInnb(orderItemVO.getOrdrGoodsInnb());
+                                itemOptnVO.setOrdrDlvyInnb(ordrDlvyInnb);
+                                itemOptnVO.setOrdrInnb(ordrInnb);
+                                itemOptnVO.setOrdrSttusCd("0"); // 주문상태(99:결제실패)
+
+                                setGoodsOptn(sopmalCd, goodsInnb, goodsOptnInnb, ordrQy, itemOptnVO); // 상품 옵션정보 세팅
+
+                                LinkedHashMap goodsSet = goodsSetList.stream().filter(obj-> Objects.equals(goodsInnb, obj.get("goodsInnb")) && Objects.equals(goodsOptnInnb, obj.get("goodsOptnInnb"))).findAny().orElse(null);
+
+                                setDscntDtlsMulti(goodsInnb, goodsOptnInnb, null, mergedGoodsList, dlvylcMapMulti, enuri, itemOptnVO, isLast, isLast, discountInfo, goodsList, goodsSet); // 상품 할인내역 세팅 - 여러곳 배송
+
+                                if (StringUtils.hasText((String) purchsr.get("mbrId"))) { // 회원
+                                    setMlgAmtMulti(ordrTyCd, goodsInnb, goodsOptnInnb, ordrQy, mergedGoodsList, itemOptnVO, goodsSet); // 상품 마일리지 정보 세팅 - 여러곳 배송
+                                } else {
+                                    itemOptnVO.setMlgAccmlUnit(new BigDecimal(0)); // 마일리지적립금액(개당)
+                                    itemOptnVO.setMlgAccmlRest(new BigDecimal(0)); // 마일리지적립금액(짜투리)
+                                }
+
+                                itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
+                                mapper.insertOrdrGoodsOption(itemOptnVO); // 주문 상품 옵션 정보 등록
+
+                                // 상품별 수량 체크
+                                goodsSet.put("setQy", (int) goodsSet.get("setQy") + ordrQy);
+
+                                String inputOptn = (String) goods.get("inputOptn");
+
+                                if (StringUtils.hasText(inputOptn)) {
+                                    String[] inputOptns = inputOptn.split("/");
+
+                                    for (int j = 0; j < inputOptns.length; j++) {
+                                        String optn = inputOptns[j];
+                                        String[] optns = optn.split(",");
+
+                                        BOOrderItemOptnVO inputOptnVO = new BOOrderItemOptnVO();
+
+                                        inputOptnVO.setSopmalCd(sopmalCd); // 쇼핑몰 코드
+                                        inputOptnVO.setOrdrGoodsInnb(orderItemVO.getOrdrGoodsInnb()); // 주문상품 고유번호
+                                        inputOptnVO.setOrdrDlvyInnb(ordrDlvyInnb); // 주문배송 고유번호
+                                        inputOptnVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
+                                        inputOptnVO.setRelateOrdrGoodsOptnInnb(itemOptnVO.getOrdrGoodsOptnInnb());
+
+                                        setGoodsOptn(optns[0], Integer.parseInt(optns[1]), Integer.parseInt(optns[2]), 0, inputOptnVO);
+
+                                        if (i == 0) {
+                                            inputOptnVO.setOptnVal1(optns[3]);
+                                        } else if (i == 1) {
+                                            inputOptnVO.setOptnVal2(optns[3]);
+                                        } else if (i == 2) {
+                                            inputOptnVO.setOptnVal3(optns[3]);
+                                        } else if (i == 3) {
+                                            inputOptnVO.setOptnVal4(optns[3]);
+                                        }
+
+                                        itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
+                                        mapper.insertOrdrGoodsOption(inputOptnVO); // 주문 상품 입력 옵션 정보 등록
+                                    }
+                                }
+                            }
+                        }
+
+                        // 전체 수량의 마지막 체크
+                        allGoodsCount = allGoodsCount + 1;
+                    }
+
+                    /* ***********************************************************
+                        7. 주문 상품 옵션(사은품) 정보 등록(GC_ORDER_ITEM_OPTION)
+                     *********************************************************** */
+                    if (!CollectionUtils.isEmpty(prsntList)) {
+                        insertPrsnt(sopmalCd, ordrInnb, ordrDlvyInnb, mergedPrsntList);
+                    }
+
+                }
+
             }
+
+
+//            BOOrderShippingVO shippingVO = new BOOrderShippingVO();
+//
+//            shippingVO.setSopmalCd(sopmalCd);
+//            shippingVO.setOrdrInnb(ordrInnb);
+//            shippingVO.setMngrInnb(orderVO.getMngrInnb());
+//            shippingVO.setMbrInnb(orderVO.getMbrInnb());
+//            shippingVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
+//            shippingVO.setMngrFreeDlvyUseAt(StringUtil.isNullToString(shipping.get("mngrFreeDlvyUseAt")) != "" ? StringUtil.isNullToString(shipping.get("mngrFreeDlvyUseAt")) : "N");
+//
+//            /* *****************************************
+//                5. 주문배송 정보 등록(GC_ORDER_SHIPPING)
+//             ***************************************** */
+//
+//            insertShipping(ordrTyCd, shipping, shippingVO);
+//            shippingEscrowVO = shippingVO;  //에스크로에 보낼 배송정보
+//
+//            BigInteger ordrDlvyInnb = shippingVO.getOrdrDlvyInnb();
+//
+//            String mngrFreeDlvyUseAt = (String) shipping.get("mngrFreeDlvyUseAt");
+//
+//            if ("Y".equals(mngrFreeDlvyUseAt)) { // TODO : cjh : 2025-02-28 무료 배송비 : 'Y' 일 경우 애누리에 할인 금액 세팅 -> 배송비 0원에 여부 데이터만 세팅으로 변경 됌.
+////                BigDecimal dscntAmt = new BigDecimal(StringUtils.hasText((String) enuri.get("enuriAmt")) ? (String) enuri.get("enuriAmt") : "0");
+////                BigDecimal mngrFreeDlvyUseAmt = new BigDecimal((String) shipping.get("mngrFreeDlvyUseAmt"));
+//
+//                // enuri.put("enuriAmt", dscntAmt.add(mngrFreeDlvyUseAmt).toString());
+//            }
+//
+//            // 분배된 할인 금액 누적
+//            BOOrderRestAmtVO discountInfo = new BOOrderRestAmtVO();
+//
+//            int optionSeqIndex = 1;
+//            BOOrderNoVO optionNoVO = new BOOrderNoVO();
+//            optionNoVO.setOrdrInnb(ordrInnb);
+//            for (int i = 0; i < goodsList.size(); i++) {
+//                LinkedHashMap goods = goodsList.get(i);
+//
+//                boolean isLast = i == goodsList.size() - 1;
+//
+//                if (!CollectionUtils.isEmpty(goods)) {
+//                    int goodsInnb = (int) goods.get("goodsInnb");
+//                    int goodsOptnInnb = (int) goods.get("goodsOptnInnb");
+//                    int ordrQy = (int) goods.get("qy");
+//
+//                    BOOrderItemVO orderItemVO = insertedGoodsList.stream().filter(obj-> Objects.equals(ordrInnb, obj.getOrdrInnb()) &&
+//                                                                                  Objects.equals(BigInteger.valueOf(goodsInnb), obj.getGoodsInnb())).findAny().orElse(null);
+//
+//                    /* ***********************************************
+//                        6. 주문 상품 옵션 정보 등록(GC_ORDER_ITEM_OPTION)
+//                           주문 상품 입력 옵션 정보 등록
+//                     *********************************************** */
+//                    if (orderItemVO != null) {
+//                        BOOrderItemOptnVO itemOptnVO = new BOOrderItemOptnVO();
+//
+//                        itemOptnVO.setSopmalCd(sopmalCd);
+//                        itemOptnVO.setOrdrGoodsInnb(orderItemVO.getOrdrGoodsInnb());
+//                        itemOptnVO.setOrdrDlvyInnb(ordrDlvyInnb);
+//                        itemOptnVO.setOrdrInnb(ordrInnb);
+//                        itemOptnVO.setOrdrSttusCd("0"); // 주문상태(99:결제실패)
+//
+//                        setGoodsOptn(sopmalCd, goodsInnb, goodsOptnInnb, ordrQy, itemOptnVO); // 상품 옵션정보 세팅
+//
+//                        setDscntDtls(goodsInnb, goodsOptnInnb, null, goodsList, shipping, enuri, itemOptnVO, isLast, isLast, discountInfo); // 상품 할인내역 세팅
+//
+//                        if (StringUtils.hasText((String) purchsr.get("mbrId"))) { // 회원
+//                            setMlgAmt(ordrTyCd, goodsInnb, goodsOptnInnb, ordrQy, goodsList, itemOptnVO); // 상품 마일리지 정보 세팅
+//                        } else {
+//                            itemOptnVO.setMlgAccmlUnit(new BigDecimal(0)); // 마일리지적립금액(개당)
+//                            itemOptnVO.setMlgAccmlRest(new BigDecimal(0)); // 마일리지적립금액(짜투리)
+//                        }
+//
+//                        itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
+//                        mapper.insertOrdrGoodsOption(itemOptnVO); // 주문 상품 옵션 정보 등록
+//
+//                        String inputOptn = (String) goods.get("inputOptn");
+//
+//                        if (StringUtils.hasText(inputOptn)) {
+//                            String[] inputOptns = inputOptn.split("/");
+//
+//                            for (int j = 0; j < inputOptns.length; j++) {
+//                                String optn = inputOptns[j];
+//                                String[] optns = optn.split(",");
+//
+//                                BOOrderItemOptnVO inputOptnVO = new BOOrderItemOptnVO();
+//
+//                                inputOptnVO.setSopmalCd(sopmalCd); // 쇼핑몰 코드
+//                                inputOptnVO.setOrdrGoodsInnb(orderItemVO.getOrdrGoodsInnb()); // 주문상품 고유번호
+//                                inputOptnVO.setOrdrDlvyInnb(ordrDlvyInnb); // 주문배송 고유번호
+//                                inputOptnVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
+//                                inputOptnVO.setRelateOrdrGoodsOptnInnb(itemOptnVO.getOrdrGoodsOptnInnb());
+//
+//                                setGoodsOptn(optns[0], Integer.parseInt(optns[1]), Integer.parseInt(optns[2]), 0, inputOptnVO);
+//
+//                                if (i == 0) {
+//                                    inputOptnVO.setOptnVal1(optns[3]);
+//                                } else if (i == 1) {
+//                                    inputOptnVO.setOptnVal2(optns[3]);
+//                                } else if (i == 2) {
+//                                    inputOptnVO.setOptnVal3(optns[3]);
+//                                } else if (i == 3) {
+//                                    inputOptnVO.setOptnVal4(optns[3]);
+//                                }
+//
+//                                itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
+//                                mapper.insertOrdrGoodsOption(inputOptnVO); // 주문 상품 입력 옵션 정보 등록
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//
+//            /* ***********************************************************
+//                7. 주문 상품 옵션(사은품) 정보 등록(GC_ORDER_ITEM_OPTION)
+//             *********************************************************** */
+//            if (!CollectionUtils.isEmpty(prsntList)) {
+//                insertPrsnt(sopmalCd, ordrInnb, shippingVO.getOrdrDlvyInnb(), prsntList);
+//            }
         } else if ("05".equals(ordrTyCd)) { // 여러곳 배송, 선물하기
             log.debug("여러곳 배송 > 배송지별 배송정보 => {} ", new Gson().toJson(dlvylcListMulti));
 
@@ -1219,18 +1550,30 @@ public class BOOrderService {
         shippingVO.setDlvyMthCd("01"); // 택배
 
         if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원개인결제, 정기배송
-            shippingVO.setRecpntNm((String) shipping.get("recpntNm"));
+            shippingVO.setRecpntNm(StringUtil.isNullToString(shipping.get("recpntNm")));
-            shippingVO.setRecpntTelnb((String) shipping.get("recpntTelnb"));
+            shippingVO.setRecpntTelnb(StringUtil.isNullToString(shipping.get("recpntTelnb")));
-            shippingVO.setRecpntMbtlnb((String) shipping.get("recpntMbtlnb"));
+            shippingVO.setRecpntMbtlnb(StringUtil.isNullToString(shipping.get("recpntMbtlnb")));
 
-            shippingVO.setDlvylcZip((String) shipping.get("dlvylcZip"));
+            shippingVO.setDlvylcZip(StringUtil.isNullToString(shipping.get("dlvylcZip")));
-            shippingVO.setDlvylcAdresDvCd((String) shipping.get("dlvylcAdresDvCd"));
+            shippingVO.setDlvylcAdresDvCd(StringUtil.isNullToString(shipping.get("dlvylcAdresDvCd")));
-            shippingVO.setDlvylcLnbAdres((String) shipping.get("dlvylcLnbAdres"));
+            shippingVO.setDlvylcLnbAdres(StringUtil.isNullToString(shipping.get("dlvylcLnbAdres")));
-            shippingVO.setDlvylcRnmAdres((String) shipping.get("dlvylcRnmAdres"));
+            shippingVO.setDlvylcRnmAdres(StringUtil.isNullToString(shipping.get("dlvylcRnmAdres")));
-            shippingVO.setDlvylcAdresDtl((String) shipping.get("dlvylcAdresDtl"));
+            shippingVO.setDlvylcAdresDtl(StringUtil.isNullToString(shipping.get("dlvylcAdresDtl")));
 
-            shippingVO.setDlvyMssageCn((String) shipping.get("dlvyMssageCn"));
+            shippingVO.setDlvyMssageCn(StringUtil.isNullToString(shipping.get("dlvyMssageCn")));
-            shippingVO.setDlvyCycleCd((String) shipping.get("dlvyCycleCd"));
+            shippingVO.setDlvyCycleCd(StringUtil.isNullToString(shipping.get("dlvyCycleCd")));
+//            shippingVO.setRecpntNm((String) shipping.get("recpntNm"));
+//            shippingVO.setRecpntTelnb((String) shipping.get("recpntTelnb"));
+//            shippingVO.setRecpntMbtlnb((String) shipping.get("recpntMbtlnb"));
+//
+//            shippingVO.setDlvylcZip((String) shipping.get("dlvylcZip"));
+//            shippingVO.setDlvylcAdresDvCd((String) shipping.get("dlvylcAdresDvCd"));
+//            shippingVO.setDlvylcLnbAdres((String) shipping.get("dlvylcLnbAdres"));
+//            shippingVO.setDlvylcRnmAdres((String) shipping.get("dlvylcRnmAdres"));
+//            shippingVO.setDlvylcAdresDtl((String) shipping.get("dlvylcAdresDtl"));
+//
+//            shippingVO.setDlvyMssageCn((String) shipping.get("dlvyMssageCn"));
+//            shippingVO.setDlvyCycleCd((String) shipping.get("dlvyCycleCd"));
         }
 
         if ("05".equals(ordrTyCd)) { // 여러곳 배송
@@ -2194,6 +2537,9 @@ public class BOOrderService {
                 throw new WnbtRestException("주문배송 정보를 찾을 수 없습니다.");
             }
         } else {
+//            if (CollectionUtils.isEmpty(multiOrdrDlvylc)) {
+//                throw new WnbtRestException("주문배송 정보를 찾을 수 없습니다.");
+//            }
             if (CollectionUtils.isEmpty(shipping)) {
                 throw new WnbtRestException("주문배송 정보를 찾을 수 없습니다.");
             }

src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java

@@ -177,6 +177,7 @@ public class BOPurchsService {
     public DataMap selectDftDlvylc(BOPurchsrVO purchsrVO) {
         DataMap dftDlvylc = new DataMap();
 
+        //기본배송지여부
         purchsrVO.setDftDlvylcAt("Y");
 
         List<DataMap> dlvylcAdresList = mapper.selectDlvylcList(purchsrVO);
@@ -1854,6 +1855,8 @@ public class BOPurchsService {
         }};
 
         String defaultAdressAt = "";
+        String dlvylcAreaCd = (String) param.get("dlvylcAreaCd");
+        String prefcd = (String) param.get("prefcd");
 
         List<LinkedHashMap> goodsList = (List<LinkedHashMap>) param.get("goodsList");
 
@@ -1922,7 +1925,7 @@ public class BOPurchsService {
                             if (dlvylc.get("dlvyAmt") != null) {
                                 dlvyAmtBydlvylc = dlvyAmtBydlvylc + castAmt(dlvylc, "dlvyAmt");
                             } else {
-                                dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt);
+                                dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
 
                                 if (!CollectionUtils.isEmpty(dlvyAmtMap)) {
                                     dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue();
@@ -1947,7 +1950,7 @@ public class BOPurchsService {
                         if (dlvylcMap.get("dlvyAmt") != null) {
                             dlvyAmtBydlvylc = dlvyAmtBydlvylc + castAmt(dlvylcMap, "dlvyAmt");
                         } else {
-                            dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt);
+                            dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
 
                             if (!CollectionUtils.isEmpty(dlvyAmtMap)) {
                                 dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue();
@@ -1958,7 +1961,7 @@ public class BOPurchsService {
                     dlvyAmt = new BigDecimal(dlvyAmtBydlvylc);
                 }
             } else {
-                dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt);
+                dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
 
                 if (!CollectionUtils.isEmpty(dlvyAmtMap)) {
                     dlvyAmt = (BigDecimal) dlvyAmtMap.get("dlvyAmt");
@@ -2104,9 +2107,10 @@ public class BOPurchsService {
      * @param goodsList
      * @return List<DataMap>
      */
-    public DataMap getDlvyAmt(List<LinkedHashMap> goodsList, String sopmalCd, String defaultAdressAt) {
+    public DataMap getDlvyAmt(List<LinkedHashMap> goodsList, String sopmalCd, String defaultAdressAt, String dlvylcAreaCd) {
         DataMap dlvyAmtMap = null;
         log.debug("우편번호 확인 : {}", defaultAdressAt);
+        log.debug("getDlvyAmt-goodsList : {}", goodsList);
 
         BigDecimal rlDlvyAmt = new BigDecimal(0); // 실 최종 배송비
 
@@ -2158,6 +2162,9 @@ public class BOPurchsService {
                 for (Map.Entry<BigInteger, List<DataMap>> dlvyGroupEtry : goodsByDlvyGroupMap.entrySet()) {
                     int dlvyGroupInnb = dlvyGroupEtry.getKey().intValue();
                     List<DataMap> goodsByDlvyGroupList = dlvyGroupEtry.getValue();
+                    log.debug("goodsByDlvyGroupList : {}", goodsByDlvyGroupList);
+//                    BigDecimal goodsQy = (BigDecimal) goodsByDlvyGroupList.get("qy");
+//                    log.debug("goodsByDlvyGroupList qy : {}", qy);
 
                     finalDlvyGroupInnb = dlvyGroupInnb;
 
@@ -2168,38 +2175,65 @@ public class BOPurchsService {
 
                     DataMap shippingGrouping = mapper.selectShippingGrouping(param);
 
+                    //"KR".equals(dlvylcAreaCd)인 경우
                     String dlvyGroupDvCd = (String) shippingGrouping.get("dlvyGroupDvCd");
                     BigDecimal dftDlvyAmt = (BigDecimal) shippingGrouping.get("dftDlvyAmt"); // 기본배송비
                     BigDecimal dlvyAmt = dftDlvyAmt; // 배송비
                     String dlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt"); // 도서산간 추가 배송비 조건
                     BigDecimal areaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt"); // 도서산간 추가 배송비
+                    String amtCndUseAt = (String) shippingGrouping.get("amtCndUseAt"); // 금액조건
+                    BigDecimal amtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt");
+                    String cntCndUseAt = (String) shippingGrouping.get("cntCndUseAt"); // 수량조건
+                    BigDecimal cntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt"); // 수량
+
+                    if("JP".equals(dlvylcAreaCd)){
+//                        dlvyGroupDvCd = (String) shippingGrouping.get("dlvyGroupDvCd2");
+                        dftDlvyAmt = (BigDecimal) shippingGrouping.get("dftDlvyAmt2"); // 기본배송비
+                        dlvyAmt = dftDlvyAmt; // 배송비
+                        dlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt2"); // 도서산간 추가 배송비 조건
+                        areaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt2"); // 도서산간 추가 배송비
+                        amtCndUseAt = (String) shippingGrouping.get("amtCndUseAt2"); // 금액조건
+                        amtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt");
+                        cntCndUseAt = (String) shippingGrouping.get("cntCndUseAt2"); // 수량조건
+                        cntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt2"); // 수량
+                    }
 
                     // 무료배송(조건부)
                     if ("01".equals(dlvyGroupDvCd)) {
                         // 조건(적용상품이 1건일 경우)
-                        String amtCndUseAt = (String) shippingGrouping.get("amtCndUseAt"); // 금액조건
+//                        String amtCndUseAt = (String) shippingGrouping.get("amtCndUseAt"); // 금액조건
-                        String cntCndUseAt = (String) shippingGrouping.get("cntCndUseAt"); // 수량조건
+//                        String cntCndUseAt = (String) shippingGrouping.get("cntCndUseAt"); // 수량조건
 
                         for (DataMap goodsMap : goodsByDlvyGroupList) {
 
+//                            BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량
+
                             // 금액 조건
                             if ("Y".equals(amtCndUseAt)) {
-                                BigDecimal amtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt"); // 금액조건 추가금액
+//                                BigDecimal amtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt"); // 금액조건 추가금액
                                 BigDecimal slepric = (BigDecimal) goodsMap.get("subSlepric"); // 판매가 * 수량
 
                                 if (slepric.compareTo(amtCndAditAmt) > 0) {
                                     dlvyAmt = new BigDecimal(0);
                                 }
+//                                else {
+//                                    //배송비 합(같은상품 수량당 배송비 책정)
+//                                    dlvyAmt = dlvyAmt.multiply(qy);
+//                                }
                             }
 
                             // 수량 조건
                             if ("Y".equals(cntCndUseAt)) {
-                                BigDecimal cntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt"); // 금액조건 추가금액
+//                                BigDecimal cntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt"); // 금액조건 추가금액
                                 BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량
 
                                 if (qy.compareTo(cntCndAditAmt) > 0) {
                                     dlvyAmt = new BigDecimal(0);
                                 }
+//                                else {
+//                                    //배송비 합(같은상품 수량당 배송비 책정)
+//                                    dlvyAmt = dlvyAmt.multiply(qy);
+//                                }
                             }
                         }
 
@@ -2258,20 +2292,66 @@ public class BOPurchsService {
 
                     } else if ("03".equals(dlvyGroupDvCd)) { // 유료배송
 
-                        paidDlvyAmt = paidDlvyAmt.add(dlvyAmt); // 유료배송비 합
+                        if("KR".equals(dlvylcAreaCd) || "JP".equals(dlvylcAreaCd)) {
 
-                        if (!StringUtils.isEmpty(dlvyAreaAditAt) && "Y".equals(dlvyAreaAditAt)) {
+                            BigDecimal goodsQy = new BigDecimal(0);
-                            if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
+
-                                addPaidDlvyAmt = addPaidDlvyAmt.add(areaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
+                            for (DataMap goodsMap : goodsByDlvyGroupList) {
-                            }
+
+                                BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량
+
+                                // 수량 조건
+                                if ("Y".equals(cntCndUseAt)) {
+
+                                    qy = (BigDecimal) goodsMap.get("qy"); // 수량
+
+                                    if (qy.compareTo(cntCndAditAmt) > 0) {
+                                        goodsQy = qy.divide(cntCndAditAmt, 0, RoundingMode.CEILING);
+                                        //배송비 합(같은상품 수량당 배송비 책정)
+                                        BigDecimal multidlvyAmt = dlvyAmt.multiply(goodsQy);
+                                        paidDlvyAmt = paidDlvyAmt.add(multidlvyAmt);
+
+                                        // 추가배송비 계산 (MUL)
+                                        if (!StringUtils.isEmpty(dlvyAreaAditAt) && "Y".equals(dlvyAreaAditAt)) {
+                                            if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
+                                                addPaidDlvyAmt = addPaidDlvyAmt.add(areaAditDlvyAmt.multiply(goodsQy)); // 유료 배송 도서산간 추가 배송비
+                                            }
+                                        }
+
+                                    } else {
+                                        // 수량당 배송비가 1인경우
+                                        paidDlvyAmt = paidDlvyAmt.add(dlvyAmt);
+                                        // 추가배송비 계산
+                                        if (!StringUtils.isEmpty(dlvyAreaAditAt) && "Y".equals(dlvyAreaAditAt)) {
+                                            if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
+                                                addPaidDlvyAmt = addPaidDlvyAmt.add(areaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
+                                            }
+                                        }
+                                    }
+                                } else {
+                                    //수량 조건 없는 경우
+                                    paidDlvyAmt = paidDlvyAmt.add(dlvyAmt); // 유료배송비 합
+                                    // 추가배송비 계산
+                                    if (!StringUtils.isEmpty(dlvyAreaAditAt) && "Y".equals(dlvyAreaAditAt)) {
+                                        if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
+                                            addPaidDlvyAmt = addPaidDlvyAmt.add(areaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
+                                        }
+                                    }
+                                }
+                            }   //for
+                        } else {
+                            dlvyAmt = new BigDecimal(0);
+                            dftDlvyAmt = new BigDecimal(0);
                         }
+
                     }
 
                     BigDecimal finalDlvyAmt = dlvyAmt;
-                    BigDecimal amtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt"); // 금액조건 추가금액
+                    BigDecimal finalDftDlvyAmt = dftDlvyAmt;
+//                    BigDecimal amtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt"); // 금액조건 추가금액
                     DataMap dlvyGroupMap = new DataMap(){{
                         put("dlvyGroupInnb", dlvyGroupInnb);
-                        put("dftDlvyAmt", dftDlvyAmt);
+                        put("dftDlvyAmt", finalDftDlvyAmt);
                         put("dlvyAmt", finalDlvyAmt);
                     }};
 
@@ -2281,7 +2361,7 @@ public class BOPurchsService {
                     log.debug("@@@  유료배송비 합 : {}", paidDlvyAmt);
 
                     dlvyAmtByDlvyGroupList.add(dlvyGroupMap); // 배송그룹별 배송비 목록
-                }
+                } // for
 
                 // TODO : 도서산간 추가배송비 정채 :: 무료일 경우 무조건 무료인지 추가배송비는 발생 시킬건지 정의 필요 ( 2024-10-01 )
                 addFreeDlvyAmt = addFreeDlvyAmt.compareTo(addBundleDlvyAmtY) > 0 ? addFreeDlvyAmt : addBundleDlvyAmtY; // 무료배송 추가 배송비와 조건부 무료배송 묶음 O 의 추가 배송비 중 큰 배송비

src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOPurchsrVO.java

@@ -89,4 +89,11 @@ public class BOPurchsrVO extends AbstractVO {
 
     /** 기본배송지 여부  */
     private String dftDlvylcAt;
+
+    /**	도도부현 코드(일본) */
+    private String prefcd;
+
+    /**배송지역코드*/
+    private String dlvylcAreaCd;
+
 }

src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/mapper/BOSubsvcMapper.java

@@ -0,0 +1,33 @@
+package com.wb.domainserver.domain.gcone.goods.subsvc.mapper;
+
+import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface BOSubsvcMapper {
+
+	/** 구독서비스 목록 조회*/
+	List<DataMap> selectBOSubsvcList(BOSubsvcVO vo);
+	/** 구독서비스 상세 조회 (관리자에서 사용함)*/
+	DataMap selectBOSubsvcDetail(BOSubsvcVO vo);
+
+	/** 관리자 구독서비스 목록 조회*/
+	List<DataMap> selectBOMngrSubsvcList(BOSubsvcVO vo);
+	/** 관리자 구독서비스 조회조건 구독서비스*/
+	List<DataMap> selectBOMngrSrchSubsvcList(BOSubsvcVO vo);
+	/** 관리자 구독서비스 조회조건 구독서비스별 기수*/
+	List<DataMap> selectBOMngrSrchSubsvcGnrList(BOSubsvcVO vo);
+	/** 관리자 구독서비스 선택 삭제*/
+	int deleteBOMngrSubsvc(BOSubsvcVO vo);
+	/** 관리자 구독서비스 수정*/
+	int updateBOMngrSubsvc(BOSubsvcVO vo);
+	/** 관리자 구둑서비스 등록 */
+	void insertBOMngrSubsvc(BOSubsvcVO vo);
+	/** 관리자 구독서비스 명 중복체크*/
+	int selectBOMngrSubsvcNmDupCheck(BOSubsvcVO vo);
+}

src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/service/BOSubsvcService.java

@@ -0,0 +1,140 @@
+package com.wb.domainserver.domain.gcone.goods.subsvc.service;
+
+import com.wb.domainserver.domain.gcone.goods.goodsinfo.vo.BOGoodsInfoVO;
+import com.wb.domainserver.domain.gcone.goods.subsvc.mapper.BOSubsvcMapper;
+import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import io.micrometer.common.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@Slf4j
+public class BOSubsvcService {
+
+	@Autowired
+	private BOSubsvcMapper mapper;
+
+	/**
+	 * 구독서비스 목록 조회
+	 * @param vo
+	 * @return
+	 */
+	public List<DataMap> selectBOSubsvcList(BOSubsvcVO vo) {
+		List<DataMap> dataList = new ArrayList<>();
+
+		dataList = mapper.selectBOSubsvcList(vo);
+
+		return dataList;
+	}
+
+	/**
+	 * 구독서비스 상세 조회
+	 * @param vo
+	 * @return
+	 */
+	public DataMap selectBOSubsvcDetail(BOSubsvcVO vo) {
+		DataMap dataMap = new DataMap();
+
+		dataMap = mapper.selectBOSubsvcDetail(vo);
+
+		return dataMap;
+	}
+
+	/**
+	 * 관리자 구독서비스 목록 조회
+	 * */
+	public List<DataMap> selectBOMngrSubsvcList(BOSubsvcVO vo) {
+		List<DataMap> dataList = new ArrayList<>();
+
+		dataList = mapper.selectBOMngrSubsvcList(vo);
+		if(dataList == null || dataList.isEmpty()){
+			vo.getPaginationInfo().setTotalRecordCount(0);
+		}else{
+			vo.getPaginationInfo().setTotalRecordCount(((Long)dataList.get(0).get("totCnt")).intValue());
+		}
+
+		return dataList;
+	}
+
+	/**
+	 * 관리자 구독서비스 조회조건 구독서비스
+	 * */
+	public List<DataMap> selectBOMngrSrchSubsvcList(BOSubsvcVO vo) {
+		List<DataMap> dataList = new ArrayList<>();
+
+		dataList = mapper.selectBOMngrSrchSubsvcList(vo);
+
+		return dataList;
+	}
+
+	/**
+	 * 관리자 구독서비스 조회조건 구독서비스별 기수
+	 * */
+	public List<DataMap> selectBOMngrSrchSubsvcGnrList(BOSubsvcVO vo) {
+		List<DataMap> dataList = new ArrayList<>();
+
+		dataList = mapper.selectBOMngrSrchSubsvcGnrList(vo);
+
+		return dataList;
+	}
+
+	/**
+	 * 관리자 구독서비스 선택 삭제(여러건 삭제)
+	 * */
+	public String deleteBOMngrSubsvc(BOSubsvcVO vo) {
+		String message = "fail";
+		int result = mapper.deleteBOMngrSubsvc(vo);
+		if (result > 0) {
+			message = "success";
+		}
+		return message;
+	}
+
+	/**
+	 * 관리자 구독서비스명 중복체크
+	 * */
+	public String selectBOMngrSubsvcNmDupCheck(BOSubsvcVO vo) {
+		String message = "success";
+		int result = mapper.selectBOMngrSubsvcNmDupCheck(vo);
+		if (result > 0) {
+			message = "fail";
+		}
+		return message;
+	}
+
+
+	/**
+	 * 관리자 구독서비스 수정
+	 * */
+	public String updateBOMngrSubsvc(BOSubsvcVO vo) {
+		String message = "fail";
+		int result = mapper.updateBOMngrSubsvc(vo);
+		if (result > 0) {
+			message = "success";
+		}
+		return message;
+	}
+
+	/**
+	 * 관리자 구독서비스 등록
+	 * */
+	public String insertBOMngrSubsvc(BOSubsvcVO vo) {
+		String message = "success";
+		try{
+			mapper.insertBOMngrSubsvc(vo);
+			if(StringUtils.isEmpty(vo.getSubsvcInnb())){
+				message = "fail";
+			}
+		}catch(Exception e){
+			log.error(e.getMessage());
+			message = "fail";
+		}
+		return message;
+	}
+
+}

src/main/java/com/wb/domainserver/domain/gcone/goods/subsvc/vo/BOSubsvcVO.java

@@ -0,0 +1,102 @@
+package com.wb.domainserver.domain.gcone.goods.subsvc.vo;
+
+import com.wb.domainserver.domain.comm.vo.AbstractVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BOSubsvcVO extends AbstractVO {
+
+private static final long serialVersionUID = 1L;
+
+	/** 구독서비스고유번호 */
+	private String subsvcInnb;
+	/** 쇼핑몰코드 */
+	private String sopmalCd;
+	/** 구독서비스명 */
+	private String subsvcNm;
+	/** 구독기간 */
+	private String subPd;
+	/** 구독서비스기수 */
+	private String subsvcGnr;
+	/** 구독서비스명 다음기수 */
+	private String subsvcNextGnr;
+	/** 구독서비스기수명 */
+	private String subsvcGnrNm;
+	/** 배송횟수 */
+	private String dlvyCnt;
+	/** 배송주기 */
+	private String dlvyCycle;
+	/** 구독료 */
+	private String subsvcCt;
+	/** 1회 배송비 */
+	private String tmeDlvyAmt;
+	/** 소비자가 */
+	private String cnsmrpric;
+	/** 판매가 */
+	private String slepric;
+	/** 재고수량 */
+	private String invntryQy;
+	/** 판매재고수량 */
+	private String usefulInvntryQy;
+	/** 재고정책 */
+	private String invntryPolicyCd;
+	/** 가용재고제한수량 */
+	private String avlinvLmttQy;
+	/** 구독서비스상태 */
+	private String subsvcSttusCd;
+	/** 노출구분 */
+	private String expsrDvCd;
+	/** 노출시작일시 */
+	private String expsrBgnDt;
+	/** 노출종료일시 */
+	private String expsrEndDt;
+	/** 노출설정앞문구 */
+	private String expsrSetupFwords;
+	/** 구매수량제한구분코드 */
+	private String purchsQyLmttDvCd;
+	/** 구매수량 유형 */
+	private String purchsQyTyCd;
+	/** 최소구매수량 */
+	private String mummPurchsQy;
+	/** 최대구매수량 */
+	private String mxmmPurchsQy;
+	/** 구독서비스설명 */
+	private String subsvcDc;
+	/** 모바일구독서비스설명 */
+	private String mblSubsvcDc;
+	/** 모바일구독서비스설명 PC 동일여부 */
+	private String mblSubsvcDcPcSameAt;
+	/** 섬네일이미지경로 */
+	private String img;
+	/** 청약철회가능여부 */
+	private String subscrptWthdrawPosblAt;
+	/** 기본상품옵션고유번호 */
+	private String dftGoodsOptnInnb;
+	/** 최종처리차수 */
+	private String lastProcsOdr;
+	/** 삭제섬네일이미지경로 */
+	private String delImg;
+
+
+	/** 검색조건 */
+	/** 구독서비스명 selectbox*/
+	private String srchSelSubsvcNm;
+	/** 구독서비스명 */
+	private String srchSubsvcNm;
+	/** 구독서비스기수 select */
+	private String srchSelSubsvcGnr;
+	/** 구독서비스기수명 */
+	private String srchSubsvcGnrNm;
+	/** 구독서비스상태 */
+	private List<String> srchArrSubsvcSttusCd;
+	/** 노출구분 */
+	private String srchExpsrDvCd;
+	/** 정렬구분 */
+	private String sortDv;
+	/** 배열 구독서비스고유번호  */
+	private List<String> arrSubsvcInnb;
+}

src/main/java/com/wb/domainserver/domain/gcone/login/service/LoginService.java

@@ -223,6 +223,7 @@ public class LoginService {
         LoginRequest req = new LoginRequest();
         req.setUserInnb(userInnb);
         String accessUrl = UrlExtractor.getOriginalHost(request);
+        accessUrl = UrlExtractor.getOriginalHost(accessUrl);
         req.setAccessUrl(accessUrl);
         log.debug("createRenewLoginToken accessUrl:{}",accessUrl);
         req.setSopmalCd(request.getParameter("authSopmalCd"));

src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java

@@ -291,6 +291,11 @@ public interface BOMbrMapper {
 	 */
 	public Integer selectBOMbrMbtlnbCompare(BOMbrVO mbrVO);
 
+	/**
+	 * 회원 이메일 비교
+	 * @param mbrVO
+	 */
+	public Integer selectBOMbrEmailCompare(BOMbrVO mbrVO);
 
 	/**
 	 * 회원 이메일 수정
@@ -337,6 +342,9 @@ public interface BOMbrMapper {
 	public int insertBOPhoneAuth(BOMbrVO vo);
 	public int selectBOPhoneAuth(BOMbrVO vo);
 
+	public int insertBOEmailAuth(BOMbrVO vo);
+	public int selectBOEmailAuth(BOMbrVO vo);
+
 	public void insertBOMbrGradMapping(BOMbrVO mbrVO);
 
 	public void insertBOMemberSite(BOMbrVO mbrVO);
@@ -352,6 +360,9 @@ public interface BOMbrMapper {
 	public List<DataMap> selectBOMbrwithdrawalSearch(BOMbrVO vo);
 	public List<DataMap> selectBOMbrwithdrawalSnsSearch(BOMbrVO vo);
 
+	public List<DataMap> selectBOMbrwithdrawalSearchEmail(BOMbrVO vo);
+	public List<DataMap> selectBOMbrwithdrawalSnsSearchEmail(BOMbrVO vo);
+
 	public List<DataMap> selectBOJoinAgreeTermsForm(BOMbrVO vo);
 
 	public List<DataMap> selectBOClauseAgre(BOMbrVO vo);

src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java

@@ -500,6 +500,18 @@ public class BOMbrService {
         return changeAt;
     }
 
+    /**
+     * 회원 정보 수정 전 이메일 변경 여부 체크
+     *
+     * @param mbrVO
+     * @return
+     * @author
+     */
+    public Integer selectBOMbrEmailCompare(BOMbrVO mbrVO) {
+        Integer changeAt = mapper.selectBOMbrMbtlnbCompare(mbrVO);
+        return changeAt;
+    }
+
     /**
      * 회원 아이디 수정
      *
@@ -1026,6 +1038,65 @@ public class BOMbrService {
         return message;
     }
 
+    /**
+     * 이메일 인증번호 생성
+     *
+     * @param mbrVO
+     * @return
+     * @author
+     */
+    public DataMap insertBOEmailAuth(BOMbrVO vo) {
+
+        DataMap message = new DataMap();
+        int result = 0;
+
+        try {
+
+            result = mapper.insertBOEmailAuth(vo);
+            if (result > 0) {
+                message.put("result", "success");
+                message.put("sndngInnb", vo.getSndngInnb());
+            } else {
+                message.put("result", "fail");
+            }
+        } catch (WnbtRestException wre) {
+            throw new WnbtRestException(wre.getMessage());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+
+        return message;
+    }
+
+    /**
+     * 이메일 인증
+     *
+     * @param mbrVO
+     * @return
+     * @author
+     */
+    public DataMap selectBOEmailAuth(BOMbrVO vo) {
+
+        DataMap message = new DataMap();
+        int result = 0;
+
+        try {
+
+            result = mapper.selectBOEmailAuth(vo);
+            if (result > 0) {
+                message.put("result", "success");
+            } else {
+                message.put("result", "fail");
+            }
+        } catch (WnbtRestException wre) {
+            throw new WnbtRestException(wre.getMessage());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+
+        return message;
+    }
+
     /**
      * 회원구분코드 조회
      *
@@ -1304,6 +1375,30 @@ public class BOMbrService {
         return codeList;
     }
 
+    /**
+     * 기존 가입 여부 조회(Email)
+     */
+    public List<DataMap> selectBOMbrwithdrawalSearchEmail(BOMbrVO vo) {
+
+        List<DataMap> mbrWithDrawalList = new ArrayList<>();
+        mbrWithDrawalList = mapper.selectBOMbrwithdrawalSearchEmail(vo);
+
+        return mbrWithDrawalList;
+
+    }
+
+    /**
+     * 기존 가입 여부 조회(Email)
+     */
+    public List<DataMap> selectBOMbrwithdrawalSnsSearchEmail(BOMbrVO vo) {
+
+        List<DataMap> mbrWithDrawalList = new ArrayList<>();
+        mbrWithDrawalList = mapper.selectBOMbrwithdrawalSnsSearchEmail(vo);
+
+        return mbrWithDrawalList;
+
+    }
+
     /**
      * 기존 가입 여부 조회
      */

src/main/java/com/wb/domainserver/domain/gcone/ntcn/email/service/BOEmailService.java

@@ -9,6 +9,7 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import jakarta.mail.*;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
@@ -27,11 +28,6 @@ import com.wb.domainserver.util.dataaccess.DataMap;
 
 import jakarta.activation.CommandMap;
 import jakarta.activation.MailcapCommandMap;
-import jakarta.mail.Message;
-import jakarta.mail.MessagingException;
-import jakarta.mail.Multipart;
-import jakarta.mail.Session;
-import jakarta.mail.Transport;
 import jakarta.mail.internet.InternetAddress;
 import jakarta.mail.internet.MimeBodyPart;
 import jakarta.mail.internet.MimeMessage;
@@ -69,6 +65,17 @@ public class BOEmailService {
 	private String host;
 	@Value("${mail.port}")
 	private String port;
+	@Value("${mail.username}")
+	private String username;
+	@Value("${mail.password}")
+	private String password;
+	@Value("${mail.connectiontimeout}")
+	private String connectiontimeout;
+	@Value("${mail.timeout}")
+	private String timeout;
+	@Value("${mail.writetimeout}")
+	private String writetimeout;
+
 
 	/* ####################################
 		이메일 발송 서비스 시작
@@ -191,6 +198,7 @@ public class BOEmailService {
 		List<BOEmailVO> voListNew = new ArrayList<BOEmailVO>();
 
 		BOEmailVO ListOne = voList.get(0);
+		log.info("이메일 voList get(0) : {}", ListOne);
 		List<Integer> trgetSndList = mapper.selectBOEmailSndngTrgetSnb(ListOne.getEmailSndngInnb());
 		log.info("이메일 발송대상 순번 조회 => {}", trgetSndList);
 
@@ -201,12 +209,7 @@ public class BOEmailService {
 			SopmalNm = mapper.selectBOEmailSopmalNm(ListOne);
 		}
 
-		Properties props = System.getProperties();
+		Session session = this.getMailSession();
-		props.put("mail.smtp.host", host);
-		props.put("mail.smtp.port", port);
-		log.info("이메일 발송 SMTP 메소드 진입 확인 => {}", host+":"+port);
-
-		Session session = Session.getInstance(props, null);
 
 		int i = 0;
 		for(BOEmailVO vo : voList) {
@@ -336,12 +339,7 @@ public class BOEmailService {
 			SopmalNm = mapper.selectBOEmailSopmalNm(ListOne);
 		}
 
-		Properties props = System.getProperties();
+		Session session = this.getMailSession();
-		props.put("mail.smtp.host", host);
-		props.put("mail.smtp.port", port);
-		log.info("이메일 발송 SMTP 메소드 진입 확인 => {}", host+":"+port);
-
-		Session session = Session.getInstance(props, null);
 
 		int i = 0;
 		for(BOEmailVO vo : voList) {
@@ -463,10 +461,8 @@ public class BOEmailService {
 	/**
 	 * 메시지 내 치환코드에 따라 변경 처리
 	 * @param cn
-	 * @param param
 	 * @param replaceMap
-	 * @param caseNm
+	 * @return String
-	 * @return
 	 */
 	public String mssageConvert(String cn, DataMap replaceMap) {
 		//필요에 따라 db 갈수 도 있으나 현재는 없다고 판단함
@@ -502,4 +498,37 @@ public class BOEmailService {
 		return output;
 
 	}
+
+	private Session getMailSession(){
+		Properties props = System.getProperties();
+		props.put("mail.smtp.host", host);
+		props.put("mail.smtp.port", port);
+		props.put("mail.smtp.auth", "true");
+		props.put("mail.smtp.starttls.enable", "true");
+		props.put("mail.smtp.starttls.required", "true");
+
+		props.put("mail.smtp.connectiontimeout", connectiontimeout);
+		props.put("mail.smtp.timeout", timeout);
+		props.put("mail.smtp.writetimeout", writetimeout);
+
+		props.put("mail.debug", "true");
+
+		log.info("이메일 발송 SMTP 메소드 진입 확인 => {}", host+":"+port);
+		Session session = null;
+
+		try {
+			Authenticator auth = new Authenticator() {
+				protected PasswordAuthentication getPasswordAuthentication() {
+					return new PasswordAuthentication(username, password);
+				}
+			};
+
+			session = Session.getInstance(props, auth);
+		}catch(Exception e){
+			e.printStackTrace();
+			log.error(e.getMessage());
+		}
+
+		return session;
+	}
 }

src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/service/BOMssageService.java

@@ -1372,10 +1372,15 @@ public class BOMssageService {
 		String smsUseAt = StringUtil.isNullToString(sndngMap.get("smsUseAt"));
 		String emailUseAt = StringUtil.isNullToString(sndngMap.get("emailUseAt"));
 
+		log.debug("카톡여부:문자여부:이메일여부 = {}",ntcntalkUseAt+":"+smsUseAt+":"+emailUseAt);
+
 		String ntcntalkSndngFormInnb = StringUtil.isNullToString(sndngMap.get("ntcntalkSndngFormInnb"));
 		String smsSndngFormInnb = StringUtil.isNullToString(sndngMap.get("smsSndngFormInnb"));
 		String emailSndngFormInnb = StringUtil.isNullToString(sndngMap.get("emailSndngFormInnb"));
 
+		log.debug("processTmpltMssage - paramMapList : {}",paramMapList);
+		log.debug("processTmpltMssage - emailSndngFormInnb : {}",emailSndngFormInnb);
+
 		//전부 미사용 시
 		boolean allNotY = !"Y".equals(ntcntalkUseAt) && !"Y".equals(smsUseAt) && !"Y".equals(emailUseAt);
 
@@ -1481,6 +1486,7 @@ public class BOMssageService {
 				boEmailVO.setSecretKey(boCommonService.selectSecretkey());
 				//이메일 발송내역 등록(치환코드 치환 x)
 
+				// 이메일 발송그룹(GC_EMAIL) 등록
 				emailMapper.insertBOEmailSndngDtls(boEmailVO);
 
 				if (recptnRjctUrl != null) {
@@ -1499,14 +1505,16 @@ public class BOMssageService {
 				}
 
 				try {
-					//이메일 발송대상 등록
+					//이메일 발송대상(GC_EMAIL_TO) 등록
 					emailMapper.insertBOEmailSndngTo(voList);
 
 					message.put("getEmailSndngInnb", boEmailVO.getEmailSndngInnb());
 					message.put("result", "success");
 				} catch (WnbtRestException wre){
+					log.debug("이메일 발송 에러1");
 					throw new WnbtRestException(wre.getMessage());
 				} catch (Exception e) {
+					log.debug("이메일 발송 에러2");
 					log.error(e.getMessage(), e);
 				}
 			}

src/main/java/com/wb/domainserver/domain/gcone/ordr/atmcrcpmny/vo/BOAtmcRcpmnyCnfirmVO.java

@@ -206,7 +206,11 @@ public class BOAtmcRcpmnyCnfirmVO extends AbstractVO {
 	/** 입금여부3 */
 	private String srchOrdrSttusCd3;
 
+	private String srchDatePick;
+
 	/** 회원 구분 코드 */
 	private String mbrDvCd;
 
+
+
 }

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/mapper/BOOrdrMapper.java

@@ -767,6 +767,8 @@ public interface BOOrdrMapper {
     */
     public String selectBODefaultAdressAtInqire(DataMap vo);
 
+    public String selectBODefaultAdressAtInqire2(DataMap vo);
+
 
     /**
      * 주문 상품 옵션별 정보와 배송그룹 정보
@@ -972,6 +974,14 @@ public interface BOOrdrMapper {
      * @return
      */
     public String commonOrderSttusCdCheckCurrent(DataMap vo);
+
+
+    /**
+     * 사용자 > 마이페이지 > 구독서비스 주문/배송 목록 조회
+     * @param ordrDlvyVO
+     * @return List<DataMap>
+     */
+    public List<DataMap> selectMbrSubsvcOrdrList(BOOrdrDlvyVO ordrDlvyVO);
 }
 
 

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/service/BOOrdrService.java

@@ -1810,6 +1810,25 @@ public class BOOrdrService{
         return resultList;
     }
 
+    /**
+     * 사용자 > 마이페이지 > MY쇼핑 > 구독서비스 주문/배송조회 > 구독서비스 주문/배송 목록 조회
+     * @param ordrDlvyVO
+     * @return List<DataMap>
+     */
+    public List<DataMap> selectMbrSubsvcOrdrListInqireAjax(BOOrdrDlvyVO ordrDlvyVO) {
+        List<DataMap> resultList = null;
+
+        resultList = mapper.selectMbrSubsvcOrdrList(ordrDlvyVO);
+
+        if(resultList == null || resultList.size() == 0){
+            ordrDlvyVO.getPaginationInfo().setTotalRecordCount(0);
+        }else{
+            ordrDlvyVO.getPaginationInfo().setTotalRecordCount(Integer.parseInt(String.valueOf(resultList.get(0).get("totCnt"))));
+        }
+
+        return resultList;
+    }
+
     /**
      * 사용자 > 마이페이지 > MY쇼핑 > 주문/배송조회 > 주문 취소 상태 수정
      * @param ordrDlvyVO
@@ -2805,7 +2824,7 @@ public class BOOrdrService{
         cashVO.setSopmalCd(ordrVO.getSopmalCd());
         cashVO.setMbrDvCd(ordrVO.getMbrDvCd());
         cashVO.setMbrInnb(String.valueOf(ordrVO.getMbrInnb()));
-
+        //구매자조회
         DataMap purchsrMap = purchsService.selectPurchsr(purchsrVO);
 
         if (!CollectionUtils.isEmpty(purchsrMap)) {
@@ -2984,6 +3003,8 @@ public class BOOrdrService{
     public Map<String, Object> selectSetleExpectAmt(DataMap param) throws Exception {
         Map<String, Object> content = new HashMap<>();
 
+        log.debug("selectSetleExpectAmt-param : {}", param);
+
         LinkedHashMap setleExpectAmtMap = new LinkedHashMap() {{
             put("goodsAmt", 0);
             put("dlvyAmt", 0);
@@ -3041,6 +3062,7 @@ public class BOOrdrService{
         LinkedHashMap<String, Object> enuriMap = (LinkedHashMap) param.get("enuri"); // 애누리 ( 장바구니 쿠폰, 마일리지, 애누리 )
 
         List<LinkedHashMap> goodsList = (List<LinkedHashMap>) param.get("goodsList");
+        log.debug("goodsList : {}", goodsList);
 
         if (!CollectionUtils.isEmpty(goodsList)) {
             for (LinkedHashMap goods : goodsList) {
@@ -3356,10 +3378,16 @@ public class BOOrdrService{
 
         // ############################################## 배송지별 배송비 계산 START ##############################################
 
-        String ordrAdressZip = StringUtil.isNullToString(param.get("dlvylcZip"));
+        LinkedHashMap<String, Object> shippingMap = (LinkedHashMap) param.get("shipping");
+
+//        String ordrAdressZip = StringUtil.isNullToString(param.get("dlvylcZip"));
+        String ordrAdressZip = StringUtil.isNullToString(shippingMap.get("dlvylcZip"));
+        String dlvylcAreaCd = (String) shippingMap.get("dlvylcAreaCd");
+        String prefcd = (String) shippingMap.get("prefcd");
         DataMap defaultAdressVO = new DataMap() {{ //
             put("sopmalCd", sopmalCd); // 쇼핑몰 코드
             put("zip", ordrAdressZip); // 우편번호
+            put("prefcd", prefcd); // 도도부현코드
         }};
 
         String defaultAdressAt = "N"; // 내가 제2권역 주소인지 여부
@@ -3391,15 +3419,21 @@ public class BOOrdrService{
                             dlvyCouponDscntAmt = dlvyCouponDscntAmt.add(new BigDecimal(applyDlvylcCouponDscntAmt));
                         }
 
-
+                        if("KR".equals(dlvylcAreaCd)){
-                        defaultAdressVO.put("zip", StringUtil.isNullToString(dlvylcMapMulti.get("dlvylcZip")));
+                            defaultAdressVO.put("zip", StringUtil.isNullToString(dlvylcMapMulti.get("dlvylcZip")));
-                        log.debug("defaultAdressVO : {}", defaultAdressVO);
+                            log.debug("defaultAdressVO-KR : {}", defaultAdressVO);
-                        defaultAdressAt = mapper.selectBODefaultAdressAtInqire(defaultAdressVO);
+                            defaultAdressAt = mapper.selectBODefaultAdressAtInqire(defaultAdressVO);
+                        }
+                        if("JP".equals(dlvylcAreaCd)){
+                            defaultAdressVO.put("prefcd", StringUtil.isNullToString(dlvylcMapMulti.get("prefcd")));
+                            log.debug("defaultAdressVO-JP : {}", defaultAdressVO);
+                            defaultAdressAt = mapper.selectBODefaultAdressAtInqire2(defaultAdressVO);
+                        }
 
                         List<LinkedHashMap> goodsListMulti = (List<LinkedHashMap>) dlvylcMapMulti.get("goodsList");
                         log.debug("goodsListMulti : {}", goodsListMulti);
                         if (!CollectionUtils.isEmpty(goodsListMulti)) {
-                            dlvyAmtMapMulti = purchsService.getDlvyAmt(goodsListMulti, sopmalCd, defaultAdressAt);
+                            dlvyAmtMapMulti = purchsService.getDlvyAmt(goodsListMulti, sopmalCd, defaultAdressAt, dlvylcAreaCd);
 
                             if (!CollectionUtils.isEmpty(dlvyAmtMapMulti)) {
                                 if (dlvylcMapMulti.get("mngrFreeDlvyUseAt") != null && "Y".equals(dlvylcMapMulti.get("mngrFreeDlvyUseAt").toString())) {
@@ -3423,8 +3457,68 @@ public class BOOrdrService{
             }
 
         } else { // 일반 주문
+//            DataMap dlvyAmtMapMulti = null;
+//
+//            LinkedHashMap<String, Object> multiOrdrDlvylcMap = (LinkedHashMap) param.get("multiOrdrDlvylc");
+//
+//            log.debug("multiOrdrDlvylcMap : {}", multiOrdrDlvylcMap);
+//            if (!CollectionUtils.isEmpty(multiOrdrDlvylcMap)) {
+//
+//                List<LinkedHashMap<String, Object>> dlvylcListMulti = (List<LinkedHashMap<String, Object>>) multiOrdrDlvylcMap.get("dlvylc");
+//
+//                if (!CollectionUtils.isEmpty(dlvylcListMulti)) {
+//
+//                    int dlvyAmtIndex = 0; // 배송지 rownum 체크
+//                    for (LinkedHashMap<String, Object> dlvylcMapMulti : dlvylcListMulti) {
+//                        int dlvyAmtBydlvylc = 0;
+//
+//                        LinkedHashMap dlvylcDscntDtlsMulti = (LinkedHashMap) dlvylcMapMulti.get("dlvylcDscntDtls");
+//
+//                        if (!CollectionUtils.isEmpty(dlvylcDscntDtlsMulti)) {
+//                            int applyDlvylcCouponDscntAmt = (int) dlvylcDscntDtlsMulti.get("dscntAmt");
+//
+//                            dlvyCouponDscntAmt = dlvyCouponDscntAmt.add(new BigDecimal(applyDlvylcCouponDscntAmt));
+//                        }
+//
+//
+//                        defaultAdressVO.put("zip", StringUtil.isNullToString(dlvylcMapMulti.get("dlvylcZip")));
+//                        log.debug("defaultAdressVO : {}", defaultAdressVO);
+//                        defaultAdressAt = mapper.selectBODefaultAdressAtInqire(defaultAdressVO);
+//
+//                        List<LinkedHashMap> goodsListMulti = (List<LinkedHashMap>) dlvylcMapMulti.get("goodsList");
+//                        log.debug("goodsListMulti : {}", goodsListMulti);
+//                        if (!CollectionUtils.isEmpty(goodsListMulti)) {
+//                            dlvyAmtMapMulti = purchsService.getDlvyAmt(goodsListMulti, sopmalCd, defaultAdressAt, dlvylcAreaCd);
+//
+//                            if (!CollectionUtils.isEmpty(dlvyAmtMapMulti)) {
+//                                if (dlvylcMapMulti.get("mngrFreeDlvyUseAt") != null && "Y".equals(dlvylcMapMulti.get("mngrFreeDlvyUseAt").toString())) {
+//                                    log.debug("관리자 무료배송 체크 'Y'");
+//                                    dlvyAmt = dlvyAmt.add(new BigDecimal(0));
+//                                } else {
+//                                    dlvyAmt = dlvyAmt.add((BigDecimal) dlvyAmtMapMulti.get("dlvyAmt"));
+//                                }
+//                                dlvyAmtMulti.put("shippingDlvyAmt" + dlvyAmtIndex, new BigDecimal(String.valueOf(dlvyAmtMapMulti.get("dlvyAmt"))));
+//
+//                                dftDlvyAmt = dftDlvyAmt.add((BigDecimal) dlvyAmtMapMulti.get("dftDlvyAmt"));
+//                                dlvyAmtMulti.put("shippingDftDlvyAmt" + dlvyAmtIndex, new BigDecimal(String.valueOf(dlvyAmtMapMulti.get("dftDlvyAmt"))));
+//
+//                                dlvyAmtIndex += 1; // 배송지 rownum ++
+//                            }
+//                        }
+//                    }
+//
+//                }
+//
+//            }
 
-            defaultAdressAt = mapper.selectBODefaultAdressAtInqire(defaultAdressVO);
+            if("KR".equals(dlvylcAreaCd)){
+                log.debug("defaultAdressVO-KR : {}", defaultAdressVO);
+                defaultAdressAt = mapper.selectBODefaultAdressAtInqire(defaultAdressVO);
+            }
+            if("JP".equals(dlvylcAreaCd)){
+                log.debug("defaultAdressVO-JP : {}", defaultAdressVO);
+                defaultAdressAt = mapper.selectBODefaultAdressAtInqire2(defaultAdressVO);
+            }
 
             LinkedHashMap<String, Object> dlvylcMap = (LinkedHashMap) param.get("dlvylc");
 
@@ -3452,18 +3546,18 @@ public class BOOrdrService{
                 if (dlvylcMap.get("dlvyAmt") != null) {
                     log.debug("배송비 객체 : {}", dlvylcMap);
                     if (dlvylcMap.get("mngrFreeDlvyUseAt") != null && "N".equals(dlvylcMap.get("mngrFreeDlvyUseAt").toString())) {
-                        dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt);
+                        dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
                     } else if (dlvylcMap.get("mngrFreeDlvyUseAt") != null && "Y".equals(dlvylcMap.get("mngrFreeDlvyUseAt").toString())) {
                         log.debug("관리자 무료배송 체크 'Y'");
                     } else {
-                        dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt);
+                        dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
                     }
 
                     if (!CollectionUtils.isEmpty(dlvyAmtMap)) {
                         dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue();
                     }
                 } else {
-                    dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt);
+                    dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
 
                     if (!CollectionUtils.isEmpty(dlvyAmtMap)) {
                         dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue();
@@ -3472,7 +3566,7 @@ public class BOOrdrService{
 
                 dlvyAmt = new BigDecimal(dlvyAmtBydlvylc);
             } else {
-                dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt);
+                dlvyAmtMap = purchsService.getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
 
                 if (!CollectionUtils.isEmpty(dlvyAmtMap)) {
                     dlvyAmt = (BigDecimal) dlvyAmtMap.get("dlvyAmt");

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOCrmDlvylcVO.java

@@ -26,6 +26,8 @@ public class BOCrmDlvylcVO extends AbstractVO{
 	@NotBlank(message = "배송지 설명")
 	@Length(min=1, max=67)
 	private String dlvylcDcCn;
+	/**배송지역코드*/
+	private String dlvylcAreaCd;
 	/**	받는사람명	*/
 	@NotBlank(message = "받으시는 분")
 	@Length(min=1, max=13)
@@ -38,7 +40,7 @@ public class BOCrmDlvylcVO extends AbstractVO{
 	private String telnb;
 	/**	우편번호	*/
 	@NotBlank(message = "우편번호")
-	@Length(min=1, max=5)
+	@Length(min=1, max=7)
 	private String zip;
 	/**	도로명,지번 구분*/
 	private String adresDv;
@@ -50,6 +52,10 @@ public class BOCrmDlvylcVO extends AbstractVO{
 	private String rnmAdres = "";
 	/**	상세주소	*/
 	private String dtlAdres;
+	/**	개인통관부호(개인통관번호) */
+	private String cstmclerCd;
+	/**	도도부현 코드(일본) */
+	private String prefcd;
 	/**	기본배송지여부	*/
 	private String dftDlvylcAt = "N";
 	/**	최근배송지여부	*/

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BODwldItmVO.java

@@ -16,7 +16,7 @@ public class BODwldItmVO extends AbstractVO {
 
     private String sopmalCd; // 쇼핑몰 코드
 
-    private long excelDwldFormSnb; // 엑셀다운로드양식순번
+    private String excelDwldFormSnb; // 엑셀다운로드양식순번
 
     private String excelFormDvCd; // 코드그룹 : formDvCd 코드 : 주문, 회원
 

src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrSrchVO.java

@@ -76,7 +76,7 @@ public class BOOrdrSrchVO extends AbstractVO{
 
     private String srchMemorSetleAt; // 수기결제여부
 
-    private long srchExcelDwldFormSnb; // 엑셀다운로드양식순번
+    private String srchExcelDwldFormSnb; // 엑셀다운로드양식순번
 
     private String srchExcelDwldDvCd; // 엑셀다운로드 대상 구분 코드
 

src/main/java/com/wb/domainserver/domain/gcone/ordr/subsvc/mapper/BOSubsvcOrdrMapper.java

@@ -0,0 +1,57 @@
+package com.wb.domainserver.domain.gcone.ordr.subsvc.mapper;
+
+import com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+*
+* 구독서비스 주문 BO mapper
+* @author jazz
+* @since 2026-02-04
+* @version 1.0
+* @see
+*
+* <pre>
+* == (Modification Information) == 개정이력
+*
+* 수정일 수정자 수정내용
+* ------- -------- ---------------------------
+* 2026-02-04 jazz 최초 생성
+*
+* </pre>
+*/
+@Mapper
+@Repository
+public interface BOSubsvcOrdrMapper {
+
+    /** 구독서비스 상품준비 관리 목록*/
+    List<DataMap> selectBOSubsvcOrderList(BOSubsvcOrderVO vo);
+    /** 구독서비스 상품준비 관리 목록 배송내역 팝업 배송내역목록*/
+    List<DataMap> selectBOSubsvcOrderDlvyList(BOSubsvcOrderVO vo);
+    /** 구독서비스 상품준비 관리 상품매칭 - 1. GC_ORDER update*/
+    int updateBOSubsvcGoodsMappgOrdr(BOSubsvcOrderVO vo);
+    /** 구독서비스 상품준비 관리 상품매칭 - 2. GC_ORDER_ITEM update*/
+    int updateBOSubsvcGoodsMappgOrdrItem(BOSubsvcOrderVO vo);
+    /** 구독서비스 상품준비 관리 상품매칭 - 3. GC_ORDER_ITEM_OPTION update*/
+    int updateBOSubsvcGoodsMappgOrdrItemOptn(BOSubsvcOrderVO vo);
+    /** 구독서비스 상품준비 관리 상품매칭 - 4. GC_ORDER_SHIPPING update*/
+    int updateBOSubsvcGoodsMappgShipping(BOSubsvcOrderVO vo);
+    /** 구독서비스 상품준비 관리 상품매칭 - 5. GC_SUBSVC update*/
+    int updateBOSubsvcGoodsMappgSubsvc(BOSubsvcOrderVO vo);
+
+    /** 구독서비스 상품변경 관리 목록*/
+    List<DataMap> selectBOSubsvcOrderMappedList(BOSubsvcOrderVO vo);
+
+    /** 구독서비스 구독자조회 목록*/
+    List<DataMap> selectBOSubsvcOrderMbrList(BOSubsvcOrderVO vo);
+    /** 구독서비스 구독자조회 - 구독자목록 팝업 - 구독서비스 정보*/
+    DataMap selectBOSubsvcInfo(BOSubsvcOrderVO vo);
+    /** 구독서비스 구독자조회 - 구독자목록 팝업 - 구독자목록 조회*/
+    List<DataMap> selectBOSubsvcOrderMbrInfoList(BOSubsvcOrderVO vo);
+    /** 구독서비스 구독자조회 - 배송상품 목록팝업 - 배송상품목록 조회*/
+    List<DataMap> selectBOSubsvcOrderGoodsInfoList(BOSubsvcOrderVO vo);
+}

src/main/java/com/wb/domainserver/domain/gcone/ordr/subsvc/service/BOSubsvcOrdrService.java

@@ -0,0 +1,247 @@
+package com.wb.domainserver.domain.gcone.ordr.subsvc.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.nimbusds.jose.shaded.gson.Gson;
+import com.wb.domainserver.common.prop.PropertyService;
+import com.wb.domainserver.domain.admin.instcSle.mtng.mapper.BOMaMtngMapper;
+import com.wb.domainserver.domain.admin.store.sopmal.mapper.BOMaSopmalMapper;
+import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
+import com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO;
+import com.wb.domainserver.domain.gcone.goods.goods.service.BOGoodsService;
+import com.wb.domainserver.domain.gcone.goods.purchs.mapper.BOPurchsMapper;
+import com.wb.domainserver.domain.gcone.goods.purchs.service.BOOrderNoService;
+import com.wb.domainserver.domain.gcone.goods.purchs.service.BOOrderService;
+import com.wb.domainserver.domain.gcone.goods.purchs.service.BOPurchsService;
+import com.wb.domainserver.domain.gcone.goods.purchs.vo.*;
+import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
+import com.wb.domainserver.domain.gcone.mbr.mbr.mapper.BOMbrMapper;
+import com.wb.domainserver.domain.gcone.mbr.mbr.service.BOMbrService;
+import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrAppnVO;
+import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO;
+import com.wb.domainserver.domain.gcone.mbr.mlg.service.BOMlgService;
+import com.wb.domainserver.domain.gcone.mbr.mlg.vo.BOCashVO;
+import com.wb.domainserver.domain.gcone.mbr.mlg.vo.BOMlgVO;
+import com.wb.domainserver.domain.gcone.ntcn.mssage.service.BOMssageService;
+import com.wb.domainserver.domain.gcone.ordr.ordr.mapper.BOOrdrMapper;
+import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrderCommonService;
+import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrLogService;
+import com.wb.domainserver.domain.gcone.ordr.ordr.vo.*;
+import com.wb.domainserver.domain.gcone.ordr.pay.service.BOPayService;
+import com.wb.domainserver.domain.gcone.ordr.pay.vo.BOPayVO;
+import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.mapper.BORtngudrefndMapper;
+import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.service.BORtngudrefndService;
+import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORtngudrefndVO;
+import com.wb.domainserver.domain.gcone.ordr.selngpruf.service.BOSelngprufService;
+import com.wb.domainserver.domain.gcone.ordr.selngpruf.vo.BOSelngprufVO;
+import com.wb.domainserver.domain.gcone.ordr.subsvc.mapper.BOSubsvcOrdrMapper;
+import com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO;
+import com.wb.domainserver.domain.gcone.promtn.coupon.service.BOCouponService;
+import com.wb.domainserver.domain.gcone.promtn.coupon.vo.BODwldCouponVO;
+import com.wb.domainserver.domain.gcone.setup.site.service.BOSiteService;
+import com.wb.domainserver.domain.gcone.setup.site.vo.BOGoodsgrpVO;
+import com.wb.domainserver.domain.gcone.setup.site.vo.BOSiteVO;
+import com.wb.domainserver.exception.WnbtException;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.security.authentication.AnonymousUser;
+import com.wb.domainserver.security.authentication.MemberJwtContextHolder;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import com.wb.domainserver.util.string.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * 구독서비스주문 BO service
+ * @author jazz
+ * @since 2026-02-05
+ * @version 1.0
+ * @see
+ *
+ * <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-02-05 jazz 최초 생성
+ *
+ * </pre>
+ */
+@Service
+@Slf4j
+public class BOSubsvcOrdrService {
+    @Autowired
+    private BOSubsvcOrdrMapper mapper;
+
+    /**
+     * 구독서비스 상품준비 관리 목록
+     * @param
+     * @return List<DataMap>
+     */
+    public List<DataMap> selectBOSubsvcOrderList(BOSubsvcOrderVO vo) {
+        List<DataMap> dataList = new ArrayList<>();
+
+        try {
+            dataList = mapper.selectBOSubsvcOrderList(vo);
+        }catch(Exception e){
+            e.printStackTrace();
+            throw e;
+        }
+        if(dataList == null || dataList.isEmpty()){
+            vo.getPaginationInfo().setTotalRecordCount(0);
+        }else{
+            vo.getPaginationInfo().setTotalRecordCount(((Long)dataList.get(0).get("totCnt")).intValue());
+        }
+
+        return dataList;
+    }
+
+    /**
+     * 구독서비스 상품준비 관리 목록 배송내역 팝업 배송내역목록
+     * @param
+     * @return List<DataMap>
+     */
+    public List<DataMap> selectBOSubsvcOrderDlvyList(BOSubsvcOrderVO vo) {
+        List<DataMap> dataList = new ArrayList<>();
+        dataList = mapper.selectBOSubsvcOrderDlvyList(vo);
+        return dataList;
+    }
+
+
+    /**
+     * 선택대상 상품준비 일괄처리
+     * 구독서비스 상품준비 일괄처리
+     * 1. GC_ORDER 주문상태를 결제확인(25)만 상품준비중(35)로 변경(25가 아니면 UPDT_DT만 변경)
+     * 2. GC_ORDER_ITEM의 상품고유번호(GOODS_INNB), 상품이지지경로(GOODS_IMG_COURS), 상품명(GOODS_NM)를 변경
+     * 3. GC_ORDER_ITEM_OPTION의 상품옵셥 고유번호(GOODS_OPTN_INNB), 주문상태(GOODS_STTUS_CD)를 결제확인(25)=>상품준비중(35), 옵션명1(OPTN_NM_1) 부터 GC_GOODS_OPTION과 동일한 컬럼 매칭
+     * 4. GC_ORDER_SHIPPING의 주문배송고유번호(ORDR_DLVY_INNB)가 같은 대상의 주문상태(GOODS_STTUS_CD)를 결제확인(25)=>상품준비중(35)
+     * 5. GC_SUBSVC의 최종처리차수(LAST_PROCS_DGR)를 수정 (주문상품옵션에 주문별 처리차수중 가능 큰처리차수(35~75까지 COUNT해서 가장 큰수)를 등록)
+     * */
+    @Transactional(rollbackFor = Exception.class)
+    public String updateSubsvcOrdrReady(BOSubsvcOrderVO vo) {
+        String message = "success";
+        /*1. GC_ORDER*/
+        int result = mapper.updateBOSubsvcGoodsMappgOrdr(vo);
+        if (!(result > 0)) {
+            log.error("GC_ORDER UPDATE 오류");
+            throw new WnbtException("500","GC_ORDER UPDATE 오류");
+        }
+        result = mapper.updateBOSubsvcGoodsMappgOrdrItem(vo);
+        if (!(result > 0)) {
+            log.error("GC_ORDER_ITEM UPDATE 오류");
+            throw new WnbtException("500","GC_ORDER_ITEM UPDATE 오류");
+        }
+        result = mapper.updateBOSubsvcGoodsMappgOrdrItemOptn(vo);
+        if (!(result > 0)) {
+            log.error("GC_ORDER_ITEM_OPTION UPDATE 오류");
+            throw new WnbtException("500","GC_ORDER_ITEM_OPTION UPDATE 오류");
+        }
+        result = mapper.updateBOSubsvcGoodsMappgShipping(vo);
+        if (!(result > 0)) {
+            log.error("GC_ORDER_SHIPPING UPDATE 오류");
+            throw new WnbtException("500","GC_ORDER_SHIPPING UPDATE 오류");
+        }
+        result = mapper.updateBOSubsvcGoodsMappgSubsvc(vo);
+        if (!(result > 0)) {
+            log.error("GC_SUBSVC 처리중 오류");
+            throw new WnbtException("500","GC_SUBSVC 처리중 오류");
+        }
+        return message;
+    }
+
+    /**
+     * 구독서비스 상품변경 관리 목록
+     * @param vo
+     * @return List<DataMap>
+     */
+    public List<DataMap> selectBOSubsvcOrderMappedList(BOSubsvcOrderVO vo) {
+        List<DataMap> dataList = new ArrayList<>();
+
+        try {
+            dataList = mapper.selectBOSubsvcOrderMappedList(vo);
+        }catch(Exception e){
+            e.printStackTrace();
+            throw e;
+        }
+        if(dataList == null || dataList.isEmpty()){
+            vo.getPaginationInfo().setTotalRecordCount(0);
+        }else{
+            vo.getPaginationInfo().setTotalRecordCount(((Long)dataList.get(0).get("totCnt")).intValue());
+        }
+
+        return dataList;
+    }
+
+    /**
+     * 구독서비스 구독자조회 목록
+     * @param vo
+     * @return List<DataMap>
+     */
+    public List<DataMap> selectBOSubsvcOrderMbrList(BOSubsvcOrderVO vo) {
+        List<DataMap> dataList = new ArrayList<>();
+
+        try {
+            dataList = mapper.selectBOSubsvcOrderMbrList(vo);
+        }catch(Exception e){
+            e.printStackTrace();
+            throw e;
+        }
+        if(dataList == null || dataList.isEmpty()){
+            vo.getPaginationInfo().setTotalRecordCount(0);
+        }else{
+            vo.getPaginationInfo().setTotalRecordCount(((Long)dataList.get(0).get("totCnt")).intValue());
+        }
+
+        return dataList;
+    }
+
+    /**
+     * 구독서비스 구독자조회 - 구독자목록 팝업 - 구독서비스 정보
+     * @param vo
+     * @return DataMap
+     */
+    public DataMap selectBOSubsvcInfo(BOSubsvcOrderVO vo) {
+        DataMap data = new DataMap();
+        data = mapper.selectBOSubsvcInfo(vo);
+        return data;
+    }
+
+    /**
+     * 구독서비스 구독자조회 - 구독자목록 팝업 - 구독자목록 조회
+     * @param vo
+     * @return DataMap
+     */
+    public List<DataMap> selectBOSubsvcOrderMbrInfoList(BOSubsvcOrderVO vo) {
+        List<DataMap> dataList = new ArrayList<DataMap>();
+        dataList = mapper.selectBOSubsvcOrderMbrInfoList(vo);
+        return dataList;
+    }
+
+    /**
+     * 구독서비스 구독자조회 - 배송상품 목록팝업 - 배송상품목록 조회
+     * @param vo
+     * @return DataMap
+     */
+    public List<DataMap> selectBOSubsvcOrderGoodsInfoList(BOSubsvcOrderVO vo) {
+        List<DataMap> dataList = new ArrayList<DataMap>();
+        dataList = mapper.selectBOSubsvcOrderGoodsInfoList(vo);
+        return dataList;
+    }
+}

src/main/java/com/wb/domainserver/domain/gcone/ordr/subsvc/vo/BOSubsvcOrderVO.java

@@ -0,0 +1,78 @@
+package com.wb.domainserver.domain.gcone.ordr.subsvc.vo;
+
+import com.wb.domainserver.domain.comm.vo.AbstractVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BOSubsvcOrderVO extends AbstractVO {
+
+private static final long serialVersionUID = 1L;
+
+	/** 구독서비스고유번호 */
+	private String subsvcInnb;
+	/** 쇼핑몰코드 */
+	private String sopmalCd;
+	/** 구독서비스명 */
+	private String subsvcNm;
+	/** 구독기간 */
+	private String subPd;
+	/** 구독서비스기수 */
+	private String subsvcGnr;
+	/** 구독서비스명 다음기수 */
+	private String subsvcNextGnr;
+	/** 구독서비스기수명 */
+	private String subsvcGnrNm;
+	/** 주문고유번호 */
+	private String ordrInnb;
+	/** 주문상품고유번호 */
+	private String ordrGoodsInnb;
+	/** 주문상품옵션고유번호 */
+	private String ordrGoodsOptnInnb;
+
+
+	/** 출고상품고유번호*/
+	private String goodsInnb;
+	/** 출고상품옵션고유번호*/
+	private String goodsOptnInnb;
+	/** 출고상품옵션구분*/
+	private String optnTy;
+
+	/** 상품준비대상*/
+	private List<String> arrCheck;
+	/** 상품준비대상 주문고유번호*/
+	private List<String> arrOrdrInnb;
+	/** 상품준비대상 주문상품고유번호*/
+	private List<String> arrOrdrGoodsInnb;
+	/** 상품준비대상 주문상품옵션고유번호*/
+	private List<String> arrOrdrGoodsOptnInnb;
+	/** 상품준비대상 주문고유번호*/
+	private List<String> arrOrdrDlvyInnb;
+
+	/** 검색조건 */
+	/** 구독서비스명 selectbox*/
+	private String srchSelSubsvcNm;
+	/** 구독서비스명 */
+	private String srchSubsvcNm;
+	/** 구독서비스기수 select */
+	private String srchSelSubsvcGnr;
+	/** 구독서비스기수명 */
+	private String srchSubsvcGnrNm;
+	/** 정렬구분 */
+	private String sortDv;
+	/** 배열 구독서비스고유번호  */
+	private List<String> arrSubsvcInnb;
+	/**당월제외*/
+	private String srchCurMonExclude;
+	/**주문번호*/
+	private String srchOrdrInnb;
+	/**주문자명*/
+	private String srchMbrNm;
+	/**주문자ID*/
+	private String srchMbrId;
+	/**구독종료여부*/
+	private String srchSubEndAt;
+}

src/main/java/com/wb/domainserver/domain/gcone/setup/dlvygrp/mapper/BODlvygrpMapper.java

@@ -88,18 +88,21 @@ public interface BODlvygrpMapper {
 	 * @param dlvyGroup
 	 */
 	void updateBODlvyGroupRtnlc(BODlvygrpVO dlvyGroup);
+	void updateBODlvyGroupRtnlc2(BODlvygrpVO dlvyGroup);
 
 	/**
 	 * 배송그룹 반송지 등록
 	 * @param dlvyGroup
 	 */
 	void insertBODlvyGroupAddress(BODlvygrpVO dlvyGroup);
+	void insertBODlvyGroupAddress2(BODlvygrpVO dlvyGroup);
 
 	/**
 	 * 배송그룹 반송지 삭제 (Y -> N)
 	 * @param dlvyGroup
 	 */
 	void deleteBODlvyGroupRtnlc(BODlvygrpVO dlvyGroup);
+	void deleteBODlvyGroupRtnlc2(BODlvygrpVO dlvyGroup);
 
 	/**
 	 * 배송 반송지 조회

src/main/java/com/wb/domainserver/domain/gcone/setup/dlvygrp/service/BODlvygrpService.java

@@ -76,9 +76,11 @@ public class BODlvygrpService {
 	public Map<String, Object> insertBODlvyGroup(BODlvygrpVO dlvyGroup) {
 		Map<String, Object> message = new HashMap<>();
 		try {
-
+			// KR 반송지 등록
-
 			mapper.insertBODlvyGroupAddress(dlvyGroup);
+			// JP 반송지 등록
+			mapper.insertBODlvyGroupAddress2(dlvyGroup);
+			// 배송그룹 등록
 			mapper.insertBODlvyGroup(dlvyGroup);
 			message.put("dlvyGroupInnb", dlvyGroup.getDlvyGroupInnb());
 			message.put("result", "success");
@@ -113,6 +115,7 @@ public class BODlvygrpService {
 		try {
 
 			mapper.updateBODlvyGroupRtnlc(dlvyGroup);
+			mapper.updateBODlvyGroupRtnlc2(dlvyGroup);
 			int result = mapper.updateBODlvyGroupDtl(dlvyGroup);
 			message.put("result", "success");
 			message.put("dlvyGroupInnb", dlvyGroup.getDlvyGroupInnb());
@@ -137,7 +140,9 @@ public class BODlvygrpService {
 		int goodsEa = mapper.isIncludeGoods(dlvyGroup);
 		if(goodsEa < 1) {
 			try {
-
+				dlvyGroup = mapper.selectBODlvyGroupDtlForm(dlvyGroup);
+				mapper.deleteBODlvyGroupRtnlc(dlvyGroup);
+				mapper.deleteBODlvyGroupRtnlc2(dlvyGroup);
 				int result = mapper.deleteBODlvyGroup(dlvyGroup);
 				message.put("result", "success");
 			} catch (WnbtRestException wre){

src/main/java/com/wb/domainserver/domain/gcone/setup/dlvygrp/vo/BODlvygrpVO.java

@@ -73,12 +73,66 @@ public class BODlvygrpVO extends AbstractVO {
 	private String rtnlcTelnb;
 
 
-	/*반품배송비왕복금액적용여부*/
+	/** 반품배송비왕복금액적용여부 */
 	private String returnDlvyApplcAt;
 
-	/*반품배송비금액*/
+	/** 반품배송비금액 */
 	private String returnDlvyAmt;
 
-	/*왕복배송비금액*/
+	/** 왕복배송비금액 */
 	private String exchngDlvyAmt;
+
+
+	/** 반송지2(JP) 고유번호 */
+	private Integer rtnlcInnb2;
+
+	/** 반송지 우편번호2(JP) */
+	private String rtnlcZip2;
+
+	/** 반송지 주소2(JP) */
+	private String rtnlcAdres2;
+
+	/** 반송지 상세주소2(JP) */
+	@Length(min=0, max=100, message = "반송지(JP상세주소)")
+	private String rtnlcDtlAdres2;
+
+	/** 반송지 전화번호2(JP) */
+	private String rtnlcTelnb2;
+
+	/** 기본배송비2(JP) */
+	private String dftDlvyAmt2;
+
+	/** 금액조건2(JP) */
+	private String amtCndUseAt2;
+
+	/** 금액조건 추가금액2(JP) */
+	private String amtCndAditAmt2;
+
+	/** 개수조건2(JP) */
+	private String cntCndUseAt2;
+
+	/** 개수조건 추가금액2(JP) */
+	private String cntCndAditAmt2;
+
+	/** 배송지역추가여부2(JP) */
+	private String dlvyAreaAditAt2;
+
+	/** 지역추가배송비2(JP) */
+	private String areaAditDlvyAmt2;
+
+	/** 묶음배송 사용여부2(JP) */
+	private String bundleDlvyUseAt2;
+
+	/** 묶음배송 조건금액2(JP) */
+	private String bundleDlvyCndAmt2;
+
+	/** 반품배송비왕복금액적용여부2(JP) */
+	private String returnDlvyApplcAt2;
+
+	/** 반품배송비금액2(JP) */
+	private String returnDlvyAmt2;
+
+	/** 왕복배송비금액2(JP) */
+	private String exchngDlvyAmt2;
+
 }

src/main/java/com/wb/domainserver/domain/gcone/setup/ordrmngr/vo/BOSetupOrdrVO.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.wb.domainserver.domain.comm.vo.AbstractVO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
 * 주문 설정 VO
@@ -23,6 +24,7 @@ import lombok.Data;
 * </pre>
  */
 @Data
+@EqualsAndHashCode(callSuper=true)
 public class BOSetupOrdrVO extends AbstractVO {
 	/** 쇼핑몰 코드 */
 	private String sopmalCd;

src/main/java/com/wb/domainserver/domain/mngr/bbs/bbsmngr/controller/BbsmngrController.java

@@ -477,7 +477,7 @@ public class BbsmngrController {
 	 * @return
 	 */
 	@Policy(AuthPolicy.RESTRICTED)
-	@RequestMapping(value="/selectBbsIdDplctCnfirm", method = RequestMethod.GET)
+	@RequestMapping(value="/selectBbsIdDplctCnfirm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<WnbtResponse> selectBbsIdDplctCnfirm(BOBbsVO vo, @CookieValue(value = "authSopmalCd") String authSopmalCd){
 
 		List<Map<String, String>> errorList	= new ArrayList<>();

src/main/java/com/wb/domainserver/domain/mngr/bbs/bbsmngr/vo/BbsmngrVO.java

@@ -164,18 +164,18 @@ public class BbsmngrVO extends AbstractVO {
 	private String cmRegistAuthorDvCd_c_all;
 
 
-	public void setBbscttRedngAuthorDvCd_c(String[] bbscttRedngAuthorDvCd_c) {
+//	public void setBbscttRedngAuthorDvCd_c(String[] bbscttRedngAuthorDvCd_c) {
-		this.redngAuthorDvCdArr = bbscttRedngAuthorDvCd_c;
+//		this.redngAuthorDvCdArr = bbscttRedngAuthorDvCd_c;
-	}
+//	}
-	public void setBbscttRegistAuthorDvCd_c(String[] bbscttRegistAuthorDvCd_c) {
+//	public void setBbscttRegistAuthorDvCd_c(String[] bbscttRegistAuthorDvCd_c) {
-		this.registAuthorDvCdArr = bbscttRegistAuthorDvCd_c;
+//		this.registAuthorDvCdArr = bbscttRegistAuthorDvCd_c;
-	}
+//	}
-	public void setAnswRegistAuthorDvCd_c(String[] answRegistAuthorDvCd_c) {
+//	public void setAnswRegistAuthorDvCd_c(String[] answRegistAuthorDvCd_c) {
-		this.answRegistAuthorDvCdArr = answRegistAuthorDvCd_c;
+//		this.answRegistAuthorDvCdArr = answRegistAuthorDvCd_c;
-	}
+//	}
-	public void setCmRegistAuthorDvCd_c(String[] cmRegistAuthorDvCd_c) {
+//	public void setCmRegistAuthorDvCd_c(String[] cmRegistAuthorDvCd_c) {
-		this.cmRegistAuthorDvCdArrArr = cmRegistAuthorDvCd_c;
+//		this.cmRegistAuthorDvCdArrArr = cmRegistAuthorDvCd_c;
-	}
+//	}
 
 	/**	게시판 검색어 */
 	private String srchWord;

src/main/java/com/wb/domainserver/domain/mngr/bbs/gnrlsctt/controller/GnrlscttController.java

@@ -303,6 +303,9 @@ public class GnrlscttController {
 		case "11" :
 			returnUrl = "mngr/bbs/gnrlsctt/EvtResultListR";
 			break;
+		case "12" :
+			returnUrl = "mngr/bbs/gnrlsctt/m2mQnaBbscttListR";
+			break;
 		}
 	    return returnUrl;
 	}

src/main/java/com/wb/domainserver/domain/mngr/bbs/rvw/controller/RvwController.java

@@ -1,6 +1,8 @@
 package com.wb.domainserver.domain.mngr.bbs.rvw.controller;
 
 import com.wb.domainserver.common.msg.GconeMessageSource;
+import com.wb.domainserver.common.mvc.tags.ui.pagination.PaginationInfo;
+import com.wb.domainserver.common.prop.PaginationProperties;
 import com.wb.domainserver.domain.gcone.bbs.bbs.service.BOBbsService;
 import com.wb.domainserver.domain.gcone.bbs.bbs.vo.BOBbsVO;
 import com.wb.domainserver.domain.gcone.bbs.gnrlbbsctt.service.BOGnrlbbscttService;
@@ -84,6 +86,8 @@ public class RvwController {
     private BOMssageService boMssageService;
     @Autowired
     private BOOrdrService boOrdrService;
+    @Autowired
+    private PaginationProperties paginationProperties;
 
     /**
      * 게시글 목록 조회 팝업 (검색 section)
@@ -177,67 +181,55 @@ public class RvwController {
     @RequestMapping(value = "/selectRvwListInqire")
     public String selectRvwListInqire(BOGnrlbbscttVO bbsctt, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
         bbsctt.setSopmalCd(authSopmalCd);
-        //게시글 노출 항목 설정값과 게시판 목록 조회
+
-        Map<String, Object> content = new HashMap<String, Object>();
         AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
-        if ("01".equals(user.getSysDvCd())) {
+
+        if ("01".equals(user.getSysDvCd())) {//사용자 조회 일 경우
             bbsctt.setSopmalCd(user.getSopmalCd());
-            bbsctt.setMbrDvCd(user.getMbrDvCd());
-            bbsctt.setMbrInnb(user.getUserInnb());
         }
-        if ("mpage".equals(bbsctt.getReqUrl()) || "crm".equals(bbsctt.getReqUrl())) {
+
+        if (!"crm".equals(bbsctt.getReqUrl())) {
             if (user.getUserInnb() > 0) {
                 bbsctt.setRegusr(user.getUserInnb());
-                bbsctt.setRegusrDvCd("01");
+                if ("sopmal".equals(bbsctt.getServerDv())) {
+                    bbsctt.setRegusrDvCd("01");
+                } else {
+                    bbsctt.setRegusrDvCd("02");
+                }
             } else {
                 bbsctt.setRegusr(0);
                 bbsctt.setRegusrDvCd("99");
             }
         }
+        // pagination
+        PaginationInfo paginationInfo = new PaginationInfo();
+        paginationInfo.setCurrentPageNo(bbsctt.getPageIndex());
+        paginationInfo.setRecordCountPerPage(bbsctt.getPageUnit());
+        paginationInfo.setPageSize(paginationProperties.getPageSize());
+
+        bbsctt.setPaginationInfo(paginationInfo);
+        bbsctt.setFirstIndex(paginationInfo.getFirstRecordIndex());
+        bbsctt.setLastIndex(paginationInfo.getLastRecordIndex());
+        bbsctt.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+        // 게시글 목록조회
+        Map<String, Object> resultList = new HashMap<String, Object>();
+        resultList = service.selectBOBbscttListInqire(bbsctt);
+
+        // 게시판 설정 정보 조회
         BOBbsVO bbsVO = new BOBbsVO();
         // bbsVO에 쇼핑몰코드, 해당 게시판 set
         bbsVO.setSopmalCd(bbsctt.getSopmalCd());
         bbsVO.setBbsId(bbsctt.getBbsId());
         bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
-        // 게시판 설정 정보 조회
         DataMap bbsInfo = new DataMap();
         bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
+        DataMap content = new DataMap();
 
-        //사용자에서 이벤트 폼 조회시 해당 쇼핑몰 이벤트 게시판 정보 조회(이벤트,당첨자발표 게시판)
-        List<DataMap> evtBbsList = new ArrayList<>();
-        if ("sopmal".equals(bbsctt.getServerDv())) {
-            if ("03".equals((String) bbsInfo.get("bbsTyCd")) || "11".equals((String) bbsInfo.get("bbsTyCd"))) {
-                evtBbsList = bbsService.selectBOEvtBbsList(bbsVO);
-                content.put("evtBbsList", evtBbsList);
-            }
-        }
-        // 분류 조회
-        List<DataMap> itmList = new ArrayList<>();
-        itmList = service.selectBOBbscttItmInqire(bbsctt);
-
-        // 게시판 목록 조회 및 게시글 개수 조회(관리자 페이지)
-        List<DataMap> bbsListCnt = new ArrayList<>();
-        if (!"01".equals(user.getSysDvCd())) {
-            bbsListCnt = bbsService.selectBOBbsttListInqire(bbsVO);
-            content.put("bbsListCnt", bbsListCnt);
-        }
-        Map<String, Object> qesitmList = new HashMap<String, Object>();
-        Map<String, Object> rvwQesitmList = new HashMap<String, Object>();
-        //리뷰 목록 조회일 시 service 호출
-        if ("rvw".equals(bbsctt.getRvwBbscttDv())) {
-            //추가항목 리스트, 추가항목 항목 리스트(리뷰)
-            qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt);
-            //리뷰항목 리스트, 리뷰항목 항목 리스트
-            rvwQesitmList = service.selectBOStarItm(bbsctt);
-        }
         content.put("bbsInfo", bbsInfo);
-        content.put("itmList", itmList);
-        if ("rvw".equals(bbsctt.getRvwBbscttDv())) {
-            content.put("qesitmList", qesitmList);
-            content.put("rvwQesitmList", rvwQesitmList);
-        }
         content.put("bbsctt", bbsctt);
-
+        content.put("resultList", resultList);
+        content.put("paginationInfo", bbsctt.getPaginationInfo());
         model.addAttribute("resultMap",content);
 
 //        responseHandler.handleResponse(

src/main/java/com/wb/domainserver/domain/mngr/goods/subsvc/controller/SubsvcController.java

@@ -0,0 +1,441 @@
+package com.wb.domainserver.domain.mngr.goods.subsvc.controller;
+
+import com.google.j2objc.annotations.Property;
+import com.wb.domainserver.common.msg.GconeMessageSource;
+import com.wb.domainserver.common.mvc.tags.ui.pagination.PaginationInfo;
+import com.wb.domainserver.common.prop.PaginationProperties;
+import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
+import com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO;
+import com.wb.domainserver.domain.gcone.common.service.BOCommonService;
+import com.wb.domainserver.domain.gcone.goods.cmnuse.vo.BOCmnuseVO;
+import com.wb.domainserver.domain.gcone.goods.goods.vo.BOGoodsVO;
+import com.wb.domainserver.domain.gcone.goods.goodsinfo.vo.BOGoodsInfoVO;
+import com.wb.domainserver.domain.gcone.goods.subsvc.service.BOSubsvcService;
+import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
+import com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO;
+import com.wb.domainserver.domain.mngr.goods.goodsinfo.vo.GoodsInfoVO;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.response.WnbtResponse;
+import com.wb.domainserver.response.WnbtResponseBody;
+import com.wb.domainserver.security.authentication.AnonymousUser;
+import com.wb.domainserver.security.authentication.MemberJwtContextHolder;
+import com.wb.domainserver.security.authorization.annotation.AuthPolicy;
+import com.wb.domainserver.security.authorization.annotation.Policy;
+import com.wb.domainserver.util.communicate.SendToResrc;
+import com.wb.domainserver.util.communicate.ValidateResultConverter;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import com.wb.domainserver.util.file.service.FileStorageService;
+import com.wb.domainserver.util.file.vo.FileVo;
+import io.micrometer.common.util.StringUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+* SubsvcController Controller Class
+*
+* @author
+* @since 2026-01-23
+* @version 1.0
+* @see
+*
+* <pre>
+* == (Modification Information) == 개정이력
+*
+* 수정일 수정자 수정내용
+* ------- -------- ---------------------------
+* 2026-01-23 jazz 최초 생성
+*
+* </pre>
+*/
+
+@Slf4j
+@Controller
+@RequestMapping("/mngr/goods/subsvc")
+public class SubsvcController {
+
+	/** WebClient 호출을 위한 wrapper */
+	@Autowired
+	private SendToResrc sendToResrc;
+
+	/** 공통 메시지 처리를 위한 메시지 객체 */
+	@Autowired
+	private GconeMessageSource gconeMessageSource;
+	/** 파일 업로드 */
+	@Autowired
+	private FileStorageService filestore;
+
+	@Value("${mngrfo.common.fileupload.uploaddirs.web}")
+	private String uploadWebFilePath;
+	@Value("${mngrfo.common.subsvc.dft-goods-optn-innb}")
+	private String dftGoodsOptnInnb;
+	@Autowired
+	private BOSubsvcService boSubsvcService;
+	@Autowired
+	private BOCommonService commonService;
+	@Autowired
+	private BOMaComncdService boMaComncdService;
+	@Autowired
+	private PaginationProperties paginationProperties;
+
+	/**
+	 * 구독서비스 목록 조회 폼
+	 * @param vo
+	 * @return SubsvcListForm.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value="/selectSubsvcListForm")
+	public String selectSubsvcListForm(BOSubsvcVO vo, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if("01".equals(user.getSysDvCd())){
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		Map<String, Object> content = new HashMap<>();
+		content.put("paramVO", vo);
+
+		// 조회조건 구독서비스
+		List<?> SrchSubsvcList = boSubsvcService.selectBOMngrSrchSubsvcList(vo);
+		content.put("srchSubsvcList", SrchSubsvcList);
+
+		//조회조건 판매상태
+		BOMaComncdVO param = new BOMaComncdVO();
+		param.setGroupCd("GOODS_STTUS");
+		List<?> srchSubsvcSttusList = boMaComncdService.selectBOCommcdDetailList(param);
+		content.put("srchSubsvcSttusList", srchSubsvcSttusList);
+
+		//조회조건 노출구분
+		param.setGroupCd("EXPSR_DV");
+		List<?> srchExpsrDvList = boMaComncdService.selectBOCommcdDetailList(param);
+		content.put("srchExpsrDvList", srchExpsrDvList);
+
+		model.addAttribute("resultMap", content);
+		return "mngr/goods/subsvc/SubsvcListForm";
+	}
+
+	/**
+	 * 구독서비스 수정화면
+	 * @param vo
+	 * @return SubsvcDtlU.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value="/selectSubsvcDtlForm")
+	public String selectSubsvcDtlForm(BOSubsvcVO vo, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if ("01".equals(user.getSysDvCd())) {
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		Map<String, Object> content = new HashMap<>();
+		content.put("paramVO", vo);
+
+		// 구독서비스 상세조회
+		DataMap subsvcDtl = boSubsvcService.selectBOSubsvcDetail(vo);
+		content.put("subsvcDtl", subsvcDtl);
+
+		//판매상태
+		BOMaComncdVO param = new BOMaComncdVO();
+		param.setGroupCd("GOODS_STTUS");
+		List<?> subsvcSttusList = boMaComncdService.selectBOCommcdDetailList(param);
+		content.put("subsvcSttusList", subsvcSttusList);
+
+		//노출구분
+		param.setGroupCd("EXPSR_DV");
+		List<?> expsrDvList = boMaComncdService.selectBOCommcdDetailList(param);
+		content.put("expsrDvList", expsrDvList);
+
+		//가용재고정책
+		param.setGroupCd("INVNTRY_POLICY");
+		List<?> invntryPolicyList = boMaComncdService.selectBOCommcdDetailList(param);
+		content.put("invntryPolicyList", invntryPolicyList);
+
+		model.addAttribute("resultMap", content);
+		return "mngr/goods/subsvc/SubsvcU";
+	}
+
+	/**
+	 * 구독서비스 수정
+	 * @param vo
+	 * @param request
+	 * @return
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/updateSubsvc", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> updateSubsvc(BOSubsvcVO vo, HttpServletRequest request, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		vo.setUpdusr(user.getUserInnb());
+		if ("01".equals(user.getSysDvCd())) {
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		//파일 업로드 관련 START
+		List<HashMap<String, Object>> uploadFileMap = new ArrayList<HashMap<String, Object>>();
+
+		request.setAttribute("shopCd", vo.getSopmalCd());
+		request.setAttribute("pathGubun", "GDIG"); //이미지구분코드 - 상품
+
+		try {
+			/*파일 업로드 후 경로 추출하여 vo에 셋팅*/
+			uploadFileMap = filestore.fileUpload(request);
+			if(uploadFileMap.size() == 1){
+				FileVo thumbNail = (FileVo) uploadFileMap.get(0).get("thumbNail");
+				vo.setImg( uploadFileMap.get(0).get("filePath")+ File.separator + thumbNail.getFileName());
+			}
+		} catch (WnbtRestException wre) {
+			log.error(wre.getMessage(), wre);
+			throw new WnbtRestException("파일 업로드에 실패했습니다." + wre.getMessage());
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			throw new WnbtRestException("파일 업로드에 실패했습니다." + e.getMessage());
+		}
+		//파일 업로드 관련 END
+
+		Map<String, Object> message = new HashMap<>();
+		String result = boSubsvcService.updateBOMngrSubsvc(vo);
+		message.put("message",result);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+	}
+
+	/**
+	 * 구독서비스 등록(복사)품
+	 * @param vo
+	 * @return SubsvcC.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value="/selectSubsvcRegistForm")
+	public String selectSubsvcRegistForm(BOSubsvcVO vo, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if ("01".equals(user.getSysDvCd())) {
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		Map<String, Object> content = new HashMap<>();
+		content.put("paramVO", vo);
+
+		// 구독서비스 상세조회
+		DataMap subsvcDtl = boSubsvcService.selectBOSubsvcDetail(vo);
+		content.put("subsvcDtl", subsvcDtl);
+
+		//판매상태
+		BOMaComncdVO param = new BOMaComncdVO();
+		param.setGroupCd("GOODS_STTUS");
+		List<?> subsvcSttusList = boMaComncdService.selectBOCommcdDetailList(param);
+		content.put("subsvcSttusList", subsvcSttusList);
+
+		//노출구분
+		param.setGroupCd("EXPSR_DV");
+		List<?> expsrDvList = boMaComncdService.selectBOCommcdDetailList(param);
+		content.put("expsrDvList", expsrDvList);
+
+		//가용재고정책
+		param.setGroupCd("INVNTRY_POLICY");
+		List<?> invntryPolicyList = boMaComncdService.selectBOCommcdDetailList(param);
+		content.put("invntryPolicyList", invntryPolicyList);
+
+		model.addAttribute("resultMap", content);
+		return "mngr/goods/subsvc/SubsvcC";
+	}
+
+	/**
+	 * 구독서비스 등록
+	 * @param vo
+	 * @param request
+	 * @return
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/insertSubsvc", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> insertSubsvc(BOSubsvcVO vo, HttpServletRequest request, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		vo.setRegusr(user.getUserInnb());
+		if ("01".equals(user.getSysDvCd())) {
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		//파일 업로드 관련 START
+		List<HashMap<String, Object>> uploadFileMap = new ArrayList<HashMap<String, Object>>();
+
+		request.setAttribute("shopCd", vo.getSopmalCd());
+		request.setAttribute("pathGubun", "GDIG"); //이미지구분코드 - 상품
+
+		try {
+			/*파일 업로드 후 경로 추출하여 vo에 셋팅*/
+			uploadFileMap = filestore.fileUpload(request);
+			if(uploadFileMap.size() == 1){
+				FileVo thumbNail = (FileVo) uploadFileMap.get(0).get("thumbNail");
+				vo.setImg( uploadFileMap.get(0).get("filePath")+ File.separator + thumbNail.getFileName());
+			}
+		} catch (WnbtRestException wre) {
+			log.error(wre.getMessage(), wre);
+			throw new WnbtRestException("파일 업로드에 실패했습니다." + wre.getMessage());
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			throw new WnbtRestException("파일 업로드에 실패했습니다." + e.getMessage());
+		}
+		//파일 업로드 관련 END
+
+		//기본상품옵션번호셋팅
+		vo.setDftGoodsOptnInnb(dftGoodsOptnInnb);
+
+		Map<String, Object> message = new HashMap<>();
+		String result = boSubsvcService.insertBOMngrSubsvc(vo);
+		message.put("message",result);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+	}
+
+
+	/**
+	 * 구독서비스 목록 조회 리스트
+	 * @param vo
+	 * @param model
+	 * @return SubsvcList.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/selectSubsvcList")
+	public String selectSubsvcList(BOSubsvcVO vo,ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if("01".equals(user.getSysDvCd())){
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		// 페이징 객체 생성 & 페이징정보 할당
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(vo.getPageIndex());
+		paginationInfo.setRecordCountPerPage(vo.getPageUnit());
+		paginationInfo.setPageSize(paginationProperties.getPageSize());
+
+		vo.setPaginationInfo(paginationInfo);
+		vo.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		vo.setLastIndex(paginationInfo.getLastRecordIndex());
+		vo.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+		if(StringUtils.isEmpty(vo.getSortDv())){
+			//정렬기준 초기값 셋팅
+			vo.setSortDv("subsvcGnrAsc");
+		}
+
+		// 목록 조회
+		List<DataMap> list = boSubsvcService.selectBOMngrSubsvcList(vo);
+
+		Map<String, Object> content = new HashMap<>();
+		content.put("paramVO", vo);
+
+		content.put("list", list);
+		content.put("paginationInfo", vo.getPaginationInfo());
+
+		model.addAttribute("resultMap", content);
+
+		return "mngr/goods/subsvc/SubsvcList";
+	}
+
+	/**
+	 * 구독서비스명 중복체크
+	 * @param vo
+	 * @return ResponseEntity<WnbtResponse>
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/selectSubsvcNmDupCheck", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> selectSubsvcNmDupCheck(BOSubsvcVO vo, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if("01".equals(user.getSysDvCd())){
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		DataMap message = new DataMap();
+		String result = boSubsvcService.selectBOMngrSubsvcNmDupCheck(vo);
+		message.put("message", result);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+	}
+
+
+	/**
+	 * 구독서비스 선택삭제
+	 * @param vo
+	 * @return ResponseEntity<WnbtResponse>
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/deleteSubsvc", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> deleteSubsvc(BOSubsvcVO vo, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		vo.setUpdusr(user.getUserInnb());		//수정자
+
+		if("01".equals(user.getSysDvCd())){
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		DataMap message = new DataMap();
+		String result = boSubsvcService.deleteBOMngrSubsvc(vo);
+		message.put("message", result);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+	}
+
+
+	/**
+	 * 구독서비스 목록 조회 리스트
+	 * @param vo
+	 * @return ResponseEntity<WnbtResponse>
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/selectSrchSubsvcGnrListAjax", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> selectSrchSubsvcGnrListAjax(BOSubsvcVO vo, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if("01".equals(user.getSysDvCd())){
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		Map<String, Object> content = new HashMap<>();
+
+		// 조회조건 구독서비스
+		List<DataMap> SrchSubsvcGnrList = boSubsvcService.selectBOMngrSrchSubsvcGnrList(vo);
+		content.put("srchSubsvcGnrList", SrchSubsvcGnrList);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+	}
+}

src/main/java/com/wb/domainserver/domain/mngr/login/MngrLoginController.java

@@ -13,6 +13,7 @@ import com.wb.domainserver.domain.gcone.mbr.mbr.service.BOMbrService;
 import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO;
 import com.wb.domainserver.domain.gcone.ntcn.mssage.service.BOMssageService;
 import com.wb.domainserver.realm.RealmContextHolder;
+import com.wb.domainserver.realm.util.UrlExtractor;
 import com.wb.domainserver.response.ApiResponse;
 import com.wb.domainserver.response.WnbtResponse;
 import com.wb.domainserver.response.WnbtResponseBody;
@@ -126,6 +127,10 @@ public class MngrLoginController {
 
         loginRequest.setConectBrwsr(browser);
 
+		String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
+		log.debug("mngr loginProcess accessUrl :: {}", accessUrl);
+		loginRequest.setAccessUrl(accessUrl);
+
 		log.debug("mngr :: /login/mngr :: loginRequest  :: {}", loginRequest);
 
        loginUser = service.mngrLogin(loginRequest);
@@ -227,11 +232,18 @@ public class MngrLoginController {
 
 		String queryString = request.getParameter("authSopmalCd");
 		log.debug("mngr loginCheck getParameter authSopmalCd  :: {}", queryString);
+//		if(queryString == null || queryString.isEmpty()){
+//
+//		}
 
 		BOJobUserVO vo = new BOJobUserVO();
 		vo.setMngrId(loginRequest.getUsername());
 		vo.setPassword(loginRequest.getPassword());
 
+		String accessUrl = UrlExtractor.getOriginalHost(loginRequest.getAccessUrl());
+		log.debug("mngr loginCheck accessUrl :: {}", accessUrl);
+		loginRequest.setAccessUrl(accessUrl);
+
 		String secretKey = commonService.selectSecretkey();
 		vo.setSecretKey(secretKey);
 

src/main/java/com/wb/domainserver/domain/mngr/main/controller/MngrMainController.java

@@ -3,8 +3,12 @@ package com.wb.domainserver.domain.mngr.main.controller;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.wb.domainserver.domain.admin.store.sopmal.service.BOMaSopmalService;
 import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
+import com.wb.domainserver.domain.gcone.bbs.bbs.service.BOBbsService;
+import com.wb.domainserver.domain.gcone.bbs.bbs.vo.BOBbsVO;
 import com.wb.domainserver.domain.gcone.main.service.BOMainService;
 import com.wb.domainserver.domain.mngr.main.vo.MainVO;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.exception.code.ErrorCode;
 import com.wb.domainserver.realm.RealmContextHolder;
 import com.wb.domainserver.response.WnbtResponse;
 import com.wb.domainserver.response.WnbtResponseBody;
@@ -43,6 +47,8 @@ public class MngrMainController {
 	private BOMainService service;
 	@Autowired
 	private BOMaSopmalService maSopmalService;
+	@Autowired
+	private BOBbsService bbsService;
 
 	/** WebClient 호출을 위한 wrapper */
 	@Autowired
@@ -68,52 +74,85 @@ public class MngrMainController {
 	@Policy(AuthPolicy.PUBLIC)
 	@RequestMapping(value = "/main")
 //	public String selectMngrMainInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, ModelMap model, HttpServletRequest request) {
-	public String selectMngrMainInqire(String authSopmalCd, ModelMap model, HttpServletRequest request ) {
+	public String selectMngrMainInqire(String authSopmalCd, ModelMap model, HttpServletRequest request, HttpServletResponse response ) {
-		DataMap vo = new DataMap();
+		BOBbsVO vo = new BOBbsVO();
-
+		vo.setSopmalCd(authSopmalCd);
-		log.debug("authSopmalCd index1 {}", authSopmalCd);
-
-		if("".equals(authSopmalCd)|| authSopmalCd == null) {
-			log.debug("index authSopmalCd is null");
-			authSopmalCd = request.getAttribute("authSopmalCd") != null ? request.getAttribute("authSopmalCd").toString() : "";
-//				log.debug("request Attribute authSopmalCd X");
 
+		// 작성자 정보 할당
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if("01".equals(user.getSysDvCd())){
+			vo.setSopmalCd(user.getSopmalCd());
 		}
+		// 쇼핑몰코드
+		vo.setRegusr(user.getUserInnb()); // 등록자
+		vo.setUpdusr(user.getUserInnb()); // 수정자
 
-		log.debug("authSopmalCd index2 {}", authSopmalCd);
+		DataMap resultMap = new DataMap();
+		resultMap = bbsService.selectBOBbscttDshboardInqireForm(vo);
 
-		String sopmalCd = "";
+		ObjectMapper objectMapper	= new ObjectMapper();
 
-		//최초 로그인이 아니면 쿠키에서 쇼핑몰정보 조회
+		try {
-		if(StringUtil.isEmpty(authSopmalCd)) {
+			resultMap.put("updBbsList", objectMapper.writeValueAsString(resultMap.get("updBbsList")));
 
-			if(request.getCookies()!=null) {
+		} catch (WnbtRestException wre){
-
+			log.error(wre.getMessage(), wre);
-				for(Cookie cookie : request.getCookies()){
+			throw new WnbtRestException(wre.getMessage());
-					if("authSopmalCd".equals(cookie.getName())){
+		} catch(Exception e) {
-						sopmalCd = cookie.getValue();
+			log.error(e.getMessage(), e);
-						break;
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
-					}
-				}
-			}
-
-		}else{
-			sopmalCd = authSopmalCd;
 		}
+		model.addAttribute("resultMap", resultMap);
 
-		log.debug("main sopmalCd set {}", sopmalCd);
+		return "mngr/bbs/bbsmngr/BbscttDshboardForm";
 
-		vo.put("sopmalCd", sopmalCd);
 
-		//쇼핑몰 지정후 메인 이동시 sopmalCd 세팅
+//		DataMap vo = new DataMap();
-		model.addAttribute("cookieAuthSopmalCd", sopmalCd);
+//
-
+//		log.debug("authSopmalCd index1 {}", authSopmalCd);
-		log.debug("mainindex {}", model.getAttribute("cookieAuthSopmalCd"));
+//
-
+//		if("".equals(authSopmalCd)|| authSopmalCd == null) {
-//		vo.put("sopmalCd", authSopmalCd);
+//			log.debug("index authSopmalCd is null");
-		Map<String, Object> content = service.selectBOMngrMainInqire(vo);
+//			authSopmalCd = request.getAttribute("authSopmalCd") != null ? request.getAttribute("authSopmalCd").toString() : "";
-		model.addAttribute("resultMap", content);
+////				log.debug("request Attribute authSopmalCd X");
-		return "mngr/index";
+//
+//		}
+//
+//		log.debug("authSopmalCd index2 {}", authSopmalCd);
+//
+//		String sopmalCd = "";
+//
+//		//최초 로그인이 아니면 쿠키에서 쇼핑몰정보 조회
+//		if(StringUtil.isEmpty(authSopmalCd)) {
+//
+//			if(request.getCookies()!=null) {
+//
+//				for(Cookie cookie : request.getCookies()){
+//					if("authSopmalCd".equals(cookie.getName())){
+//						sopmalCd = cookie.getValue();
+//						break;
+//					}
+//				}
+//			}
+//
+//		}else{
+//			sopmalCd = authSopmalCd;
+//		}
+//
+//		log.debug("main sopmalCd set {}", sopmalCd);
+//
+//		vo.put("sopmalCd", sopmalCd);
+//
+//		//쇼핑몰 지정후 메인 이동시 sopmalCd 세팅
+//		model.addAttribute("cookieAuthSopmalCd", sopmalCd);
+//
+//		log.debug("mainindex {}", model.getAttribute("cookieAuthSopmalCd"));
+//
+//
+////		vo.put("sopmalCd", authSopmalCd);
+//		Map<String, Object> content = service.selectBOMngrMainInqire(vo);
+//		model.addAttribute("resultMap", content);
+//		return "mngr/index";
 	}
 
 	/**

src/main/java/com/wb/domainserver/domain/mngr/ntcn/atmcsndng/controller/AtmcSndngController.java

@@ -124,23 +124,16 @@ public class AtmcSndngController {
 			if("01".equals(user.getSysDvCd())){
 				vo.setSopmalCd(user.getSopmalCd());
 			}
-			vo.setFormDvCd("FORM_DV_");
 
-			//시스템 02
+			vo.setFormDvCd("FORM_DV_");
-			vo.setMngrDv("02");
+			vo.setMngrDv("01");
 
 			Map<String, Object> content = new HashMap<>();
-			//검색 폼 code
-			List<DataMap> sopmal = service.selectBOSopmalAtmcSndng();
-			content.put("sopmal",sopmal);
-			//초기 쇼핑몰 코드 없을 경우 목록의 첫번째 입력
-			if("".equals(StringUtil.isNullToString(vo.getSopmalCd()))) {
-				vo.setSopmalCd(StringUtil.isNullToString(sopmal.get(0).get("sopmalCd")));
-			}
 			content.put("bOAtmcSndngVO", vo);
 			content.put("boCtrlMap", service.selectBOAtmcSndngManageListInqire(vo));
 			content.put("shopAtmcSndntTme", service.selectBOShopAtmcSndngTme(vo));
 
+
 //			Map<String,Object> resultMap = responseHandler.handleResponseAsMap(
 //					sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ntcn/atmcsnd/selectBOAtmcSndngManageListInqire", vo)
 //			);

src/main/java/com/wb/domainserver/domain/mngr/ntcn/email/controller/EmailController.java

@@ -285,7 +285,7 @@ public class EmailController {
 	 * @return ResponseEntity<WnbtResponse>
 	 */
 	@Policy(AuthPolicy.RESTRICTED)
-	@RequestMapping(value="/insertEmailImage", method = RequestMethod.POST)
+	@RequestMapping(value="/insertEmailImage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> insertEmailImage(HttpServletRequest request, EmailVO vo, BindingResult bindingResult, @CookieValue(value = "authSopmalCd") String authSopmalCd){
 		vo.setSopmalCd(authSopmalCd);
 
@@ -322,7 +322,9 @@ public class EmailController {
 				log.error(e.getMessage(), e);
 			}
 
+			log.debug("fileInfo:::{}", fileInfo);
 			fileInfoList.add(fileInfo);
+			log.debug("fileInfoList:::{}", fileInfoList);
 		}
 
 		return ResponseEntity.ok(fileInfoList);

src/main/java/com/wb/domainserver/domain/mngr/ordr/subsvc/controller/SubsvcOrdrController.java

@@ -0,0 +1,453 @@
+package com.wb.domainserver.domain.mngr.ordr.subsvc.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.wb.domainserver.common.msg.GconeMessageSource;
+import com.wb.domainserver.common.mvc.tags.ui.pagination.PaginationInfo;
+import com.wb.domainserver.common.prop.PaginationProperties;
+import com.wb.domainserver.domain.admin.store.sopmal.service.BOMaSopmalService;
+import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
+import com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO;
+import com.wb.domainserver.domain.gcone.common.service.BOCommonService;
+import com.wb.domainserver.domain.gcone.goods.purchs.service.BOOrderService;
+import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOOrderLogVO;
+import com.wb.domainserver.domain.gcone.goods.subsvc.service.BOSubsvcService;
+import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
+import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrService;
+import com.wb.domainserver.domain.gcone.ordr.ordr.vo.*;
+import com.wb.domainserver.domain.gcone.ordr.pay.vo.BOPayVO;
+import com.wb.domainserver.domain.gcone.ordr.subsvc.service.BOSubsvcOrdrService;
+import com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO;
+import com.wb.domainserver.domain.gcone.setup.dlvygrp.service.BODlvygrpService;
+import com.wb.domainserver.domain.gcone.setup.nbkk.service.BONbkkService;
+import com.wb.domainserver.domain.gcone.setup.nbkk.vo.BOSetupNbkkVO;
+import com.wb.domainserver.domain.mngr.ordr.ordrmngr.vo.DwldItmVO;
+import com.wb.domainserver.domain.mngr.ordr.ordrmngr.vo.OrdrShippingVO;
+import com.wb.domainserver.domain.mngr.ordr.ordrmngr.vo.OrdrSrchVO;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.exception.code.ErrorCode;
+import com.wb.domainserver.response.WnbtResponse;
+import com.wb.domainserver.response.WnbtResponseBody;
+import com.wb.domainserver.response.WnbtWebClientResponseHandler;
+import com.wb.domainserver.security.authentication.AnonymousUser;
+import com.wb.domainserver.security.authentication.MemberJwtContextHolder;
+import com.wb.domainserver.security.authorization.annotation.AuthPolicy;
+import com.wb.domainserver.security.authorization.annotation.Policy;
+import com.wb.domainserver.util.communicate.SendToResrc;
+import com.wb.domainserver.util.communicate.ValidateResultConverter;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import com.wb.domainserver.util.excel.ExcelDownloadUtil;
+import io.micrometer.common.util.StringUtils;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.*;
+
+/**
+ * 구독서비스 주문 관리 Controller
+ *
+ * @author jazz
+ * @since 2026-02-05
+ * @version 1.0
+ * @see
+ *
+ * <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-02-05 jazz 최초 생성
+ *
+ * </pre>
+ */
+
+@Controller
+@RequestMapping("/mngr/ordr/subsvc")
+@Slf4j
+public class SubsvcOrdrController {
+
+    /** WebClient 호출을 위한 wrapper */
+    @Autowired
+    private WnbtWebClientResponseHandler responseHandler;
+
+    /** WebClient 호출을 위한 wrapper */
+    @Autowired
+    private SendToResrc sendToResrc;
+    /** 공통 메시지 처리를 위한 메시지 객체 */
+    @Autowired
+    private GconeMessageSource gconeMessageSource;
+
+    @Autowired
+    private BOSubsvcOrdrService boSubsvcOrdrService;
+
+    @Autowired
+    private BOSubsvcService boSubsvcService;
+
+    @Autowired
+    private PaginationProperties paginationProperties;
+
+
+    /**
+     * 구독서비스 상품준비 조회 폼
+     * @param subsvcVO,subsvcOrderVO,model,authSopmalCd
+     * @return SubsvcOrdrListForm.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectSubsvcOrdrListForm")
+    public String selectSubsvcOrdrListForm(BOSubsvcVO subsvcVO, BOSubsvcOrderVO subsvcOrderVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcVO.setSopmalCd(authSopmalCd);
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            subsvcVO.setSopmalCd(user.getSopmalCd());
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+
+        Map<String, Object> content = new HashMap<>();
+        content.put("paramVO", subsvcOrderVO);
+
+        // 조회조건 구독서비스
+        List<?> SrchSubsvcList = boSubsvcService.selectBOMngrSrchSubsvcList(subsvcVO);
+        content.put("srchSubsvcList", SrchSubsvcList);
+
+        model.addAttribute("resultMap", content);
+        return "mngr/ordr/subsvc/SubsvcOrdrListForm";
+    }
+
+    /**
+     * 구독서비스 상품준비 목록 조회 리스트
+     * @param subsvcOrderVO
+     * @param model
+     * @return SubsvcOrdrList.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value = "/selectSubsvcOrdrList")
+    public String selectSubsvcOrdrList(BOSubsvcOrderVO subsvcOrderVO,ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+
+        // 페이징 객체 생성 & 페이징정보 할당
+        PaginationInfo paginationInfo = new PaginationInfo();
+        paginationInfo.setCurrentPageNo(subsvcOrderVO.getPageIndex());
+        paginationInfo.setRecordCountPerPage(subsvcOrderVO.getPageUnit());
+        paginationInfo.setPageSize(paginationProperties.getPageSize());
+
+        subsvcOrderVO.setPaginationInfo(paginationInfo);
+        subsvcOrderVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+        subsvcOrderVO.setLastIndex(paginationInfo.getLastRecordIndex());
+        subsvcOrderVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+        if(StringUtils.isEmpty(subsvcOrderVO.getSortDv())){
+            //정렬기준 초기값 셋팅
+            subsvcOrderVO.setSortDv("subsvcGnrAsc");
+        }
+
+        // 목록 조회
+        List<DataMap> list = boSubsvcOrdrService.selectBOSubsvcOrderList(subsvcOrderVO);
+
+        Map<String, Object> content = new HashMap<>();
+        content.put("paramVO", subsvcOrderVO);
+
+        content.put("list", list);
+        content.put("paginationInfo", subsvcOrderVO.getPaginationInfo());
+
+        model.addAttribute("resultMap", content);
+
+        return "mngr/ordr/subsvc/SubsvcOrdrList";
+    }
+
+
+    /**
+     * 구독서비스 상품준비 일괄처리
+     * @param subsvcOrderVO
+     * @return ResponseEntity<WnbtResponse>
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value = "/updateSubsvcOrdrReady", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<WnbtResponse> updateSubsvcOrdrReady(BOSubsvcOrderVO subsvcOrderVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+
+        if("01".equals(user.getSysDvCd())){
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+        /**
+         * 체크대상정보 파싱
+         * 형태 : 주문고유번호@주문상품고유번호@주문상품옵션고유번호@주문배송고유번호
+         * */
+        subsvcOrderVO.setArrOrdrInnb(new ArrayList<String>());
+        subsvcOrderVO.setArrOrdrGoodsInnb(new ArrayList<String>());
+        subsvcOrderVO.setArrOrdrGoodsOptnInnb(new ArrayList<String>());
+        subsvcOrderVO.setArrOrdrDlvyInnb(new ArrayList<String>());
+        ArrayList<String> arrCheck = (ArrayList<String>)subsvcOrderVO.getArrCheck();
+
+        ((ArrayList<String>)subsvcOrderVO.getArrCheck()).forEach(check -> {
+                String[] innb = check.split("@");
+                subsvcOrderVO.getArrOrdrInnb().add(innb[0]);
+                subsvcOrderVO.getArrOrdrGoodsInnb().add(innb[1]);
+                subsvcOrderVO.getArrOrdrGoodsOptnInnb().add(innb[2]);
+                subsvcOrderVO.getArrOrdrDlvyInnb().add(innb[3]);
+        });
+
+        DataMap message = new DataMap();
+        String result = "";
+
+        try{
+            result = boSubsvcOrdrService.updateSubsvcOrdrReady(subsvcOrderVO);
+        }catch(Exception e){
+            log.error(e.getMessage());
+            result = "fail";
+        }
+
+        message.put("message", result);
+
+        return ResponseEntity.ok(
+                WnbtResponse.builder()
+                        .resBody(new WnbtResponseBody(message))
+                        .build()
+        );
+    }
+
+    /**
+     * 구독서비스 상품준비 배송내역 목록 팝업
+     * @param subsvcOrderVO
+     * @param model
+     * @return SubsvcOrdrList.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value = "/selectSubsvcOrdrDlvyListPop")
+    public String selectSubsvcOrdrDlvyListPop(BOSubsvcOrderVO subsvcOrderVO,ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+        // 목록 조회
+        List<DataMap> list = boSubsvcOrdrService.selectBOSubsvcOrderDlvyList(subsvcOrderVO);
+
+        Map<String, Object> content = new HashMap<>();
+        content.put("paramVO", subsvcOrderVO);
+
+        content.put("list", list);
+
+        model.addAttribute("resultMap", content);
+
+        return "mngr/ordr/subsvc/SubsvcOrdrDlvyListPop";
+    }
+
+
+    /**
+     * 구독서비스 상품변경 조회 폼
+     * @param subsvcVO,subsvcOrderVO,model,authSopmalCd
+     * @return SubsvcOrdrMappedListForm.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectSubsvcOrdrMappedListForm")
+    public String selectSubsvcOrdrMappedListForm(BOSubsvcVO subsvcVO, BOSubsvcOrderVO subsvcOrderVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcVO.setSopmalCd(authSopmalCd);
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            subsvcVO.setSopmalCd(user.getSopmalCd());
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+
+        Map<String, Object> content = new HashMap<>();
+        content.put("paramVO", subsvcOrderVO);
+
+        // 조회조건 구독서비스
+        List<?> SrchSubsvcList = boSubsvcService.selectBOMngrSrchSubsvcList(subsvcVO);
+        content.put("srchSubsvcList", SrchSubsvcList);
+
+        model.addAttribute("resultMap", content);
+        return "mngr/ordr/subsvc/SubsvcOrdrMappedListForm";
+    }
+
+    /**
+     * 구독서비스 상품변경 목록 조회 리스트
+     * @param subsvcOrderVO
+     * @param model
+     * @return SubsvcOrdrMappedList.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value = "/selectSubsvcOrdrMappedList")
+    public String selectSubsvcOrdrMappedList(BOSubsvcOrderVO subsvcOrderVO,ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+
+        // 페이징 객체 생성 & 페이징정보 할당
+        PaginationInfo paginationInfo = new PaginationInfo();
+        paginationInfo.setCurrentPageNo(subsvcOrderVO.getPageIndex());
+        paginationInfo.setRecordCountPerPage(subsvcOrderVO.getPageUnit());
+        paginationInfo.setPageSize(paginationProperties.getPageSize());
+
+        subsvcOrderVO.setPaginationInfo(paginationInfo);
+        subsvcOrderVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+        subsvcOrderVO.setLastIndex(paginationInfo.getLastRecordIndex());
+        subsvcOrderVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+        if(StringUtils.isEmpty(subsvcOrderVO.getSortDv())){
+            //정렬기준 초기값 셋팅
+            subsvcOrderVO.setSortDv("subsvcGnrAsc");
+        }
+
+        // 목록 조회
+        List<DataMap> list = boSubsvcOrdrService.selectBOSubsvcOrderMappedList(subsvcOrderVO);
+
+        Map<String, Object> content = new HashMap<>();
+        content.put("paramVO", subsvcOrderVO);
+
+        content.put("list", list);
+        content.put("paginationInfo", subsvcOrderVO.getPaginationInfo());
+
+        model.addAttribute("resultMap", content);
+
+        return "mngr/ordr/subsvc/SubsvcOrdrMappedList";
+    }
+
+
+
+    /**
+     * 구독서비스 구독자 조회 폼
+     * @param subsvcVO,subsvcOrderVO,model,authSopmalCd
+     * @return SubsvcOrdrMbrListForm.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectSubsvcOrdrMbrListForm")
+    public String selectSubsvcOrdrMbrListForm(BOSubsvcVO subsvcVO, BOSubsvcOrderVO subsvcOrderVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcVO.setSopmalCd(authSopmalCd);
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            subsvcVO.setSopmalCd(user.getSopmalCd());
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+
+        Map<String, Object> content = new HashMap<>();
+        content.put("paramVO", subsvcOrderVO);
+
+        // 조회조건 구독서비스
+        List<?> SrchSubsvcList = boSubsvcService.selectBOMngrSrchSubsvcList(subsvcVO);
+        content.put("srchSubsvcList", SrchSubsvcList);
+
+        model.addAttribute("resultMap", content);
+        return "mngr/ordr/subsvc/SubsvcOrdrMbrListForm";
+    }
+
+    /**
+     * 구독서비스 구독자 목록 조회 리스트
+     * @param subsvcOrderVO
+     * @param model
+     * @return SubsvcOrdrMbrList.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value = "/selectSubsvcOrdrMbrList")
+    public String selectSubsvcOrdrMbrList(BOSubsvcOrderVO subsvcOrderVO,ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+
+        // 페이징 객체 생성 & 페이징정보 할당
+        PaginationInfo paginationInfo = new PaginationInfo();
+        paginationInfo.setCurrentPageNo(subsvcOrderVO.getPageIndex());
+        paginationInfo.setRecordCountPerPage(subsvcOrderVO.getPageUnit());
+        paginationInfo.setPageSize(paginationProperties.getPageSize());
+
+        subsvcOrderVO.setPaginationInfo(paginationInfo);
+        subsvcOrderVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+        subsvcOrderVO.setLastIndex(paginationInfo.getLastRecordIndex());
+        subsvcOrderVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+        if(StringUtils.isEmpty(subsvcOrderVO.getSortDv())){
+            //정렬기준 초기값 셋팅
+            subsvcOrderVO.setSortDv("subsvcGnrAsc");
+        }
+
+        // 목록 조회
+        List<DataMap> list = boSubsvcOrdrService.selectBOSubsvcOrderMbrList(subsvcOrderVO);
+
+        Map<String, Object> content = new HashMap<>();
+        content.put("paramVO", subsvcOrderVO);
+        content.put("list", list);
+        content.put("paginationInfo", subsvcOrderVO.getPaginationInfo());
+
+        model.addAttribute("resultMap", content);
+
+        return "mngr/ordr/subsvc/SubsvcOrdrMbrList";
+    }
+
+    /**
+     * 구독서비스 구독자 조회 - 구독자 목록 팝업
+     * @param subsvcOrderVO
+     * @param model
+     * @return SubsvcOrdrList.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value = "/selectSubsvcOrderMbrInfoListPop")
+    public String selectSubsvcOrderMbrInfoListPop(BOSubsvcOrderVO subsvcOrderVO,ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+        //구독서비스 정보 조회
+        DataMap subsvcInfo = boSubsvcOrdrService.selectBOSubsvcInfo(subsvcOrderVO);
+        // 목록 조회
+        List<DataMap> list = boSubsvcOrdrService.selectBOSubsvcOrderMbrInfoList(subsvcOrderVO);
+
+        Map<String, Object> content = new HashMap<>();
+        content.put("paramVO", subsvcOrderVO);
+        content.put("subsvcInfo", subsvcInfo);
+        content.put("list", list);
+
+        model.addAttribute("resultMap", content);
+
+        return "mngr/ordr/subsvc/SubsvcOrderMbrInfoListPop";
+    }
+
+    /**
+     * 구독서비스 구독자 조회 - 배송상품 목록 팝업
+     * @param subsvcOrderVO
+     * @param model
+     * @return SubsvcOrdrList.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value = "/selectSubsvcOrderGoodsInfoListPop")
+    public String selectSubsvcOrderGoodsInfoListPop(BOSubsvcOrderVO subsvcOrderVO,ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+        subsvcOrderVO.setSopmalCd(authSopmalCd);
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if("01".equals(user.getSysDvCd())){
+            subsvcOrderVO.setSopmalCd(user.getSopmalCd());
+        }
+        //구독서비스 정보 조회
+        DataMap subsvcInfo = boSubsvcOrdrService.selectBOSubsvcInfo(subsvcOrderVO);
+        // 목록 조회
+        List<DataMap> list = boSubsvcOrdrService.selectBOSubsvcOrderGoodsInfoList(subsvcOrderVO);
+
+        Map<String, Object> content = new HashMap<>();
+        content.put("paramVO", subsvcOrderVO);
+        content.put("subsvcInfo", subsvcInfo);
+        content.put("list", list);
+
+        model.addAttribute("resultMap", content);
+
+        return "mngr/ordr/subsvc/SubsvcOrderGoodsInfoListPop";
+    }
+
+}

src/main/java/com/wb/domainserver/domain/mngr/setup/dlvygrp/controller/SetupDlvygrpController.java

@@ -151,11 +151,15 @@ public class SetupDlvygrpController {
 		if(bindingResult.hasErrors()) {
 			throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
 		}
+
 		// VO Param setting
 		// 기본배송비 null 일때 0으로 기본값 셋팅
 		if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
 			dlvyGroup.setDftDlvyAmt("0");
 		}
+		if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt2())) {
+			dlvyGroup.setDftDlvyAmt2("0");
+		}
 		// 금액조건 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
 		if(dlvyGroup.getAmtCndUseAt() == null || dlvyGroup.getAmtCndUseAt().equals("N")) {
 			dlvyGroup.setAmtCndAditAmt("0");
@@ -164,6 +168,13 @@ public class SetupDlvygrpController {
 				dlvyGroup.setAmtCndUseAt("N");
 			}
 		}
+		if(dlvyGroup.getAmtCndUseAt2() == null || dlvyGroup.getAmtCndUseAt2().equals("N")) {
+			dlvyGroup.setAmtCndAditAmt2("0");
+			// 금액조건2 여부가 null 일 때 N으로 기본값 셋팅
+			if(dlvyGroup.getAmtCndUseAt2() == null) {
+				dlvyGroup.setAmtCndUseAt2("N");
+			}
+		}
 		// 개수조건 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
 		if(dlvyGroup.getCntCndUseAt() == null || dlvyGroup.getCntCndUseAt().equals("N")) {
 			dlvyGroup.setCntCndAditAmt("0");
@@ -172,6 +183,13 @@ public class SetupDlvygrpController {
 				dlvyGroup.setCntCndUseAt("N");
 			}
 		}
+		if(dlvyGroup.getCntCndUseAt2() == null || dlvyGroup.getCntCndUseAt2().equals("N")) {
+			dlvyGroup.setCntCndAditAmt2("0");
+			// 개수조건2 여부가 null 일 때 N으로 기본값 셋팅
+			if(dlvyGroup.getCntCndUseAt2() == null){
+				dlvyGroup.setCntCndUseAt2("N");
+			}
+		}
 		// 묶음배송 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
 		if(dlvyGroup.getBundleDlvyUseAt() == null || dlvyGroup.getBundleDlvyUseAt().equals("N")){
 			dlvyGroup.setBundleDlvyCndAmt("0");
@@ -180,23 +198,42 @@ public class SetupDlvygrpController {
 				dlvyGroup.setBundleDlvyUseAt("N");
 			}
 		}
+		if(dlvyGroup.getBundleDlvyUseAt2() == null || dlvyGroup.getBundleDlvyUseAt2().equals("N")){
+			dlvyGroup.setBundleDlvyCndAmt2("0");
+			// 묶음배송 여부가 null 일 때 N으로 기본값 셋팅
+			if(dlvyGroup.getBundleDlvyUseAt2() == null) {
+				dlvyGroup.setBundleDlvyUseAt2("N");
+			}
+		}
 		// 배송권역 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
 		if(dlvyGroup.getDlvyAreaAditAt().equals("N")) {
 			dlvyGroup.setAreaAditDlvyAmt("0");
 		}
+		if(dlvyGroup.getDlvyAreaAditAt2().equals("N")) {
+			dlvyGroup.setAreaAditDlvyAmt2("0");
+		}
 		// 반품배송비 편도 null 일때 0으로 기본값 셋팅
-		if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
+		if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyAmt())) {
 			dlvyGroup.setReturnDlvyAmt("0");
 		}
+		if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyAmt2())) {
+			dlvyGroup.setReturnDlvyAmt2("0");
+		}
 		// 반품배송비 왕복 null 일때 0으로 기본값 셋팅
-		if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
+		if(StringUtil.isEmpty(dlvyGroup.getExchngDlvyAmt())) {
 			dlvyGroup.setExchngDlvyAmt("0");
 		}
+		if(StringUtil.isEmpty(dlvyGroup.getExchngDlvyAmt2())) {
+			dlvyGroup.setExchngDlvyAmt2("0");
+		}
 
 		//반품 배송비 왕복금액 적용여부 null 일 경우 N 처리
 		if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyApplcAt())) {
 			dlvyGroup.setReturnDlvyApplcAt("N");
 		}
+		if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyApplcAt2())) {
+			dlvyGroup.setReturnDlvyApplcAt2("N");
+		}
 		// 숫자(금액&갯수) ',' 제거
 		dlvyGroup.setDftDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getDftDlvyAmt()));
 		dlvyGroup.setAmtCndAditAmt(StringUtil.removeCommaChar(dlvyGroup.getAmtCndAditAmt()));
@@ -206,6 +243,14 @@ public class SetupDlvygrpController {
 		dlvyGroup.setReturnDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getReturnDlvyAmt()));
 		dlvyGroup.setExchngDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getExchngDlvyAmt()));
 
+		dlvyGroup.setDftDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getDftDlvyAmt2()));
+		dlvyGroup.setAmtCndAditAmt2(StringUtil.removeCommaChar(dlvyGroup.getAmtCndAditAmt2()));
+		dlvyGroup.setCntCndAditAmt2(StringUtil.removeCommaChar(dlvyGroup.getCntCndAditAmt2()));
+		dlvyGroup.setAreaAditDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getAreaAditDlvyAmt2()));
+		dlvyGroup.setBundleDlvyCndAmt2(StringUtil.removeCommaChar(dlvyGroup.getBundleDlvyCndAmt2()));
+		dlvyGroup.setReturnDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getReturnDlvyAmt2()));
+		dlvyGroup.setExchngDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getExchngDlvyAmt2()));
+
 		//사용자 정보 추출 및 적용
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 		dlvyGroup.setRegusr(user.getUserInnb());
@@ -369,6 +414,9 @@ public class SetupDlvygrpController {
 		if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
 			dlvyGroup.setDftDlvyAmt("0");
 		}
+		if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt2())) {
+			dlvyGroup.setDftDlvyAmt2("0");
+		}
 		// 금액조건 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
 		if(dlvyGroup.getAmtCndUseAt() == null || dlvyGroup.getAmtCndUseAt().equals("N")) {
 			dlvyGroup.setAmtCndAditAmt("0");
@@ -377,6 +425,13 @@ public class SetupDlvygrpController {
 				dlvyGroup.setAmtCndUseAt("N");
 			}
 		}
+		if(dlvyGroup.getAmtCndUseAt2() == null || dlvyGroup.getAmtCndUseAt2().equals("N")) {
+			dlvyGroup.setAmtCndAditAmt2("0");
+			// 금액조건2 여부가 null 일 때 N으로 기본값 셋팅
+			if(dlvyGroup.getAmtCndUseAt2() == null) {
+				dlvyGroup.setAmtCndUseAt2("N");
+			}
+		}
 		// 개수조건 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
 		if(dlvyGroup.getCntCndUseAt() == null || dlvyGroup.getCntCndUseAt().equals("N")) {
 			dlvyGroup.setCntCndAditAmt("0");
@@ -385,6 +440,13 @@ public class SetupDlvygrpController {
 				dlvyGroup.setCntCndUseAt("N");
 			}
 		}
+		if(dlvyGroup.getCntCndUseAt2() == null || dlvyGroup.getCntCndUseAt2().equals("N")) {
+			dlvyGroup.setCntCndAditAmt2("0");
+			// 개수조건2 여부가 null 일 때 N으로 기본값 셋팅
+			if(dlvyGroup.getCntCndUseAt2() == null){
+				dlvyGroup.setCntCndUseAt2("N");
+			}
+		}
 		// 묶음배송 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
 		if(dlvyGroup.getBundleDlvyUseAt() == null || dlvyGroup.getBundleDlvyUseAt().equals("N")){
 			dlvyGroup.setBundleDlvyCndAmt("0");
@@ -393,26 +455,43 @@ public class SetupDlvygrpController {
 				dlvyGroup.setBundleDlvyUseAt("N");
 			}
 		}
+		if(dlvyGroup.getBundleDlvyUseAt2() == null || dlvyGroup.getBundleDlvyUseAt2().equals("N")){
+			dlvyGroup.setBundleDlvyCndAmt2("0");
+			// 묶음배송 여부가 null 일 때 N으로 기본값 셋팅
+			if(dlvyGroup.getBundleDlvyUseAt2() == null) {
+				dlvyGroup.setBundleDlvyUseAt2("N");
+			}
+		}
 		// 배송권역 여부가 Null 이거나 N 일때, 금액값 기본값 셋팅
 		if(dlvyGroup.getDlvyAreaAditAt().equals("N")) {
 			dlvyGroup.setAreaAditDlvyAmt("0");
 		}
-
+		if(dlvyGroup.getDlvyAreaAditAt2().equals("N")) {
+			dlvyGroup.setAreaAditDlvyAmt2("0");
+		}
 		// 반품배송비 편도 null 일때 0으로 기본값 셋팅
-		if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
+		if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyAmt())) {
 			dlvyGroup.setReturnDlvyAmt("0");
 		}
+		if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyAmt2())) {
+			dlvyGroup.setReturnDlvyAmt2("0");
+		}
 		// 반품배송비 왕복 null 일때 0으로 기본값 셋팅
-		if(StringUtil.isEmpty(dlvyGroup.getDftDlvyAmt())) {
+		if(StringUtil.isEmpty(dlvyGroup.getExchngDlvyAmt())) {
 			dlvyGroup.setExchngDlvyAmt("0");
 		}
-
+		if(StringUtil.isEmpty(dlvyGroup.getExchngDlvyAmt2())) {
+			dlvyGroup.setExchngDlvyAmt2("0");
+		}
 		//반품 배송비 왕복금액 적용여부 null 일 경우 N 처리
 		if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyApplcAt())) {
 			dlvyGroup.setReturnDlvyApplcAt("N");
 		}
+		if(StringUtil.isEmpty(dlvyGroup.getReturnDlvyApplcAt2())) {
+			dlvyGroup.setReturnDlvyApplcAt2("N");
+		}
 
-		// 숫자(금액&갯수) , 제거
+		// 숫자(금액&갯수) ',' 제거
 		dlvyGroup.setDftDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getDftDlvyAmt()));
 		dlvyGroup.setAmtCndAditAmt(StringUtil.removeCommaChar(dlvyGroup.getAmtCndAditAmt()));
 		dlvyGroup.setCntCndAditAmt(StringUtil.removeCommaChar(dlvyGroup.getCntCndAditAmt()));
@@ -421,6 +500,14 @@ public class SetupDlvygrpController {
 		dlvyGroup.setReturnDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getReturnDlvyAmt()));
 		dlvyGroup.setExchngDlvyAmt(StringUtil.removeCommaChar(dlvyGroup.getExchngDlvyAmt()));
 
+		dlvyGroup.setDftDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getDftDlvyAmt2()));
+		dlvyGroup.setAmtCndAditAmt2(StringUtil.removeCommaChar(dlvyGroup.getAmtCndAditAmt2()));
+		dlvyGroup.setCntCndAditAmt2(StringUtil.removeCommaChar(dlvyGroup.getCntCndAditAmt2()));
+		dlvyGroup.setAreaAditDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getAreaAditDlvyAmt2()));
+		dlvyGroup.setBundleDlvyCndAmt2(StringUtil.removeCommaChar(dlvyGroup.getBundleDlvyCndAmt2()));
+		dlvyGroup.setReturnDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getReturnDlvyAmt2()));
+		dlvyGroup.setExchngDlvyAmt2(StringUtil.removeCommaChar(dlvyGroup.getExchngDlvyAmt2()));
+
         //배송그룹 등록처리 결과 메시지(JSON) 처리
 		//사용자 정보 추출 및 적용
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();

src/main/java/com/wb/domainserver/domain/mngr/setup/mngr/controller/SetupMngrInfoController.java

@@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -150,10 +151,15 @@ public class SetupMngrInfoController {
 		/*비밀번호 체크*/
 		if("Y".equals(vo.getPwChngAt())){
 			/*1 비밀번호 변경 시 현재 비밀번호 확인*/
-			Map<String, Object> resultMap = responseHandler.handleResponseAsMap(
+//			Map<String, Object> resultMap = responseHandler.handleResponseAsMap(
-							sendToResrc.ofPost(RESRC.GCONEBO, "/admin/user/mngr/selectBOJobUserPasswordInqire", vo)
+//							sendToResrc.ofPost(RESRC.GCONEBO, "/admin/user/mngr/selectBOJobUserPasswordInqire", vo)
-					);
+//					);
-			int result = (int) resultMap.get("result");
+
+			BOJobUserVO uvo = new BOJobUserVO();
+			uvo.setMngrInnb(vo.getMngrInnb());
+			uvo.setPassword(vo.getPassword());
+
+			Integer result = jobUserService.selectBOJobUserPasswordInqire(uvo);;
 			if(result == 0){
 				throw new WnbtRestException("현재 비밀번호가 일치하지 않습니다");
 			}

src/main/java/com/wb/domainserver/domain/mngr/setup/site/controller/SetupSiteController.java

@@ -852,7 +852,7 @@ public class SetupSiteController {
 		log.debug("modeldatares {}", model.getAttribute("resultMap"));
 
 		String requestUri = request.getRequestURI();
-		DataMap matchUri = new DataMap();
+		HashMap matchUri = new HashMap();
 		matchUri.put("/selectBannerSetupPopup", "mngr/setup/site/SiteContentBannerPopup");
 		matchUri.put("/selectBrandIntroSetupPopup", "mngr/setup/site/SiteContentBrandPopup");
 		matchUri.put("/selectGroupTySetupPopup", "mngr/setup/site/SiteContentGoodsGroupPopup");

src/main/java/com/wb/domainserver/domain/sopmal/csc/controller/CscController.java

@@ -126,6 +126,8 @@ public class CscController {
 	private PaginationProperties paginationProperties;
 	@Autowired
 	private BOCmService boCmService;
+	@Autowired
+	private BOMaSopmalService boMaSopmalService;
 
 	/************************************************************
 	  고객센터 목록 폼
@@ -551,7 +553,7 @@ public class CscController {
 	 */
 	@Policy(AuthPolicy.PUBLIC)
 	@RequestMapping(value = "/selectBbscttCn", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> selectBbscttCn(BOGnrlbbscttVO bbsctt) {
+	public ResponseEntity<?> selectBbscttCn(@RequestBody BOGnrlbbscttVO bbsctt) {
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 
 		if ("01".equals(user.getSysDvCd())) {
@@ -938,7 +940,7 @@ public class CscController {
 //				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttRegistPopupForm",bbsctt)
 //		);
 		model.addAttribute("resultMap", resultMap);
-		model.addAttribute("bbscttVO", resultMap);
+		model.addAttribute("bbscttVO", bbsctt);
 		return Util.getDeviceType(request)+"/csc/BbscttRegistPopupC";
 	}
 
@@ -1182,7 +1184,7 @@ public class CscController {
 //		);
 	}
 
-	/**ㄴ
+	/**
 	 * 게시글 삭제
 	 * @param bbsctt
 	 * @return ResponseEntity
@@ -1654,7 +1656,6 @@ public class CscController {
 		if ("01".equals(user.getSysDvCd())) {
 			bbsctt.setSopmalCd(user.getSopmalCd());
 		}
-		;
 
 		BOGnrlbbscttVO regusrInfo = new BOGnrlbbscttVO();
 		DataMap mbrInfo = new DataMap();
@@ -1682,6 +1683,13 @@ public class CscController {
 			regusrInfo.setRegusrDvCd("99");//비회원
 		}
 
+		// 약관정보
+		BOMaSopmalVO sopmalVO = new BOMaSopmalVO();
+		sopmalVO.setStplatDvCd("11");
+		sopmalVO.setSopmalCd(bbsctt.getSopmalCd());
+		List<DataMap> clauseList = new ArrayList<>();
+		clauseList = boMaSopmalService.selectBOClauseInformation(sopmalVO);
+
 		// 게시판 설정 정보
 		BOBbsVO bbsVO = new BOBbsVO();
 		// bbsVO에 쇼핑몰코드, 해당 게시판 set
@@ -1737,6 +1745,7 @@ public class CscController {
 		content.put("regusrInfo", regusrInfo);
 		content.put("bbscttVO", bbsctt);
 		content.put("itmList", itmList);
+		content.put("clauseList", clauseList);
 		content.put("bbsInfo", bbsInfo);
 		content.put("qesitmList", qesitmList);
 		content.put("rvwQesitmList", rvwQesitmList);

src/main/java/com/wb/domainserver/domain/sopmal/goods/controller/GoodsController.java

@@ -21,6 +21,7 @@ import com.wb.domainserver.domain.gcone.setup.dlvygrp.service.BODlvygrpService;
 import com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO;
 import com.wb.domainserver.domain.gcone.setup.ordrmngr.service.BOOrdrMngrService;
 import com.wb.domainserver.domain.gcone.setup.ordrmngr.vo.BOSetupOrdrVO;
+import com.wb.domainserver.response.ApiResponse;
 import com.wb.domainserver.response.WnbtResponse;
 import com.wb.domainserver.response.WnbtResponseBody;
 import com.wb.domainserver.response.WnbtWebClientResponseHandler;
@@ -36,6 +37,9 @@ import com.wb.domainserver.util.util.Util;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.configurationprocessor.json.JSONObject;
+import org.springframework.boot.configurationprocessor.json.JSONStringer;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -647,6 +651,11 @@ public class GoodsController {
 		DataMap rvwBnefInfo = new DataMap();
 		rvwBnefInfo = boGnrlbbscttService.selectBORvwBnefInfo(bbsctt);
 
+		log.debug("rvwBnefInfo : {}",rvwBnefInfo);
+
+//		JSONObject jsonObject = new JSONObject(rvwBnefInfo);
+//		log.debug("jsonObject : {}",jsonObject);
+
 		return ResponseEntity.ok(
 				WnbtResponse.builder()
 						.resBody(new WnbtResponseBody(rvwBnefInfo))

src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java

@@ -9,6 +9,8 @@ import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
 import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
 import com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO;
 import com.wb.domainserver.domain.gcone.common.service.BOCommonService;
+import com.wb.domainserver.domain.gcone.goods.subsvc.service.BOSubsvcService;
+import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
 import com.wb.domainserver.domain.gcone.mbr.mbr.service.BOMbrService;
 import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO;
 import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrService;
@@ -20,15 +22,11 @@ import com.wb.domainserver.domain.gcone.setup.site.vo.BOPrevewVO;
 import com.wb.domainserver.domain.gcone.setup.site.vo.BOSiteVO;
 import com.wb.domainserver.domain.itrnt.str.service.BOItrntStrService;
 import com.wb.domainserver.domain.itrnt.str.vo.BOItrntStrVO;
-import com.wb.domainserver.domain.sample.vo.PrevewVO;
 import com.wb.domainserver.domain.sopmal.main.vo.BrandVO;
-import com.wb.domainserver.domain.sopmal.main.vo.MaSopmalVO;
-import com.wb.domainserver.domain.sopmal.main.vo.MainVO;
 import com.wb.domainserver.domain.sopmal.main.vo.StrVO;
 import com.wb.domainserver.domain.sopmal.mpage.ordr.vo.MyOrdrDlvyVO;
 import com.wb.domainserver.domain.sopmal.mpage.ordr.vo.MyRefundVO;
 import com.wb.domainserver.exception.WnbtRestException;
-import com.wb.domainserver.response.ApiResponse;
 import com.wb.domainserver.response.WnbtResponse;
 import com.wb.domainserver.response.WnbtResponseBody;
 import com.wb.domainserver.response.WnbtWebClientResponseHandler;
@@ -36,7 +34,9 @@ import com.wb.domainserver.security.authentication.AnonymousUser;
 import com.wb.domainserver.security.authentication.MemberJwtContextHolder;
 import com.wb.domainserver.security.authorization.annotation.AuthPolicy;
 import com.wb.domainserver.security.authorization.annotation.Policy;
-import com.wb.domainserver.util.communicate.*;
+import com.wb.domainserver.util.communicate.KakaoProperties;
+import com.wb.domainserver.util.communicate.MultiValueMapConverter;
+import com.wb.domainserver.util.communicate.SendToResrc;
 import com.wb.domainserver.util.dataaccess.DataMap;
 import com.wb.domainserver.util.util.Util;
 import jakarta.servlet.http.Cookie;
@@ -45,14 +45,12 @@ import jakarta.servlet.http.HttpSession;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.math.BigInteger;
@@ -99,6 +97,8 @@ public class MainController {
     private BOMaSopmalService boMaSopmalService;
     @Autowired
     private BOMbrService boMbrService;
+	@Autowired
+	private BOSubsvcService boSubsvcService;
 
     @Policy(AuthPolicy.PUBLIC)
 	@RequestMapping(value= {"/","/index", "/sopmal/index","/sopmal/main"})
@@ -793,6 +793,54 @@ public class MainController {
        return url;
    }
 
+
+    /**
+     * 구독서비스 폼 이동
+     * @param model
+     * @param request
+     * @return String
+     */
+    @Policy(AuthPolicy.PUBLIC)
+    @RequestMapping(value = "/sopmal/main/selectSubscribeForm")
+    public String selectSubscribeForm(ModelMap model, HttpServletRequest request) {
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        DataMap content = new DataMap();
+
+        BOSubsvcVO subsvcVo = new BOSubsvcVO();
+        subsvcVo.setSopmalCd(user.getSopmalCd());
+        content.put("subsvcList", boSubsvcService.selectBOSubsvcList(subsvcVo));
+
+        BOMaSopmalVO sopmalVO = new BOMaSopmalVO();
+        sopmalVO.setSopmalCd(user.getSopmalCd());
+        content.put("sopmalInfo", boMaSopmalService.selectBOSopmalUpdtForm(sopmalVO));
+
+        model.addAttribute("resultMap", content);
+
+        return Util.getDeviceType(request) + "/main/SubscribeR";
+    }
+
+
+    /**
+     * 구독서비스 상세 조회
+     * @param subsvcVO
+     * @return ResponseEntity<WnbtResponse>
+     */
+    @Policy(AuthPolicy.PUBLIC)
+    @RequestMapping(value = "/sopmal/main/selectSubscribeDetail", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<?> selectSubscribeDetail(BOSubsvcVO subsvcVO) {
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        Map<String, Object> message = new HashMap<>();
+        subsvcVO.setSopmalCd(user.getSopmalCd());
+
+        message.put("resultMap", boSubsvcService.selectBOSubsvcDetail(subsvcVO));
+
+        return ResponseEntity.ok(
+                WnbtResponse.builder()
+                        .resBody(new WnbtResponseBody(message))
+                        .build()
+        );
+    }
+
     /**
      * 자담유 > 네가지약속 (모바일)
      *

src/main/java/com/wb/domainserver/domain/sopmal/mbr/controller/MbrController.java

@@ -44,6 +44,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -358,6 +361,77 @@ public class MbrController {
 		);
 	}
 
+	/**
+	 * 이메일 인증번호 생성
+	 * @return
+	 * @author
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/insertEmailAuth", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> insertEmailAuth(BOMbrVO vo, BindingResult bindingResult){
+
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+
+		int random = (int) (Math.random() * 900000) + 100000;
+		vo.setCrtnb(String.format("%06d", random));
+
+		DataMap content = new DataMap();
+		content = service.insertBOEmailAuth(vo);
+
+		/** 자동발송 데이터 세팅 */
+		Map<String, Object> sopmalInfoMap = new HashMap<>();
+		BOMaSopmalVO sopmalVo = new BOMaSopmalVO();
+		sopmalVo.setSopmalCd(user.getSopmalCd());
+		sopmalInfoMap = maSopmalService.selectBOSopmalFooterInfo(sopmalVo);
+		DataMap sopmalInfo = (DataMap) sopmalInfoMap.get("sopmalInfo");
+
+		/** 개인 인증 자동발송 */
+		if (content.get("result").equals("success")) {
+			DataMap paramMap = new DataMap();
+
+//			공통 필수입력 항목
+			paramMap.put("formDvCd", "FORM_DV_MBR");
+			paramMap.put("formDtlDvCd", "05");
+			paramMap.put("sopmalCd", user.getSopmalCd());
+			paramMap.put("mbrInnb", vo.getMbrInnb());//비회원 = NULL
+			paramMap.put("recpntNm", vo.getMbrNm());
+			paramMap.put("recpntEmail", vo.getEmail());
+
+//			SMS
+			paramMap.put("shopname", sopmalInfo.get("sopmalNm"));
+			paramMap.put("authnum", vo.getCrtnb());
+
+			boMssageService.insertBOAtmcsndng(paramMap);
+		}
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+	}
+
+	/**
+	 * 이메일 인증
+	 * @return
+	 * @author
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectEmailAuth", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> selectEmailAuth(BOMbrVO vo, BindingResult bindingResult){
+
+		DataMap content = new DataMap();
+		content = service.selectBOEmailAuth(vo);
+
+		log.debug("selectEmailAuth content : {}", content);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+	}
+
 	/**
 	 * 회원가입
 	 * @return
@@ -368,7 +442,7 @@ public class MbrController {
 
 		HttpSession session = request.getSession();
 		vo.setJoinEnvrnCd(Util.getDeviceType(request));
-		vo.setInflowCoursDomn((String) session.getAttribute("userReferer"));
+		vo.setInflowCoursDomn(request.getHeader("Referer"));
 		if(vo.getJoinMthCd() == null) {
 			// 정합성 검사
 			if (bindingResult.hasErrors()) {
@@ -540,9 +614,40 @@ public class MbrController {
 		return "sopmal_m/mbr/PosJoinCompleteR";
 	}
 
+	/**
+	 * 기존 가입 여부 조회(이메일)
+	 * @return
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectMbrwithdrawalSearchEmail", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> selectMbrwithdrawalSearchEmail(BOMbrVO vo, BindingResult bindingResult){
+
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		vo.setMainSopmalCd(user.getSopmalCd());
+		vo.setSopmalCd(user.getSopmalCd());
+		vo.setMbrDvCd(service.selectBOMbrDvCd(vo));
+
+		String secretKey = commonService.selectSecretkey();
+		vo.setSecretKey(secretKey);
+
+		Map<String, Object> content = new HashMap<>();
+		List<DataMap> mbrWithDrawalList = new ArrayList<DataMap>();
+		if (vo.getJoinMthCd() != null) {
+			mbrWithDrawalList = service.selectBOMbrwithdrawalSnsSearchEmail(vo);
+		} else {
+			mbrWithDrawalList = service.selectBOMbrwithdrawalSearchEmail(vo);
+		}
+		content.put("mbrWithDrawalList", mbrWithDrawalList);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+	}
 
 	/**
-	 * 기존 가입 여부 조회
+	 * 기존 가입 여부 조회(휴대전화)
 	 * @return
 	 */
 	@Policy(AuthPolicy.PUBLIC)
@@ -769,6 +874,143 @@ public class MbrController {
 			paramMap.put("recpntNm", vo.getMbrNm());
 			paramMap.put("recptnNb", vo.getMbtlnb());
 
+//			SMS
+			paramMap.put("shopName", sopmalInfo.get("sopmalNm"));
+			paramMap.put("userid", content.get("selectId"));
+
+			boMssageService.insertBOAtmcsndng(paramMap);
+		}
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+	}
+
+	/**
+	 * 이메일 인증 패스워드 조회
+	 * @return
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectPasswordSearchEmail", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> selectIdPasswordSearchEmail(BOMbrVO vo){
+
+		List<Map<String, String>> errorList	= new ArrayList<>();
+		if (StringUtil.isEmpty(vo.getEmail())) {
+			errorList.add(ValidateResultConverter.setErrorMap("email", "이메일 주소를 입력해 주세요."));
+		}
+		if (StringUtil.isEmpty(vo.getMbrId())) {
+			errorList.add(ValidateResultConverter.setErrorMap("mbrId", "아이디를 입력해 주세요."));
+		}
+		if (StringUtil.isEmpty(vo.getMbrNm())) {
+			errorList.add(ValidateResultConverter.setErrorMap("mbrNm", "이름을 입력해 주세요."));
+		}
+		if(errorList != null && !errorList.isEmpty()) {
+			throw new WnbtRestException(ValidateResultConverter.convertCustomValidate(errorList));
+		}
+
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		vo.setSopmalCd(user.getSopmalCd());
+		vo.setMbrDvCd(service.selectBOMbrDvCd(vo));
+
+		String secretKey = commonService.selectSecretkey();
+		vo.setSecretKey(secretKey);
+
+		log.debug("selectIdPasswordSearchEmail vo: {}", vo);
+		DataMap content = service.selectBOPasswordSearch(vo);
+		log.debug("selectIdPasswordSearchEmail content: {}", content);
+
+		/** 자동발송 데이터 세팅 */
+		Map<String, Object> sopmalInfoMap = new HashMap<>();
+		BOMaSopmalVO sopmalVo = new BOMaSopmalVO();
+		sopmalVo.setSopmalCd(vo.getSopmalCd());
+		sopmalInfoMap = maSopmalService.selectBOSopmalFooterInfo(sopmalVo);
+		DataMap sopmalInfo = (DataMap) sopmalInfoMap.get("sopmalInfo");
+		LocalDate today = LocalDate.now();
+		LocalTime currentTime = LocalTime.now();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+		String formatedNow = currentTime.format(formatter);
+
+		/** 신규 패스워드 자동발송 */
+		if (content.get("result").equals("success")) {
+			DataMap paramMap = new DataMap();
+
+//			공통 필수입력 항목
+			paramMap.put("formDvCd", "FORM_DV_MBR");
+			paramMap.put("formDtlDvCd", "04");
+			paramMap.put("sopmalCd", user.getSopmalCd());
+			paramMap.put("mbrInnb", vo.getMbrInnb());//비회원 = NULL
+			paramMap.put("recpntNm", vo.getMbrNm());
+			paramMap.put("recptnNb", vo.getMbtlnb());
+			paramMap.put("recpntEmail", vo.getEmail());
+
+//			EMAIL
+			paramMap.put("userid", vo.getMbrId());
+			paramMap.put("shopName", sopmalInfo.get("sopmalNm"));
+			paramMap.put("password", content.get("newPassword"));
+			paramMap.put("regist_date", today+" "+formatedNow);
+
+			boMssageService.insertBOAtmcsndng(paramMap);
+		}
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+	}
+
+	/**
+	 * 이메일 인증 아이디 조회
+	 * @return
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectIdSearchEmail", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> selectIdSearchEmail(BOMbrVO vo){
+
+		List<Map<String, String>> errorList	= new ArrayList<>();
+		if (StringUtil.isEmpty(vo.getEmail())) {
+			errorList.add(ValidateResultConverter.setErrorMap("email", "이메일 주소를 입력해 주세요."));
+		}
+		if (StringUtil.isEmpty(vo.getMbrNm())) {
+			errorList.add(ValidateResultConverter.setErrorMap("mbrNm", "이름을 입력해 주세요."));
+		}
+		if(errorList != null && !errorList.isEmpty()) {
+			throw new WnbtRestException(ValidateResultConverter.convertCustomValidate(errorList));
+		}
+
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		vo.setSopmalCd(user.getSopmalCd());
+		vo.setMbrDvCd(service.selectBOMbrDvCd(vo));
+
+		String secretKey = commonService.selectSecretkey();
+		vo.setSecretKey(secretKey);
+
+		log.debug("selectIdSearchEmail vo: {}", vo);
+		DataMap content = service.selectBOIdSearch(vo);
+		log.debug("selectIdSearchEmail content: {}", content);
+
+		/** 자동발송 데이터 세팅 */
+		Map<String, Object> sopmalInfoMap = new HashMap<>();
+		BOMaSopmalVO sopmalVo = new BOMaSopmalVO();
+		sopmalVo.setSopmalCd(vo.getSopmalCd());
+		sopmalInfoMap = maSopmalService.selectBOSopmalFooterInfo(sopmalVo);
+		DataMap sopmalInfo = (DataMap) sopmalInfoMap.get("sopmalInfo");
+
+		/** 전체 아이디 자동발송 */
+		if (content.get("result").equals("success")) {
+			DataMap paramMap = new DataMap();
+
+//			공통 필수입력 항목
+			paramMap.put("formDvCd", "FORM_DV_MBR");
+			paramMap.put("formDtlDvCd", "03");
+			paramMap.put("sopmalCd", user.getSopmalCd());
+			paramMap.put("mbrInnb", vo.getMbrInnb());//비회원 = NULL
+			paramMap.put("recpntNm", vo.getMbrNm());
+			paramMap.put("recptnNb", vo.getMbtlnb());
+			paramMap.put("recpntEmail", vo.getEmail());
+
 //			SMS
 			paramMap.put("shopName", sopmalInfo.get("sopmalNm"));
 			paramMap.put("userid", content.get("selectId"));

src/main/java/com/wb/domainserver/domain/sopmal/mpage/act/controller/MyActController.java

@@ -261,6 +261,140 @@ public class MyActController {
 
 		return Util.getDeviceType(request)+"/mpage/act/MyGoodsQnaDtlUpdtU";
 	}
+	/**
+	 * 1:1 문의 조회
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectM2mQnaInqire")
+	public String selectM2mQnaInqire(HttpServletRequest request, ModelMap model, BOGnrlbbscttVO bbsctt, BOMbrVO vo){
+		bbsctt.setBbsTyCd("12");
+		bbsctt.setServerDv("sopmal");
+		bbsctt.setReqUrl("mpage");
+
+		DataMap content = selectBOBbscttListInqire(bbsctt);
+		model.addAttribute("resultMap", content);
+//		responseHandler.handleResponse(
+//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
+//				model,
+//				"resultMap"
+//		);
+
+		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
+		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
+		model.addAttribute("mpageResultMap", content2);
+//		responseHandler.handleResponse(
+//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
+//				model,
+//				"mpageResultMap"
+//		);
+
+		return Util.getDeviceType(request)+"/mpage/act/MyM2mQaR";
+	}
+	/**
+	 * 1:1 문의 ajax 조회
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectM2mQnaInqireAjax", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<?> selectM2mQnaInqireAjax(BOGnrlbbscttVO bbsctt){
+		bbsctt.setBbsTyCd("12");
+		bbsctt.setServerDv("sopmal");
+		bbsctt.setReqUrl("mpage");
+		//게시글 노출 항목 설정값과 게시판 목록 조회
+
+		DataMap content = selectBOBbscttListInqire(bbsctt);
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+//		return responseHandler.handleResponse(
+//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
+//				ReplyFromResrc::getReply
+//		);
+	}
+
+	/**
+	 * 1:1 문의 수정 폼 이동
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectM2mQnaDtlUpdtForm")
+	public String selectM2mQnaDtlUpdtForm(HttpServletRequest request, ModelMap model,BOGnrlbbscttVO bbsctt, BOMbrVO vo){
+		bbsctt.setServerDv("sopmal");
+		bbsctt.setBbsTyCd("12");
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if ("01".equals(user.getSysDvCd())) {
+			bbsctt.setSopmalCd(user.getSopmalCd());
+		}
+		;
+		if (user.getUserInnb() > 0) {
+			if ("mngr".equals(bbsctt.getServerDv())) {
+				bbsctt.setRegusrDvCd("02"); //관리자
+			} else {
+				bbsctt.setRegusrDvCd("01"); //회원
+				bbsctt.setAnswMbtlnb(user.getMbtlnb());
+			}
+		} else {
+			bbsctt.setRegusrDvCd("99");//비회원
+		}
+		bbsctt.setSecretKey(boCommonService.selectSecretkey());
+		// 게시판 설정 정보
+		BOBbsVO bbsVO = new BOBbsVO();
+		// bbsVO에 쇼핑몰코드, 해당 게시판 set
+		bbsVO.setSopmalCd(bbsctt.getSopmalCd());
+		bbsVO.setBbsId(bbsctt.getBbsId());
+		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
+		DataMap bbsInfo = new DataMap();
+		bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
+
+		// 게시글 상세 조회
+		Map<String, Object> bbscttInfo = new HashMap<String, Object>();
+		bbscttInfo = service.selectBOBbscttUpdt(bbsctt);
+
+		// 분류 조회
+		List<DataMap> itmList = new ArrayList<>();
+		itmList = service.selectBOBbscttItmInqire(bbsctt);
+
+		//추가 항목 조회, 추가항목 항목 조회
+		Map<String, Object> qesitmList = new HashMap<String, Object>();
+		qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt);
+
+		//리뷰항목 리스트, 리뷰항목 항목 리스트
+		Map<String, Object> rvwQesitmList = new HashMap<String, Object>();
+		rvwQesitmList = service.selectBOStarItm(bbsctt);
+
+		Map<String, Object> content = new HashMap<String, Object>();
+		content.put("bbsInfo", bbsInfo);
+		content.put("bbscttVO", bbsctt);
+		content.put("bbscttInfo", bbscttInfo);
+		content.put("itmList", itmList);
+		content.put("qesitmList", qesitmList);
+		content.put("rvwQesitmList", rvwQesitmList);
+
+		model.addAttribute("resultMap", content);
+//		responseHandler.handleResponse(
+//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttUpdtPopupForm",bbsctt),
+//				model,
+//				"resultMap"
+//		);
+		model.addAttribute("bbsctt", bbsctt);
+
+		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
+		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
+		model.addAttribute("mpageResultMap", content2);
+//		responseHandler.handleResponse(
+//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
+//				model,
+//				"mpageResultMap"
+//		);
+
+		return Util.getDeviceType(request)+"/mpage/act/MyM2mQnaDtlUpdtU";
+	}
 
 	/**
 	 * 나의 리뷰 조회 폼

src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java

@@ -62,6 +62,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.wb.domainserver.util.string.StringUtil.isEmpty;
+
 /**
  *
 * 마이페이지 회원
@@ -746,7 +748,10 @@ public class MyMbrController {
 			throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
 		}
 
-		vo.setMbtlnb(vo.getMbtlnb().replace("-",""));
+		if(!isEmpty(vo.getMbtlnb())){
+			vo.setMbtlnb(vo.getMbtlnb().replace("-",""));
+		}
+
 		//모바일일 시 진행
 		if("mobile".equals(mymbrVO.getUtilDv())){
 			if("01".equals(user.getSysDvCd())){
@@ -762,11 +767,15 @@ public class MyMbrController {
 //			Map<String, Object> resultMap = responseHandler.handleResponseAsMap(
 //					sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMbrMbtlnbCompare", mymbrVO)
 //			);
-			int result = service.selectBOMbrMbtlnbCompare(vo);
+//			int result = service.selectBOMbrMbtlnbCompare(vo);
+			int result = service.selectBOMbrEmailCompare(vo);
 			if(result == 0){
-				if(!"Y".equals(mymbrVO.getMbtlnbChngAt())){
+				if(!"Y".equals(mymbrVO.getEmailChngAt())){
-					throw new WnbtRestException("휴대폰 인증이 필요합니다.");
+					throw new WnbtRestException("이메일 인증이 필요합니다.");
 				}
+//				if(!"Y".equals(mymbrVO.getMbtlnbChngAt())){
+//					throw new WnbtRestException("휴대폰 인증이 필요합니다.");
+//				}
 			}
 		}
 
@@ -854,7 +863,7 @@ public class MyMbrController {
 		bowithdrawalVO.setRegistIp(ip);
 
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
-		if (StringUtil.isEmpty(bowithdrawalVO.getSopmalCd())) {//사용자
+		if (isEmpty(bowithdrawalVO.getSopmalCd())) {//사용자
 			bowithdrawalVO.setSopmalCd(user.getSopmalCd());
 		}
 		bowithdrawalVO.setRegusr(user.getUserInnb());

src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java

@@ -19,6 +19,8 @@ public class DlvylcVO extends AbstractVO{
 	/**	배송지설명내용 */
 	@NotBlank(message = "배송지 설명")
 	private String dlvylcDcCn;
+	/**배송지역코드*/
+	private String dlvylcAreaCd;
 	/**	받는사람명	*/
 	@NotBlank(message = "받으시는 분")
 	private String recpntNm;
@@ -30,7 +32,7 @@ public class DlvylcVO extends AbstractVO{
 	private String telnb;
 	/**	우편번호	*/
 	@NotBlank(message = "우편번호")
-	@Length(min=1, max=5)
+	@Length(min=1, max=7)
 	private String zip;
 	/**	도로명,지번 구분	*/
 	private String adresDv;
@@ -43,6 +45,10 @@ public class DlvylcVO extends AbstractVO{
 	/**	상세주소	*/
 	@NotBlank(message = "상세주소")
 	private String dtlAdres;
+	/**	개인통관부호(개인통관번호) */
+	private String cstmclerCd;
+	/**	도도부현 코드(일본) */
+	private String prefcd;
 	/**	기본배송지여부	*/
 	private String dftDlvylcAt = "N";
 	/**	최근배송지여부	*/

src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/MyMbrEmailChngVO.java

@@ -12,11 +12,11 @@ public class MyMbrEmailChngVO extends AbstractVO {
 	private static final long serialVersionUID = 1L;
 	
 	/*id*/
-	@NotBlank(message = "아이디")
+//	@NotBlank(message = "아이디")
 	private String id;
 	
 	/*도메인*/
-	@NotBlank(message = "도메인")
+//	@NotBlank(message = "도메인")
 	private String domain;
 	
 	/*이메일주소*/

src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/MyMbrVO.java

@@ -61,6 +61,9 @@ public class MyMbrVO extends AbstractVO {
 	/** 휴대폰 번호 변경 여부*/
 	private String mbtlnbChngAt;
 
+	/** 이메일 변경 여부*/
+	private String emailChngAt;
+
 	/** SMS수신여부 */
 	private String smsRecptnAt;
 
@@ -68,7 +71,7 @@ public class MyMbrVO extends AbstractVO {
 	private String telnb;
 
 	/** 우편번호 */
-	@NotBlank(message = "우편번호")
+//	@NotBlank(message = "우편번호")
 	private String zip;
 
 	/** 도로명; 지번 */
@@ -82,7 +85,7 @@ public class MyMbrVO extends AbstractVO {
 	private String rnmAdres;
 
 	/** 상세주소 */
-	@NotBlank(message = "상세주소")
+//	@NotBlank(message = "상세주소")
 	private String dtlAdres;
 
 	/** 성별 */

src/main/java/com/wb/domainserver/domain/sopmal/mpage/ordr/controller/MyOrdrController.java

@@ -155,6 +155,93 @@ public class MyOrdrController {
     }
 
 
+    /**
+     * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 목록 조회 화면 이동
+     * @return SubsvcOrdrDlvyListRForm.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectMbrSubsvcOrdrListInqireRForm")
+    public String selectMbrSubsvcOrdrListInqireForm(HttpServletRequest request, ModelMap model, MyOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception {
+        model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrDlvyVO));
+
+        // 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
+        Map<String, Object> content = selectBOMpageInfoInqire(vo);
+        model.addAttribute("mpageResultMap", content);
+
+        return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDlvyListRForm";
+    }
+
+    /**
+     * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 주문/배송 목록 조회
+     * @param ordrDlvyVO
+     * @return ResponseEntity<WnbtResponse>
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectMbrSubsvcOrdrListInqireAjax")
+    public String selectMbrSubsvcOrdrListInqireAjax(ModelMap model, BOOrdrDlvyVO ordrDlvyVO) {
+
+        Map<String, Object> content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
+        model.addAttribute("data", content);
+        return "sopmal/mpage/ordr/SubsvcOrdrDlvyListR";
+    }
+
+    /**
+     * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송조회 > 구독서비스 주문/배송 목록 조회 (스크롤)
+     * @param ordrDlvyVO
+     * @return ResponseEntity<WnbtResponse>
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectMbrSubsvcOrdrListInqireScrollAjax", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<WnbtResponse> selectMbrSubsvcOrdrListInqireScrollAjax(ModelMap model, BOOrdrDlvyVO ordrDlvyVO) {
+
+        Map<String, Object> content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
+        return ResponseEntity.ok(
+                WnbtResponse.builder()
+                        .resBody(new WnbtResponseBody(content))
+                        .build()
+        );
+    }
+
+    /**
+     * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송조회 > 주문/배송 상세 조회 화면 이동
+     * @return OrdrDtlR.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectMbrSubsvcOrdrDtlInqire")
+    public String selectMbrSubsvcOrdrDtlInqire(HttpServletRequest request, ModelMap model, BOOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception {
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if ("01".equals(user.getSysDvCd())) {
+            ordrDlvyVO.setSopmalCd(user.getSopmalCd());
+        }
+        Map<String, Object> message = boOrdrService.selectMbrOrdrDtlInqire(ordrDlvyVO);
+        /**발급대상구분코드*/
+        BOMaComncdVO bOMaComncdVO = new BOMaComncdVO();
+        bOMaComncdVO.setGroupCd("ISSU_TRGET_DV");
+        List<?> issuTrgetDv = bOMaComncdService.selectBOCommcdDetailList(bOMaComncdVO);
+
+        message.put("issuTrgetDv", issuTrgetDv);
+        model.addAttribute("data", message);
+//        responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/selectBOMbrOrdrDtlInqire", ordrDlvyVO),
+//                model,
+//                "data"
+//        );
+        model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrDlvyVO));
+        model.addAttribute("vo", ordrDlvyVO);
+
+        // 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
+        Map<String, Object> content = selectBOMpageInfoInqire(vo);
+        model.addAttribute("mpageResultMap", content);
+//        responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire", ordrDlvyVO),
+//                model,
+//                "mpageResultMap"
+//        );
+
+        return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDtlR";
+    }
+
+
     /**
      * 마이 페이지 > MY쇼핑 > 주문/배송조회 > 주문/배송 목록 조회
      * @param ordrDlvyVO
@@ -1466,6 +1553,39 @@ public class MyOrdrController {
         return content;
     }
 
+
+    /**
+     * 사용자 > 마이페이지 > 구독서비스 주문/배송 조회
+     */
+    public Map<String, Object> selectBOMbrSubsvcOrdrListInqireAjax(BOOrdrDlvyVO ordrDlvyVO) {
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if ("01".equals(user.getSysDvCd())) {
+            ordrDlvyVO.setSopmalCd(user.getSopmalCd());
+        }
+        ordrDlvyVO.setMbrInnb(BigInteger.valueOf(user.getUserInnb()));
+        ordrDlvyVO.setMbrDvCd(user.getMbrDvCd());
+
+        PaginationInfo paginationInfo = new PaginationInfo();
+        paginationInfo.setCurrentPageNo(ordrDlvyVO.getPageIndex());
+        paginationInfo.setRecordCountPerPage(ordrDlvyVO.getPageUnit());
+        paginationInfo.setPageSize(paginationProperties.getPageSize());
+
+        ordrDlvyVO.setPaginationInfo(paginationInfo);
+        ordrDlvyVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+        ordrDlvyVO.setLastIndex(paginationInfo.getLastRecordIndex());
+        ordrDlvyVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+        ordrDlvyVO.setMbrInnb(BigInteger.valueOf(MemberJwtContextHolder.getMemberInfo().getUserInnb()));
+
+        List<DataMap> resultList = boOrdrService.selectMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
+
+        Map<String, Object> content = new HashMap<>();
+
+        content.put("resultList", resultList);
+        content.put("paginationInfo", ordrDlvyVO.getPaginationInfo());
+
+        return content;
+    }
+
     /**
      * bo로직 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 조회 > 결제취소/환불신청 정보 조회
      */

src/main/java/com/wb/domainserver/domain/sopmal/ordr/controller/OrdrController.java

@@ -362,6 +362,7 @@ public class OrdrController {
             param.put("mbrDvCd", user.getMbrDvCd());
             param.put("mbrInnb", user.getUserInnb());
         }
+        log.debug("CONselectSetleExpectAmt-param : {}", param);
         Map<String, Object> content = new HashMap<>();
         try {
             DataMap datamap = new DataMap();
@@ -1723,6 +1724,7 @@ public class OrdrController {
     @Policy(AuthPolicy.RESTRICTED)
     @RequestMapping(value="/selectSpbk")
     public String selectSpbk(HttpServletRequest request, ModelMap model, BOSpbkVO spbkVO) throws Exception {
+        log.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/selectSpbk 시작");
         String sesionId ="";
         Cookie[] cookies = request.getCookies();
         if(cookies != null){
@@ -1808,6 +1810,7 @@ public class OrdrController {
 		model.addAttribute("commonCertiKey", naverMap.getCommonCertiKey());
 		// 네이버 페이 BUTTON_KEY
 		model.addAttribute("buttonKey", naverMap.getButtonKey());
+        log.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/selectSpbk 끝");
         return Util.getDeviceType(request) + "/ordr/SpbkPtinR";
     }
 
@@ -1818,6 +1821,7 @@ public class OrdrController {
     @Policy(AuthPolicy.RESTRICTED)
     @RequestMapping(value="/selectSpbkGoodsList")
     public String selectSpbkGoodsList(HttpServletRequest request, ModelMap model, @RequestBody BOSpbkVO spbkVO) throws Exception {
+        log.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/selectSpbkGoodsList 시작");
         String sesionId ="";
         Cookie[] cookies = request.getCookies();
         if(cookies != null){
@@ -1837,6 +1841,7 @@ public class OrdrController {
 
         model.addAttribute("data", resultMap);
         model.addAttribute("jsonData", new Gson().toJson(resultMap));
+        log.debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/selectSpbkGoodsList 끝");
 
         return Util.getDeviceType(request) + "/ordr/SpbkPtinRList";
     }
@@ -3004,6 +3009,13 @@ public class OrdrController {
                 return content;
             }
         } else {
+//            if (CollectionUtils.isEmpty(multiOrdrDlvylc)) {
+//                log.info("배송지 정보를 찾을 수 없습니다.");
+//                content.put("result","Y");
+//                content.put("message", "배송지 정보를 찾을 수 없습니다.");
+//                //            throw new WnbtRestException("주문유형 정보를 찾을 수 없습니다.");
+//                return content;
+//            }
             if (CollectionUtils.isEmpty(shipping)) {
                 log.info("배송지 정보를 찾을 수 없습니다.");
                 content.put("result","Y");
@@ -3040,6 +3052,70 @@ public class OrdrController {
         String[] receptMbtlnbArray = null; // 배송지 받는이 휴대폰번호
 
         if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원개인결제, 정기배송
+//            if (!CollectionUtils.isEmpty(multiOrdrDlvylc)) {
+//
+//                // 배송지 리스트
+//                List<LinkedHashMap<String, Object>> dlvylcListMulti = (List<LinkedHashMap<String, Object>>) multiOrdrDlvylc.get("dlvylc");
+//
+//                /** ----------------------------------------------- 배송지별 주문 상품 수량 검사 START ----------------------------------------------- */
+//                content = checkDistributedQyMatchesOrder(goodsList, dlvylcListMulti);
+//                if (!"0".equals(content.get("status"))) {
+//                    return content;
+//                }
+//                /** ----------------------------------------------- 배송지별 주문 상품 수량 검사 END ----------------------------------------------- */
+//
+//                // 부정판매 체크를 위한 배송지 정렬
+//                if (!CollectionUtils.isEmpty(dlvylcListMulti)) {
+//
+//                    boolean hasInvalidAddress = dlvylcListMulti.stream().anyMatch(map -> {
+//                        String dlvylcZip = StringUtil.isNullToString(map.get("dlvylcZip"));
+//                        String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
+//                        String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
+//                        String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
+//                        String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
+//
+//                        return StringUtil.isEmpty(dlvylcZip)
+//                                || StringUtil.isEmpty(adresDvCd)
+//                                || ("01".equals(adresDvCd) && StringUtil.isEmpty(dlvylcRnmAdres))
+//                                || ("02".equals(adresDvCd) && StringUtil.isEmpty(dlvylcLnbAdres))
+//                                || StringUtil.isEmpty(adresDtl);
+//                    });
+//
+//                    if (hasInvalidAddress) {
+//                        content.put("result","Y");
+//                        content.put("message", "배송지 정보를 찾을 수 없습니다. 다시 시도해 주세요.");
+//                        return content;
+//                    }
+//
+//                    List<String> adresList = dlvylcListMulti.stream()
+//                            .map(map -> {
+//                                String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
+//                                String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
+//                                String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
+//                                String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
+//                                String adresMulti;
+//                                if ("01".equals(adresDvCd)) {
+//                                    adresMulti = dlvylcRnmAdres + " " + adresDtl;
+//                                } else {
+//                                    adresMulti = dlvylcLnbAdres + " " + adresDtl;
+//                                }
+//
+//                                return adresMulti;
+//                            })
+//                            .collect(Collectors.toList());
+//
+//                    adresArray = adresList.toArray(new String[0]);
+//
+//                    List<String> receptMbtlnbList = dlvylcListMulti.stream()
+//                            .map(map -> {
+//                                return StringUtil.isNullToString(map.get("recpntMbtlnb"));
+//                            })
+//                            .collect(Collectors.toList());
+//
+//                    receptMbtlnbArray = receptMbtlnbList.toArray(new String[0]);
+//
+//                }
+//            }
             if (
                     StringUtil.isEmpty((String) shipping.get("dlvylcZip")) ||
                             StringUtil.isEmpty((String) shipping.get("dlvylcAdresDvCd")) ||

src/main/java/com/wb/domainserver/exception/advice/GlobalExceptionControllerAdvice.java

@@ -55,7 +55,7 @@ public class GlobalExceptionControllerAdvice {
                 .resBody(new WnbtResponseBody(e, e.getMessage()))
                 .build();
 
-        int errCode = 500;
+        int errCode = 400;
 
         if(StringUtils.hasText(e.getCode())){
             errCode = Integer.parseInt(e.getCode());

src/main/java/com/wb/domainserver/exception/code/PurchsValidCode.java

@@ -26,7 +26,8 @@ public enum PurchsValidCode {
     EVT_TRGET_AT("evtTrgetAt","GC25E03T24A014","이벤트 대상 상품 아님"),
     DPLCT_LMTT_COUPON("dplctLmttCoupon","GC25D03L24C015","이벤트 중복제한 쿠폰 존재"),
     PURCHS_TOTAL_AMT("setleAmt","GC25P03T24A016","주문 요청 총 결제금액과 계산된 총 결제금액 불일치"),
-    USE_CASH_MLG_AT("useCashMlgAt","GC25U06C26M017","GC 머니 보유금액 초과 사용")
+    USE_CASH_MLG_AT("useCashMlgAt","GC25U06C26M017","GC 머니 보유금액 초과 사용"),
+    OPTN_EXPSR_AT("optnExpsrAt","GC25G06C26M018","판매 불가능한 상품 존재 - 변경된 상품옵션이 장바구니에 있음")
 
     ;
 

src/main/java/com/wb/domainserver/interceptor/mngr/MngrMenuInterceptor.java

@@ -53,6 +53,8 @@ public class MngrMenuInterceptor implements HandlerInterceptor {
 
 		String accessUri = request.getRequestURI(); // 현재 요청된 URI
 
+		logger.debug("MenuInterceptor accessUri: {}", accessUri);
+
 		AnonymousUser mngr = MemberJwtContextHolder.getMemberInfo();
 		String mngrDv = mngr.getMngrDv();
 
@@ -108,7 +110,7 @@ public class MngrMenuInterceptor implements HandlerInterceptor {
 			}
 		}
 
-		if("/mngr/main".equals(accessUri) || "/admin/main".equals(accessUri) || accessUri.contains("/crm") || accessUri.contains("/itrnt")) {
+		if("/mngr/main".equals(accessUri) || "/admin/main".equals(accessUri) || accessUri.contains("/crm") || accessUri.contains("/itrnt") || accessUri.contains("/mngr/bbs")) {
 			checkMenu = "Y";
 		}
 

src/main/java/com/wb/domainserver/interceptor/sopmal/LoggingInterceptor.java

@@ -83,11 +83,6 @@ public class LoggingInterceptor implements HandlerInterceptor {
             //request referer 정보 확인
             String referer = request.getHeader("Referer");
 
-            HttpSession session = request.getSession();
-            if(!ObjectUtils.isEmpty(session.getAttribute("userReferer"))){
-                session.setAttribute("userReferer", referer);
-            }
-
             //ip 정보
             String clientIp = request.getHeader("X-Forwarded-For");
             if (!StringUtil.isEmpty(clientIp) && clientIp.contains(",")) {

src/main/java/com/wb/domainserver/realm/filter/RealmFilter.java

@@ -61,7 +61,7 @@ public class RealmFilter implements Filter {
                 //root context 접근 할 경우 처리
                 String reqUri = request.getRequestURI();
                 logger.debug("RealmFilter reqUri: {}", reqUri);
-                if(reqUri == null || "/".equals(reqUri) || "/sopmal".equals(reqUri)){
+                if(reqUri == null || "/".equals(reqUri) || "/sopmal".equals(reqUri) || "/index".equals(reqUri)){
 
                     //사용자 일 경우
                     if("01".contains(sysDvCd)){
@@ -75,7 +75,7 @@ public class RealmFilter implements Filter {
 
                     log.debug("mngr redirect from root context ::by realmFilter");
                     request.getRequestDispatcher(reqUri).forward(request, response);
-
+                    return;
                 }
 
 

src/main/java/com/wb/domainserver/realm/repository/SiteRepository.java

@@ -17,6 +17,6 @@ public interface SiteRepository extends JpaRepository<Site, Long> {
     @Query("SELECT s.realm FROM Site s WHERE s.url = :url")
     Optional<Realm> findRealmBySiteUrl(@Param("url") String url);
 
-    @Query("SELECT s FROM Site s WHERE :hostUrl LIKE CONCAT('%', s.url, '%')")
+    @Query("SELECT s FROM Site s WHERE s.url = :hostUrl")
     Optional<Site> findByUrl(@Param("hostUrl")String hostUrl);
 }

src/main/java/com/wb/domainserver/realm/util/UrlExtractor.java

@@ -87,14 +87,14 @@ public class UrlExtractor {
         String host = url.replaceFirst("https?://", "");
 
         // 로컬 혹은 개발 서브도메인 제거
-/*      서브도메인 구분
+        //서브도메인 구분
         if (host.startsWith("loc.")) {
             host = host.replaceFirst("loc\\.", "");
         }
         if (host.startsWith("dev.")) {
             host = host.replaceFirst("dev\\.", "");
         }
-*/
+
 
         // 포트번호 제거
         int portIndex = host.indexOf(":");

src/main/java/com/wb/domainserver/security/config/RealmFilterConfig.java

@@ -1,26 +0,0 @@
-package com.wb.domainserver.security.config;
-
-import com.wb.domainserver.realm.RealmResolver;
-import com.wb.domainserver.realm.filter.RealmFilter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-
-@Configuration
-public class RealmFilterConfig {
-
-    @Autowired
-    RealmResolver realmResolver;
-
-    @Bean
-    public FilterRegistrationBean<RealmFilter> realmFilter() {
-        FilterRegistrationBean<RealmFilter> registrationBean = new FilterRegistrationBean<>();
-        registrationBean.setFilter(new RealmFilter(realmResolver));
-        registrationBean.addUrlPatterns("/*");
-        registrationBean.setOrder(Ordered.HIGHEST_PRECEDENCE);
-        return registrationBean;
-    }
-
-}

src/main/java/com/wb/domainserver/security/config/ResourceServerConfig.java

@@ -15,6 +15,7 @@
  */
 package com.wb.domainserver.security.config;
 
+import com.wb.domainserver.common.prop.PropertyService;
 import com.wb.domainserver.domain.sopmal.oauth.service.CustomOAuth2UserService;
 import com.wb.domainserver.exception.response.CustomOauthFailureException;
 import com.wb.domainserver.realm.RealmResolver;
@@ -23,6 +24,7 @@ import com.wb.domainserver.response.CustomAuthenticationSuccessHandler;
 import com.wb.domainserver.security.authentication.CustomAccessDeniedEntryPoint;
 import com.wb.domainserver.security.authentication.CustomAuthenticationEntryPoint;
 import com.wb.domainserver.security.authorization.WnbtAuthorizationManager;
+import com.wb.domainserver.security.filter.BatchFilter;
 import com.wb.domainserver.security.filter.CustomXssFilter;
 import com.wb.domainserver.security.filter.JwtAuthenticationFilter;
 import com.wb.domainserver.security.handler.CustomLogoutSuccessHandler;
@@ -113,7 +115,7 @@ public class ResourceServerConfig {
         OrRequestMatcher resourceMatchers = new OrRequestMatcher(resourcePath);
 
         return http
-                .securityMatcher("/sopmal/**", "/oauth2/**", "/login/oauth2/**")
+                .securityMatcher("/*", "/sopmal/**", "/oauth2/**", "/login/oauth2/**","/file/*")           ///gcone/** #배치호출처리
                 .headers((headers)->headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin))
                 .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(authorize ->
@@ -205,6 +207,26 @@ public class ResourceServerConfig {
                 .build();
     }
 
+    @Bean
+    @Order(3)
+    SecurityFilterChain batchSecurityFilterChain(HttpSecurity http, SecurityPathProperties securityProperties) throws Exception {
+
+        List<RequestMatcher> uriList = securityProperties.getBatch().getUri().stream()
+                .map(AntPathRequestMatcher::new)
+                .collect(Collectors.toList());
+        OrRequestMatcher uri = new OrRequestMatcher(uriList);
+
+        return http
+                .securityMatcher(uri)
+                .headers((headers)->headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin))
+                .csrf(AbstractHttpConfigurer::disable)
+                .addFilterBefore(new BatchFilter(securityProperties), RequestCacheAwareFilter.class)        /*batch 호출된 주소 확인 후 주소가 아니면 제외*/
+                .exceptionHandling(exceptions -> exceptions
+                        .accessDeniedHandler(accessDeniedEntryPoint)
+                )
+                .build();
+    }
+
 //
 //	private String customBearerTokenResolver(HttpServletRequest request) {
 //		String authorization = request.getHeader("Authorization");

src/main/java/com/wb/domainserver/security/config/SecurityPathProperties.java

@@ -19,6 +19,8 @@ public class SecurityPathProperties {
     private Solmal solmal;
     private Admin admin;
     private Common common;
+    private Batch batch;
+
 
     @Getter
     @Setter
@@ -39,5 +41,12 @@ public class SecurityPathProperties {
     public static class Common {
         private List<String> resources;
     }
+
+    @Getter
+    @Setter
+    public static class Batch {
+        private List<String> accessip;
+        private List<String> uri;
+    }
 }
 

src/main/java/com/wb/domainserver/security/filter/BatchFilter.java

@@ -0,0 +1,51 @@
+package com.wb.domainserver.security.filter;
+
+import com.wb.domainserver.common.prop.PropertyService;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.security.config.SecurityPathProperties;
+import com.wb.domainserver.security.filter.wrapper.XssServletWrapper;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.util.ContentCachingResponseWrapper;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+@Slf4j
+public class BatchFilter implements Filter {
+
+    SecurityPathProperties securityProperties;
+
+    public BatchFilter(SecurityPathProperties securityProperties) {
+        this.securityProperties = securityProperties;
+    }
+
+    /*
+    * batch서버에서 호출 되었는지 확인하는 필터
+    * */
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        HttpServletRequest httpRequest = (HttpServletRequest) request;
+
+        String ip = httpRequest.getHeader("X-Forwarded-For");
+        if (ip == null || ip.isEmpty()) {
+            ip = httpRequest.getRemoteAddr();
+        }
+        // 여러 프록시를 거친 경우, 콤마로 구분된 여러 IP가 있을 수 있어 첫 번째 IP만 가져오거나 처리 필요 [4, 7].
+        if (ip != null && ip.contains(",")) {
+            ip = ip.split(",")[0];
+        }
+
+        Object[] whiteIp = securityProperties.getBatch().getAccessip().toArray();
+
+        /* 대상 ip가 아닌경우 처리불가*/
+        if(!Arrays.asList(whiteIp).contains(ip)){
+            throw new IOException("접근이 허용되지 않은 IP입니다.");
+        }
+
+        chain.doFilter(request, response);
+    }
+}

src/main/java/com/wb/domainserver/security/filter/JwtAuthenticationFilter.java

@@ -40,6 +40,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
         response.setCharacterEncoding(StandardCharsets.UTF_8.name());
 
         String realm = RealmContextHolder.getRealm().toLowerCase();
+        log.debug("request realm: {}", realm);
 
         try {
 

src/main/java/com/wb/domainserver/util/file/controller/FileController.java

@@ -39,7 +39,7 @@ import java.util.Map;
 
 @Slf4j
 @Controller
-@RequestMapping("/mngr/file")
+@RequestMapping(value={"/mngr/file","/file"})
 public class FileController {
 
 	@Autowired

src/main/java/com/wb/domainserver/util/file/service/MailSenderSvc.java

@@ -1,6 +1,13 @@
 package com.wb.domainserver.util.file.service;
 
 import  com.wb.domainserver.util.file.vo.EmailProperties;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
+import jakarta.mail.*;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,13 +15,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
-import javax.mail.*;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
@@ -30,7 +30,7 @@ public class MailSenderSvc {
 
 	// 보낼사람의 이메일,제목 , 내용
 	@Async
-	public void sendMail(String toEmail, String fromEmail, String subject, String text, File file) throws MessagingException{
+	public void sendMail(String toEmail, String fromEmail, String subject, String text, File file) throws MessagingException {
 
 		String smtpHostServer = emailProperties.getHost();
 		String senderEmail = fromEmail;

src/main/resources/application-dev.yml

@@ -1,5 +1,8 @@
 server:
   port: 18500
+  error:
+    whitelabel:
+      enabled: false
 
 management:
   endpoints:
@@ -7,29 +10,83 @@ management:
       exposure:
         include: refresh
 
+jwt:
+  access:
+    secretKey: YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ==YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ== # BASE64 encode(alleyslabTestBase64EncodeJwtSecretkey) *2
+    max-age: 3600 # 1시간 (초)
+  refresh:
+    secretKey: YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ==YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ== # BASE64 encode(alleyslabTestBase64EncodeJwtSecretkey) *2
+    max-age: 86400 # 24시간 (초)
+
 spring:
   security:
     oauth2:
       resourceserver:
         jwt:
           issuer-uri: http://172.31.21.12:18320/realms
+      client:
+        registration:
+          kakao:
+            client-id: babe84df407dcf2d58624fcf164b505e
+            client-secret: zl81Pb6a1hlEbrzI0PM5CnbSJa3tEz6s
+            client-name: Kakao
+            authorization-grant-type: authorization_code
+            client-authentication-method: client_secret_post
+            redirect-uri: "{baseUrl}/login/oauth2/code/kakao"
+            scope:
+              - profile_nickname,account_email,gender,birthyear,phone_number,name
+          naver:
+            provider: naver
+            client-id: YnCTvohpxT2LFv7DqNAG
+            client-secret: UmOZn0YHiw
+            scope: name,email,gender,mobile
+            client-name: Naver
+            authorization-grant-type: authorization_code
+            redirect-uri: "{baseUrl}/login/oauth2/code/naver"
+        provider:
+          kakao:
+            authorization-uri: https://kauth.kakao.com/oauth/authorize
+            token-uri: https://kauth.kakao.com/oauth/token
+            user-info-uri: https://kapi.kakao.com/v2/user/me
+            user-name-attribute: id
+          naver:
+            authorization-uri: https://nid.naver.com/oauth2.0/authorize
+            token-uri: https://nid.naver.com/oauth2.0/token
+            user-info-uri: https://openapi.naver.com/v1/nid/me
+            user-name-attribute: response
   datasource:
     gcone:
       hikari:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://172.31.16.11:3306/gcone?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false
+        jdbc-url: jdbc:mysql://115.68.176.232:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false
-        username: winbit
+        username: sakeone
-        password: dnlsqlxm1!
+        password: dnlfxjtm13@$
+        minimumIdle: 1
+        maximumPoolSize: 10
+        idleTimeout: 30000    #30초
+        maxLifetime: 1800000  #30분
+        connectionTimeout: 30000
+        poolName: gconedDevPool
     sure:
       hikari:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://172.31.17.11:3306/nutricore
+        jdbc-url: jdbc:mysql://115.68.176.232:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false
-        username: winbit
+        username: sakeone
-        password: dnlsqlxm1!
+        password: dnlfxjtm13@$
+        minimumIdle: 1
+        maximumPoolSize: 10
+        idleTimeout: 30000    #30초
+        maxLifetime: 1800000  #30분
+        connectionTimeout: 30000
+        poolName: SureDevPool
   jpa:
     hibernate:
       ddl-auto: update
     show-sql: true
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: -1
 
 mybatis:
   mapper-locations: classpath:/mybatis/xml/mapper/**/*.xml
@@ -43,22 +100,41 @@ logging:
     com.wb.domainserver: debug
     root: info
 
-#Resource-server-url
+sopmalfo:
-url:
+  common:
-  resource:
+    fileupload:
-    server:
+      uploaddirs:
-      product: http://127.0.0.1:18210
+        goods:
-      order: http://172.31.15.11:18220
+        doc: /data/gcone/docFile
-      payment: http://127.0.0.1:8092
+        web: /data/gcone/webFile
-      delivery: http://127.0.0.1:8093
+        phar: /data/gcone/phFile
-      coupon-mlg: http://127.0.0.1:8094
+        rtrn: /data/gcone/rtrnFile
-      review: http://127.0.0.1:8095
+      extensions:
-      extlink: http://127.0.0.1:8096
+        images: .gif,.jpg,.jpeg,.png
+      cdnurl: http://dev.img.soju1sake1.com
+
 
 pagination:
   page-unit: 10
   page-size: 10
 
+
+#kakao js test key
+kakao:
+  keys:
+    CH: "b3f10109439ca225a9bda684e358a9b1"
+    TZ: "b3f10109439ca225a9bda684e358a9b1"
+    LF: "b3f10109439ca225a9bda684e358a9b1"
+    NC: "b3f10109439ca225a9bda684e358a9b1"
+    PL: "b3f10109439ca225a9bda684e358a9b1"
+    DT: "b3f10109439ca225a9bda684e358a9b1"
+    NB: "b3f10109439ca225a9bda684e358a9b1"
+    AF: "b3f10109439ca225a9bda684e358a9b1"
+    BD: "b3f10109439ca225a9bda684e358a9b1"
+    DL: "b3f10109439ca225a9bda684e358a9b1"
+    JM: "b3f10109439ca225a9bda684e358a9b1"
+    LR: "d1fa06d7edfb5178293ce9718cc82f5b"
+
 #슈어엠 법인별 정보
 surem:
   sopmal:
@@ -85,7 +161,7 @@ surem:
       erpcode: 02
       userid: tradithbio02
       deptcode: FO-5SP-HZ
-      yellowkey: 7ef337e0f1fce8440aa896e9ca4e01ec6aa86f35
+      yellowkey: 8e5470e841a36882e1a3db87e6a791bcfed5c8d2
     #닥터린
     DT:
       code: NP
@@ -165,7 +241,6 @@ pos-mileage:
     point-rate: 0.01
     point-rate-arr: E7T-003:0.03,E7T-004:0.03,E7T-012:0.01,EX3-004:0.03,EX3-005:0.03
     point-use-min: 1
-    point-store-arr: EX3-000079
     sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
     ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956
     ext-goods-arr:
@@ -183,9 +258,9 @@ pos-mileage:
       E7T-001582: 20000
       EX3-001510: 20000
     ext-coupon-arr:
-      E07: "076"
+      E07: "063"
-      E7T: "048"
+      E7T: "035"
-      EX3: "013"
+      EX3: "031"
   CH:
     point-except-arr: E07-000484,E07-000954,E07-000955,E07-000975,E07-000976,E07-000977,E07-000979,E7T-000734,E7T-000735,E7T-000725,E7T-000726
     point-rate: 0.01
@@ -208,18 +283,9 @@ pos-mileage:
       E7T-001582: 20000
       EX3-001510: 20000
     ext-coupon-arr:
-      E07: "076"
+      E07: "063"
-      E7T: "048"
+      E7T: "035"
-      EX3: "013"
+      EX3: "031"
-    ext-event-dv: brand,prod
-    ext-event-stdt: 2025-07-21
-    ext-event-enddt: 2025-07-26
-    ext-store-event-stdt: 2025-06-18
-    ext-store-event-enddt: 2025-06-30
-    ext-prod-event-stdt: 2025-08-01
-    ext-prod-event-enddt: 2025-09-05
-    ext-event-except-sopmal: CH,TZ
-    ext-event-sopmal: NC,PL
   PL:
     point-except-arr: E07-000484,E7T-000509,E7T-000510,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
     point-rate: 0.01
@@ -266,6 +332,12 @@ pos-mileage:
     point-rate: 0.01
   SC:
     point-rate: 0.01
+  ext-event-dv: brand
+  ext-event-stdt: 2024-04-26
+  ext-event-enddt: 2024-05-20
+  ext-event-except-sopmal: CH,TZ
+  ext-event-sopmal: NC,PL
+
 mngrfo:
   common:
     board:
@@ -285,23 +357,37 @@ mngrfo:
         web: /webFile
       extensions:
         images: .gif,.jpg,.jpeg,.png
+      cdnurl: http://dev.img.soju1sake1.com
+    subsvc:
+      dft-goods-optn-innb: 5
+
+
 secret:
   key: 1df5be2f7e90ae36
 
+
 host:
-  img: http://dev.img.gcone.co.kr
+  img: http://dev.img.soju1sake1.com
 
 naverpay:
   order:
-    test-url: https://test-api.pay.naver.com
+    test-url: https://test-order.pay.naver.com
-    real-url: https://api.pay.naver.com
+    test-mobile-Url: https://test-m.pay.naver.com
+    real-url: https://order.pay.naver.com
+    real-mobile-Url: https://m.pay.naver.com
   zzim:
     test-url: https://test-pay.naver.com
     real-url: https://pay.naver.com
 
 mail:
-  host: 127.0.0.1
+  host: mail.sake1jan.com
-  port: 25
+  port: 587
+  username: custom@sake1jan.com
+  password: mail13@$
+  connectiontimeout: 10000
+  timeout: 10000
+  writetimeout: 10000
+
 
 #이지웰페이 정보
 easywell:
@@ -311,7 +397,7 @@ easywell:
       ip : 211.180.161.102
       port : 3712
       company-code : slbiotech #회사코드(띄어쓰기(1) 포함 10자)
-      brand-code : 10067521  #브랜드코드(띄어쓰기(2) 포함 10자)
+      brand-code : 10067521   #브랜드코드(띄어쓰기(2) 포함 10자)
       cipher : AES/CBC/PKCS5Padding  #블록 암호화 알고리즘 (as-is AES-128-CBC 동일)
       key : 38a05be31b054a06 #암호화 키
       iv : 38a05be31b054a06 # 초기화 벡터
@@ -331,7 +417,38 @@ bankda:
   pw: ITteam1!
 
 #default css
-css-cours: css/theme/themeAF.css
+css-cours : css/theme/themeAF.css
 
 #선물하기 URL
-presenturl : dev.svc.gcone.co.kr
+presenturl : dev.svc.soju1sake1.com
+
+# 출고 택배사 구분 EXPORT, (택배사 구분코드 HDRYCPN)
+# 송장번호 %INVCNB% 치환
+# 한진택배는 운송번호 바로 조회 서비스 미제공함
+ordr:
+  export:
+    hdrycpn:
+      code0: https://trace.cjlogistics.com/next/tracking.html?wblNo=%INVCNB%
+      code7: https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=%INVCNB%&displayHeader=
+      code9: https://www.hanjin.com/kor/CMS/DeliveryMgr/WaybillSch.do?mCode=MN038
+      code10: https://www.lotteglogis.com/home/reservation/tracking/linkView?InvNo=%INVCNB%
+      code29: https://ylis.yongmalogis.co.kr/cmm/modalDeliveryCargoTrace.do?ordno=%INVCNB%
+
+# 서치어드바이저 소유권 코드
+meta-content:
+  google:
+    LR: ""
+  naver:
+    LR: "5fcdb284f18ca08cf86af214a01998990c008e84"
+  facebook:
+    LR: ""
+
+# 결제 api 사용 암호 key
+api:
+  AES_KEY: "aMZV6RjCtE1iyuH8WyE+Hg=="
+  DATA_ENCRYPT_AES_KEY: "Z8zKbHyMKn+iwD3O0PLT9g=="
+
+currency-unit:
+  default: 円(엔)
+  JP: 円(엔)
+  KR: 원

src/main/resources/application-local.yml

@@ -1,5 +1,8 @@
 server:
   port: 18500
+  error:
+    whitelabel:
+      enabled: false
 
 management:
   endpoints:
@@ -55,9 +58,9 @@ spring:
     gcone:
       hikari:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://172.31.16.11:3306/gcone?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false
+        jdbc-url: jdbc:mysql://115.68.176.232:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false
-        username: winbit
+        username: sakeone
-        password: dnlsqlxm1!
+        password: dnlfxjtm13@$
         minimumIdle: 1
         maximumPoolSize: 10
         idleTimeout: 30000    #30초
@@ -67,9 +70,9 @@ spring:
     sure:
       hikari:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://172.31.17.11:3306/nutricore
+        jdbc-url: jdbc:mysql://115.68.176.232:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false
-        username: winbit
+        username: sakeone
-        password: dnlsqlxm1!
+        password: dnlfxjtm13@$
         minimumIdle: 1
         maximumPoolSize: 10
         idleTimeout: 30000    #30초
@@ -80,6 +83,10 @@ spring:
     hibernate:
       ddl-auto: update
     show-sql: true
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: -1
 
 mybatis:
   mapper-locations: classpath:/mybatis/xml/mapper/**/*.xml
@@ -104,7 +111,7 @@ sopmalfo:
         rtrn: /data/gcone/rtrnFile
       extensions:
         images: .gif,.jpg,.jpeg,.png
-      cdnurl: http://dev.img.gcone.co.kr
+      cdnurl: https://19b0bde6dcdc15ad.kinxzone.com
 
 
 pagination:
@@ -346,19 +353,21 @@ mngrfo:
     fileupload:
       uploaddirs:
         goods: C:/file/temp
-        doc: /docFile
+        doc: /data/gcone/docFile
-        web: /webFile
+        web: /data/gcone/webFile
       extensions:
         images: .gif,.jpg,.jpeg,.png
-      cdnurl: http://dev.img.gcone.co.kr
+      cdnurl: https://19b0bde6dcdc15ad.kinxzone.com
-
+      upurl: https://www.soju1sake1.com
+    subsvc:
+      dft-goods-optn-innb: 5
 
 secret:
   key: 1df5be2f7e90ae36
 
 
 host:
-  img: http://dev.img.gcone.co.kr
+  img: https://19b0bde6dcdc15ad.kinxzone.com/
 
 naverpay:
   order:
@@ -371,9 +380,13 @@ naverpay:
     real-url: https://pay.naver.com
 
 mail:
-  host: 127.0.0.1
+  host: mail.sake1jan.com
-  port: 25
+  port: 587
-  username: celebpay@inssoft.kr
+  username: custom@sake1jan.com
+  password: mail13@$
+  connectiontimeout: 10000
+  timeout: 10000
+  writetimeout: 10000
 
 
 #이지웰페이 정보

src/main/resources/application-stage.yml

@@ -10,52 +10,83 @@ management:
       exposure:
         include: refresh
 
+jwt:
+  access:
+    secretKey: YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ==YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ== # BASE64 encode(alleyslabTestBase64EncodeJwtSecretkey) *2
+    max-age: 3600 # 1시간 (초)
+  refresh:
+    secretKey: YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ==YWxsZXlzbGFiVGVzdEJhc2U2NEVuY29kZUp3dFNlY3JldGtleQ== # BASE64 encode(alleyslabTestBase64EncodeJwtSecretkey) *2
+    max-age: 86400 # 24시간 (초)
+
 spring:
-  application:
-    name: sakemall-stage
-  config:
-    additional-location: classpath:/secured-config.yml
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
-  messages:
-    basename: messages_ko
-    encoding: UTF-8
   security:
     oauth2:
       resourceserver:
         jwt:
-          issuer-uri: http://10.100.71.12:18320/realms
+          issuer-uri: http://172.31.21.12:18320/realms
+      client:
+        registration:
+          kakao:
+            client-id: babe84df407dcf2d58624fcf164b505e
+            client-secret: zl81Pb6a1hlEbrzI0PM5CnbSJa3tEz6s
+            client-name: Kakao
+            authorization-grant-type: authorization_code
+            client-authentication-method: client_secret_post
+            redirect-uri: "{baseUrl}/login/oauth2/code/kakao"
+            scope:
+              - profile_nickname,account_email,gender,birthyear,phone_number,name
+          naver:
+            provider: naver
+            client-id: YnCTvohpxT2LFv7DqNAG
+            client-secret: UmOZn0YHiw
+            scope: name,email,gender,mobile
+            client-name: Naver
+            authorization-grant-type: authorization_code
+            redirect-uri: "{baseUrl}/login/oauth2/code/naver"
+        provider:
+          kakao:
+            authorization-uri: https://kauth.kakao.com/oauth/authorize
+            token-uri: https://kauth.kakao.com/oauth/token
+            user-info-uri: https://kapi.kakao.com/v2/user/me
+            user-name-attribute: id
+          naver:
+            authorization-uri: https://nid.naver.com/oauth2.0/authorize
+            token-uri: https://nid.naver.com/oauth2.0/token
+            user-info-uri: https://openapi.naver.com/v1/nid/me
+            user-name-attribute: response
   datasource:
     gcone:
       hikari:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://10.100.81.11:3306/gcone?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&verifyServerCertificate=false
+        jdbc-url: jdbc:mysql://10.2.1.101:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false
-        username: winbit
+        username: sakeone
-        password: Roqkf13@$
+        password: dnlfxjtm13@$
-        minimumIdle: 20
+        minimumIdle: 10
-        maximumPoolSize: 500
+        maximumPoolSize: 50
         idleTimeout: 30000    #30초
         maxLifetime: 1800000  #30분
         connectionTimeout: 30000
-        poolName: gconeboGconePool
+        poolName: SakePool
     sure:
       hikari:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://10.100.238.11:3306/surem
+        jdbc-url: jdbc:mysql://10.2.1.101:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false
-        username: winbit
+        username: sakeone
-        password: winbit1!
+        password: dnlfxjtm13@$
-        minimumIdle: 20
+        minimumIdle: 1
-        maximumPoolSize: 500
+        maximumPoolSize: 10
-        idleTimeout: 30000    #30초10
+        idleTimeout: 30000    #30초
         maxLifetime: 1800000  #30분
         connectionTimeout: 30000
-        poolName: gconeboSurePool
+        poolName: SurePool
   jpa:
     hibernate:
       ddl-auto: update
     show-sql: true
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: -1
 
 mybatis:
   mapper-locations: classpath:/mybatis/xml/mapper/**/*.xml
@@ -63,28 +94,47 @@ mybatis:
 
 logging:
   level:
-    org.springframework.web: info
+    org.springframework.web: debug
-    org.springframework.security: info
+    org.springframework.security: debug
-    org.springframework.security.oauth2: info
+    org.springframework.security.oauth2: debug
-    com.wb.domainserver: info
+    com.wb.domainserver: debug
     root: info
 
-#Resource-server-url
+sopmalfo:
-url:
+  common:
-  resource:
+    fileupload:
-    server:
+      uploaddirs:
-      product: http://127.0.0.1:18210
+        goods:
-      order: http://172.31.15.11:18220
+        doc: /data/gcone/docFile
-      payment: http://127.0.0.1:8092
+        web: /data/gcone/webFile
-      delivery: http://127.0.0.1:8093
+        phar: /data/gcone/phFile
-      coupon-mlg: http://127.0.0.1:8094
+        rtrn: /data/gcone/rtrnFile
-      review: http://127.0.0.1:8095
+      extensions:
-      extlink: http://127.0.0.1:8096
+        images: .gif,.jpg,.jpeg,.png
+      cdnurl: https://19b0bde6dcdc15ad.kinxzone.com
+
 
 pagination:
   page-unit: 10
   page-size: 10
 
+
+#kakao js test key
+kakao:
+  keys:
+    CH: "b3f10109439ca225a9bda684e358a9b1"
+    TZ: "b3f10109439ca225a9bda684e358a9b1"
+    LF: "b3f10109439ca225a9bda684e358a9b1"
+    NC: "b3f10109439ca225a9bda684e358a9b1"
+    PL: "b3f10109439ca225a9bda684e358a9b1"
+    DT: "b3f10109439ca225a9bda684e358a9b1"
+    NB: "b3f10109439ca225a9bda684e358a9b1"
+    AF: "b3f10109439ca225a9bda684e358a9b1"
+    BD: "b3f10109439ca225a9bda684e358a9b1"
+    DL: "b3f10109439ca225a9bda684e358a9b1"
+    JM: "b3f10109439ca225a9bda684e358a9b1"
+    LR: "d1fa06d7edfb5178293ce9718cc82f5b"
+
 #슈어엠 법인별 정보
 surem:
   sopmal:
@@ -111,7 +161,7 @@ surem:
       erpcode: 02
       userid: tradithbio02
       deptcode: FO-5SP-HZ
-      yellowkey: 7ef337e0f1fce8440aa896e9ca4e01ec6aa86f35
+      yellowkey: 8e5470e841a36882e1a3db87e6a791bcfed5c8d2
     #닥터린
     DT:
       code: NP
@@ -189,11 +239,10 @@ pos-mileage:
   NC:
     point-except-arr: E07-000954,E07-000955,E7T-000509,E7T-000510,E7T-000725,E7T-000726,E7T-000734,E7T-000735,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
     point-rate: 0.01
-    point-rate-arr: E7T-002:0.05,E7T-003:0.03,E7T-004:0.03,E7T-012:0.01,EX3-002:0.05,EX3-004:0.03,EX3-005:0.03,E07-021:0.05
+    point-rate-arr: E7T-003:0.03,E7T-004:0.03,E7T-012:0.01,EX3-004:0.03,EX3-005:0.03
-    point-store-arr: EX3-000079
     point-use-min: 1
     sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
-    ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956, E07-000677, E07-000934, E07-000527, E07-000916, E7T-000037, E7T-000711, E7T-000060, E7T-000693, EX2-000089, EX2-000639, EX2-000082, EX2-000623, EX3-000089, EX3-000680, EX3-000082, EX3-000654, E07-000296, E07-000478, E07-000265, E7T-000063, E7T-000073, E7T-000025, EX2-000063, EX2-000016, EX2-000020, EX3-000063, EX3-000016, EX3-000020
+    ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956
     ext-goods-arr:
     fix-point-arr:
       E07-002045: 30000
@@ -209,26 +258,16 @@ pos-mileage:
       E7T-001582: 20000
       EX3-001510: 20000
     ext-coupon-arr:
-      E07: "076"
+      E07: "063"
-      E7T: "048"
+      E7T: "035"
-      EX3: "013"
+      EX3: "031"
-    ext-event-dv: brand,prod
-    ext-event-sopmal: NC,FN,PL
-    ext-event-stdt: 2025-07-21
-    ext-event-enddt: 2025-07-27
-    ext-store-event-stdt: 2025-06-18
-    ext-store-event-enddt: 2025-06-30
-    ext-prod-event-stdt: 2025-08-04
-    ext-prod-event-enddt: 2025-09-05
-    ext-test-arr: E7T000036
-
   CH:
     point-except-arr: E07-000484,E07-000954,E07-000955,E07-000975,E07-000976,E07-000977,E07-000979,E7T-000734,E7T-000735,E7T-000725,E7T-000726
     point-rate: 0.01
-    point-rate-arr: E07-001:0.03,E07-002:0.03,E07-004:0.05,E07-019:0.01,E07-020:0.01,E07-021:0.05,EX2-004:0.03,EX2-005:0.03,EX2-013:0.01
+    point-rate-arr: E07-001:0.03,E07-002:0.03,E07-019:0.01,E07-020:0.01,EX2-004:0.03,EX2-005:0.03,EX2-013:0.01
     point-use-min: 1
     sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
-    ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956, E07-000677, E07-000934, E07-000527, E07-000916, E7T-000037, E7T-000711, E7T-000060, E7T-000693, EX2-000089, EX2-000639, EX2-000082, EX2-000623, EX3-000089, EX3-000680, EX3-000082, EX3-000654, E07-000296, E07-000478, E07-000265, E7T-000063, E7T-000073, E7T-000025, EX2-000063, EX2-000016, EX2-000020, EX3-000063, EX3-000016, EX3-000020
+    ext-except-arr: E07-001258, E07-001259, E07-001260, E7T-000943, E7T-000944, E7T-000945, EX2-000904, EX2-000912, EX2-000913, EX3-000950, EX3-000955, EX3-000956
     ext-goods-arr:
     fix-point-arr:
       E07-002045: 30000
@@ -244,19 +283,61 @@ pos-mileage:
       E7T-001582: 20000
       EX3-001510: 20000
     ext-coupon-arr:
-      E07: "076"
+      E07: "063"
-      E7T: "048"
+      E7T: "035"
-      EX3: "013"
+      EX3: "031"
-  ext-event-dv: brand,prod
+  PL:
-  ext-event-stdt: 2025-07-21
+    point-except-arr: E07-000484,E7T-000509,E7T-000510,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
-  ext-event-enddt: 2025-07-27
+    point-rate: 0.01
-  ext-prod-event-stdt: 2025-08-04
+    point-rate-arr: E7T-003:0.03,E7T-004:0.03,EX3-004:0.04,EX3-005:0.03
-  ext-prod-event-enddt: 2025-09-05
+    sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
-  ext-event-except-sopmal:
+    point-use-min: 5000
-  ext-event-sopmal: NC,FN,PL
+  TZ:
-  ext-test-arr: E7T000036
+    point-rate: 0.01
-  ext-store-event-stdt: 2025-06-18
+    sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
-  ext-store-event-enddt: 2025-06-30
+    point-use-min: 5000
+  NB:
+    point-except-arr: E07-000484,E7T-000509,E7T-000510,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
+    point-rate: 0.01
+    point-rate-arr: E7T-003:0.03,E7T-004:0.03,EX3-004:0.04,EX3-005:0.03
+    sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
+    point-use-min: 5000
+  DT:
+    point-except-arr: E07-000484,E7T-000509,E7T-000510,EX3-000007,EX3-000009,EX3-000061,EX3-000081,EX3-000126,EX3-000275,EX3-000277,EX3-000281,EX3-000316,EX3-000317,EX3-000427,EX3-000501,EX3-000502,EX3-000503,EX3-000504,EX3-000506,EX3-000507,EX3-000508,EX3-000568,EX3-000569,EX3-000570
+    point-rate: 0.01
+    point-rate-arr: E7T-003:0.03,E7T-004:0.03,EX3-004:0.04,EX3-005:0.03
+    sale-rate: 2:0.03,3:0.04,4:0.05,5:0.05
+    point-use-min: 5000
+  AF:
+    point-rate: 0.02
+  BD:
+    point-rate: 0.01
+  JM:
+    point-rate: 0.05
+  LF:
+    point-rate: 0.01
+  DL:
+    point-rate: 0.01
+  OY:
+    point-rate: 0.01
+  VN:
+    point-rate: 0.01
+  CO:
+    point-rate: 0.01
+  NC2:
+    point-rate: 0.01
+  PL2:
+    point-rate: 0.01
+  CN:
+    point-rate: 0.01
+  SC:
+    point-rate: 0.01
+  ext-event-dv: brand
+  ext-event-stdt: 2024-04-26
+  ext-event-enddt: 2024-05-20
+  ext-event-except-sopmal: CH,TZ
+  ext-event-sopmal: NC,PL
+
 mngrfo:
   common:
     board:
@@ -272,48 +353,62 @@ mngrfo:
     fileupload:
       uploaddirs:
         goods: C:/file/temp
-        doc: /docFile
+        doc: /data/gcone/docFile
-        web: /webFile
+        web: /data/gcone/webFile
       extensions:
         images: .gif,.jpg,.jpeg,.png
+      cdnurl: https://19b0bde6dcdc15ad.kinxzone.com
+    subsvc:
+      dft-goods-optn-innb: 5
+
+
 secret:
   key: 1df5be2f7e90ae36
 
+
 host:
-  img: https://img.gcone.co.kr
+  img: https://19b0bde6dcdc15ad.kinxzone.com/
 
 naverpay:
   order:
-    test-url: https://test-api.pay.naver.com
+    test-url: https://test-order.pay.naver.com
-    real-url: https://api.pay.naver.com
+    test-mobile-Url: https://test-m.pay.naver.com
+    real-url: https://order.pay.naver.com
+    real-mobile-Url: https://m.pay.naver.com
   zzim:
     test-url: https://test-pay.naver.com
     real-url: https://pay.naver.com
 
 mail:
-  host: 10.100.238.11
+  host: 10.2.1.76
-  port: 25
+  port: 587
+  username: custom@sake1jan.com
+  password: mail13@$
+  connectiontimeout: 10000
+  timeout: 10000
+  writetimeout: 10000
+
 
 #이지웰페이 정보
 easywell:
   applc-hdqrtrs : E07, E7T  #이지웰페이 적용 본부
   server :
-    nc: #운영서버 (NC)
+    nc: #개발서버 (NC)
-      ip: 211.180.161.111
+      ip : 211.180.161.102
-      port: 3712
+      port : 3712
-      company-code: nutricore #회사코드(띄어쓰기(1) 포함 10자)
+      company-code : slbiotech #회사코드(띄어쓰기(1) 포함 10자)
-      brand-code: nutricore #브랜드코드(띄어쓰기(1) 포함 10자)
+      brand-code : 10067521   #브랜드코드(띄어쓰기(2) 포함 10자)
-      cipher: AES/CBC/PKCS5Padding  #블록 암호화 알고리즘 (as-is AES-128-CBC 동일)
+      cipher : AES/CBC/PKCS5Padding  #블록 암호화 알고리즘 (as-is AES-128-CBC 동일)
-      key: cbaab556ceba4713
+      key : 38a05be31b054a06 #암호화 키
-      iv: cbaab556ceba4713
+      iv : 38a05be31b054a06 # 초기화 벡터
-    other: #운영서버(기타 브랜드)
+    other: #개발서버(기타 브랜드)
-      ip: 211.180.161.111
+      ip : 211.180.161.102
-      port: 3711
+      port : 3711
-      company-code: gcbio     #회사코드(띄어쓰기(5) 포함 10자)
+      company-code : gcbio      #회사코드(띄어쓰기(5) 포함 10자)
-      brand-code: gcbio     #브랜드코드(띄어쓰기(5) 포함 10자)
+      brand-code : "0012345"   #브랜드코드(띄어쓰기(3) 포함 10자)
-      cipher: AES/CBC/PKCS5Padding  #블록 암호화 알고리즘 (as-is AES-128-CBC 동일)
+      cipher : AES/CBC/PKCS5Padding  #블록 암호화 알고리즘 (as-is AES-128-CBC 동일)
-      key: f9a01135dd01416e
+      key : f0c4c9c0a6154552 #암호화 키
-      iv: f9a01135dd01416e
+      iv : f0c4c9c0a6154552 # 초기화 벡터
 
 #뱅크다
 bankda:
@@ -325,4 +420,35 @@ bankda:
 css-cours : css/theme/themeAF.css
 
 #선물하기 URL
-presenturl : svc.gcone.co.kr
+presenturl : svc.soju1sake1.com
+
+# 출고 택배사 구분 EXPORT, (택배사 구분코드 HDRYCPN)
+# 송장번호 %INVCNB% 치환
+# 한진택배는 운송번호 바로 조회 서비스 미제공함
+ordr:
+  export:
+    hdrycpn:
+      code0: https://trace.cjlogistics.com/next/tracking.html?wblNo=%INVCNB%
+      code7: https://service.epost.go.kr/trace.RetrieveDomRigiTraceList.comm?sid1=%INVCNB%&displayHeader=
+      code9: https://www.hanjin.com/kor/CMS/DeliveryMgr/WaybillSch.do?mCode=MN038
+      code10: https://www.lotteglogis.com/home/reservation/tracking/linkView?InvNo=%INVCNB%
+      code29: https://ylis.yongmalogis.co.kr/cmm/modalDeliveryCargoTrace.do?ordno=%INVCNB%
+
+# 서치어드바이저 소유권 코드
+meta-content:
+  google:
+    LR: ""
+  naver:
+    LR: "5fcdb284f18ca08cf86af214a01998990c008e84"
+  facebook:
+    LR: ""
+
+# 결제 api 사용 암호 key
+api:
+  AES_KEY: "aMZV6RjCtE1iyuH8WyE+Hg=="
+  DATA_ENCRYPT_AES_KEY: "Z8zKbHyMKn+iwD3O0PLT9g=="
+
+currency-unit:
+  default: 円(엔)
+  JP: 円(엔)
+  KR: 원

src/main/resources/application-test.yml

@@ -42,6 +42,10 @@ spring:
     hibernate:
       ddl-auto: none
     show-sql: true
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: -1
 
 mybatis:
   mapper-locations: classpath:/mybatis/xml/mapper/**/*.xml

src/main/resources/message/messages.properties

@@ -22,6 +22,7 @@ button.reSendung=\uC7AC\uC804\uC1A1
 button.sendung=\uC778\uC99D\uBC88\uD638 \uBC1C\uC1A1
 button.certification=\uD734\uB300\uD3F0 \uC778\uC99D
 button.certificationDone=\uC778\uC99D \uC644\uB8CC
+button.certificationEmail=\uC778\uC99D
 button.delete=\uC0AD\uC81C
 button.duplication=\uC911\uBCF5 \uD655\uC778
 button.doubleCheck=\uC911\uBCF5 \uD655\uC778

src/main/resources/mybatis/xml/mapper/admin/instcSle/mtng/BOMtngMapper.xml

@@ -428,6 +428,7 @@
 									     END
 							  END                                                                     AS EVT_TRGET_AT       -- 이벤트 진행여부 이벤트 대상일경우 1을 반환함 = 정상 처리 0 이벤트 대상 아닐경우 1
 							   , IFNULL(EVT_DUPL_COUPON.DPLCT_LMTT_COUPON, 0) AS DPLCT_LMTT_COUPON -- 이벤트 중복제한 쿠폰 존재여부
+							   , CASE WHEN OPTN.OPTN_EXPSR_AT = 'Y' THEN 0 ELSE 1 END AS OPTN_EXPSR_AT
 						  FROM (SELECT GG.GOODS_INNB                 -- 상품 고유번호
 									   , GG.SOPMAL_CD                  -- 쇼핑몰코드
 									   , GG.DLVY_GROUP_INNB            -- 배송그룹고유번호
@@ -750,6 +751,7 @@
 				                 , EVT.DSCNT_BNEF_DV_CD
 				                 , OPTN.COMPNB_DSCNT_AT
 				                 , OPTN.SCTN_DSCNT_AT
+				                 , OPTN.OPTN_EXPSR_AT
 	</select>
 
 	<!--주문 전 쿠폰번호 재확인-->

src/main/resources/mybatis/xml/mapper/admin/store/bsnm/BOBsnmMapper.xml

@@ -70,7 +70,7 @@
             parameterType="com.wb.domainserver.domain.admin.store.bsnm.vo.BOBsnmVO"
             resultType="datamap">
         <![CDATA[
-        SET @ROWNUM = 0;
+        /*SET @ROWNUM = 0;*/
 
                 SELECT 	*
                   FROM	(

src/main/resources/mybatis/xml/mapper/admin/store/sopmal/BOSopmalMapper.xml

@@ -164,6 +164,8 @@
 			   ORDR_CANCL_ATMC_PROCS_PD,
 			   ORDR_PURCHSR_DCSN_AT,
 			   ORDR_ATMC_PURCHS_DCSN_PD,
+			   BUY_RATE,
+			   SELL_RATE,
 			   FORMAT(MLG_HOLD_USE_AMT, 0)           AS MLG_HOLD_USE_AMT,
 			   FORMAT(MLG_SETLE_AMT_USE_AMT, 0)      AS MLG_SETLE_AMT_USE_AMT,
 			   FORMAT(MLG_MUMM_USE_AMT, 0)           AS MLG_MUMM_USE_AMT,
@@ -192,6 +194,7 @@
 			   JOIN_GUIDANCE_WORDS,
 			   JOIN_BNEF,
 			   JOIN_COMPT_WORDS,
+			   SUBSVC_GUIDANCE_WORDS,
 			   TOP_SYS_FIL_NM,
 			   META_DC,
 			   META_KWRD,
@@ -511,6 +514,8 @@
 							ORDR_CANCL_ATMC_PROCS_PD,
 							ORDR_PURCHSR_DCSN_AT,
 							ORDR_ATMC_PURCHS_DCSN_PD,
+							BUY_RATE,
+							SELL_RATE,
 							MLG_HOLD_USE_AMT,
 							MLG_SETLE_AMT_USE_AMT,
 							MLG_MUMM_USE_AMT,
@@ -543,6 +548,7 @@
 							JOIN_GUIDANCE_WORDS,
 							JOIN_BNEF,
 						 	JOIN_COMPT_WORDS,
+							SUBSVC_GUIDANCE_WORDS,
 							REGUSR,
 							REGIST_DT,
 							UPDUSR,
@@ -577,6 +583,8 @@
 							#{ordrCanclAtmcProcsPd },
 							#{ordrPurchsrDcsnAt },
 							#{ordrAtmcPurchsDcsnPd },
+							#{buyRate },
+							#{sellRate },
 							#{mlgHoldUseAmt },
 							#{mlgSetleAmtUseAmt },
 							#{mlgMummUseAmt },
@@ -609,6 +617,7 @@
 							#{joinGuidanceWords},
 						 	#{joinBnef},
 						 	#{joinComptWords},
+						 	#{subsvcGuidanceWords},
 							#{regusr},
 							SYSDATE(),
 							#{regusr},
@@ -889,6 +898,8 @@
 						ORDR_ATMC_PURCHS_DCSN_PD		= 0,
 					</otherwise>
 				</choose>
+				BUY_RATE						= #{buyRate},
+				SELL_RATE						= #{sellRate},
 				MLG_HOLD_USE_AMT				= #{mlgHoldUseAmt},
 				MLG_SETLE_AMT_USE_AMT			= #{mlgSetleAmtUseAmt},
 				MLG_MUMM_USE_AMT				= #{mlgMummUseAmt},
@@ -918,6 +929,7 @@
 				JOIN_GUIDANCE_WORDS				= #{joinGuidanceWords},
 				JOIN_BNEF						= #{joinBnef},
 				JOIN_COMPT_WORDS				= #{joinComptWords},
+				SUBSVC_GUIDANCE_WORDS			= #{subsvcGuidanceWords},
 				UPDUSR							= #{updusr},
 				UPDT_DT							= SYSDATE(),
 				META_DC							= #{metaDc},

src/main/resources/mybatis/xml/mapper/admin/store/sopthema/BOSopthemaMapper.xml

@@ -60,7 +60,7 @@
             parameterType="com.wb.domainserver.domain.admin.store.sopthema.vo.BOSopThemaVO"
             resultType="dataMap">
         <![CDATA[
-        SET @ROWNUM = 0;
+        /*SET @ROWNUM = 0;*/
                 SELECT 	*
                   FROM	(
                         SELECT	CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED)  AS RNUM

src/main/resources/mybatis/xml/mapper/admin/sys/comncd/BOComncdMapper.xml

@@ -87,7 +87,7 @@
 			parameterType="com.wb.domainserver.domain.admin.sys.comncd.vo.BOMaComncdVO"
 			resultType="dataMap">
 		<![CDATA[
-		SET @ROWNUM = 0;
+		/*SET @ROWNUM = 0;*/
 		SELECT 	*
 		FROM	(
 					SELECT	CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED)  AS RNUM

src/main/resources/mybatis/xml/mapper/gcone/bbs/gnrlbbsctt/BOGnrlbbscttMapper.xml

@@ -1543,6 +1543,146 @@
 		ORDER BY -FB.SORT_ORDR DESC
 	</select>
 
+	<select id="selectBOM2mBbscttListInqire"
+			parameterType="com.wb.domainserver.domain.gcone.bbs.gnrlbbsctt.vo.BOGnrlbbscttVO"
+			resultType="dataMap">
+		SELECT    *
+		FROM    (
+		SELECT  CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED)  AS RNUM
+		,TB.*
+		FROM    (SELECT CAST(count(*) OVER() AS UNSIGNED) AS TOT_CNT,
+		FB.BBSCTT_INNB ,
+		FB.IP ,
+		FB.SJ ,
+		FB.CN ,
+		FB.EXPSR_AT ,
+		FB.PASSWORD ,
+		FB.REGUSR ,
+		FB.NTCE_PD_SETUP_AT ,
+		FB.NTC_AT ,
+		FB.NTC_PD_SETUP_AT ,
+		FB.INQIRE_CNT ,
+		FB.SECRET_BBSCTT_AT ,
+		FB.USE_AT ,
+		IFNULL(FB.SORT_ORDR, 999) SORT_ORDR ,
+		FB.SOPMAL_CD ,
+		FB.REGUSR_DV_CD ,
+		FB.REGUSR_ID ,
+		FB.REGUSR_NM ,
+		CONCAT(SUBSTRING(FB.REGUSR_NM, 1, 1), '*', SUBSTRING(FB.REGUSR_NM, CHAR_LENGTH(FB.REGUSR_NM), 1))MASKING_REGUSR_NM ,
+		FMG.MBR_GRAD_NM ,
+		FBM.NEW_NTT_STDR_DE_CNT ,
+		FBM.POPULAR_NTT_STDR_INQIRE_CNT ,
+		FB.Npay_BBSCTT_SNB ,
+		IFNULL(FBM.MNGR_NM, '관리자') AS MNGR_NM ,
+		FBM.WRTER_INDICT_TY_CD ,
+		FBA.ANSW_CN ,
+		CASE
+		WHEN FB.INQIRE_CNT <![CDATA[>=]]> FBM.POPULAR_NTT_STDR_INQIRE_CNT THEN 'Y'
+		ELSE 'N'
+		END POPULAR_AT ,
+		CASE
+		WHEN DATE_FORMAT(FB.REGIST_DT, '%Y-%m-%d') <![CDATA[>=]]> DATE_FORMAT(DATE_SUB( NOW(), INTERVAL FBM.NEW_NTT_STDR_DE_CNT DAY), '%Y-%m-%d') THEN 'Y'
+		ELSE 'N'
+		END NEW_AT ,
+		FB.NTCE_BGN_DE ,
+		FB.NTCE_END_DE ,
+		DATE_FORMAT(FB.REGIST_DT, '%Y-%m-%d %H:%i:%s') REGIST_DT ,
+		DATE_FORMAT(FB.REGIST_DT, '%Y-%m-%d %H:%i') SUM_REGIST_DT, /* 사용자 등록일 조회*/
+		DATE_FORMAT(FB.UPDT_DT, '%Y-%m-%d %H:%i:%s') UPDT_DT ,
+		FB.NTC_BGN_DE ,
+		FB.NTC_END_DE ,
+		'0' NTC_DVN ,
+		EXISTS (
+			SELECT
+			FBF.BBSCTT_ATCHMNFIL_INNB
+			FROM
+			GC_BOARDDATA_FILE FBF
+			WHERE
+			FBF.BBSCTT_INNB = FB.BBSCTT_INNB
+			AND FBF.SOPMAL_CD = FB.SOPMAL_CD) AS ISFILES ,
+		ANSW.BBSCTT_INNB AS ANSW_BBSCTT_INNB ,
+		ANSW.SJ AS ANSW_SJ ,
+		ANSW.CN AS ANSW_BBSCTT_CN ,
+		DATE_FORMAT(ANSW.REGIST_DT, '%Y-%m-%d %H:%i:%s') AS ANSW_REGIST_DT ,
+		FBG.GOODS_INNB ,
+		FG.GOODS_NM ,
+		FGI.IMG,
+		GM.JOIN_MTH_CD,
+		GM.MBR_DV_CD,
+		GOI.ORDR_INNB,
+		GOIO.ORDR_GOODS_OPTN_INNB
+		FROM
+		GC_BOARDDATA FB
+		INNER JOIN GC_BOARDMANAGER FBM ON
+		FB.SOPMAL_CD = FBM.SOPMAL_CD
+		AND FB.BBS_ID = FBM.BBS_ID
+		INNER JOIN GC_SHOP FS ON
+		FS.SOPMAL_CD = FB.SOPMAL_CD
+		LEFT JOIN GC_BOARDDATA_GOODS FBG ON
+		FB.BBSCTT_INNB = FBG.BBSCTT_INNB
+		AND FB.SOPMAL_CD = FBG.SOPMAL_CD
+		LEFT JOIN GC_ORDER_ITEM_OPTION GOIO ON
+		GOIO.ORDR_GOODS_OPTN_INNB = FBG.ORDR_GOODS_OPTN_INNB
+		AND GOIO.SOPMAL_CD = FBG.SOPMAL_CD
+		LEFT JOIN GC_ORDER_ITEM GOI ON
+		GOI.ORDR_GOODS_INNB = GOIO.ORDR_GOODS_INNB
+		AND GOI.SOPMAL_CD = GOIO.SOPMAL_CD
+		LEFT JOIN GC_GOODS FG ON
+		FBG.GOODS_INNB = FG.GOODS_INNB
+		AND FBG.SOPMAL_CD = FG.SOPMAL_CD
+		LEFT JOIN GC_GOODS_IMAGE FGI ON
+		FG.GOODS_INNB = FGI.GOODS_INNB
+		AND FG.SOPMAL_CD = FGI.SOPMAL_CD
+		AND FGI.IMG_KND = '02'
+		AND FGI.CUT_NB = 1
+		LEFT JOIN GC_BOARDDATA ANSW ON
+		FB.SOPMAL_CD = ANSW.SOPMAL_CD
+		AND FB.BBS_ID = ANSW.BBS_ID
+		AND FB.BBSCTT_INNB = ANSW.PARNTS_BBSCTT_INNB
+		AND ANSW.DEPTH = 1
+		AND ANSW.USE_AT = 'Y'
+		LEFT JOIN GC_MEMBER_GRAD_MAPPING FMGM ON
+		FB.SOPMAL_CD = FMGM.SOPMAL_CD
+		AND FB.REGUSR = FMGM.MBR_INNB
+		LEFT JOIN GC_MEMBER GM
+		ON GM.MBR_DV_CD = FMGM.MBR_DV_CD
+		AND GM.MBR_INNB = FMGM.MBR_INNB
+		LEFT JOIN GC_MEMBER_GRAD FMG ON
+		FMGM.MBR_GRAD_INNB = FMG.MBR_GRAD_INNB
+		LEFT JOIN GC_BOARD_ADDITM FBA ON
+		FB.SOPMAL_CD = FBA.SOPMAL_CD
+		AND FB.BBSCTT_INNB = FBA.BBSCTT_INNB
+		AND FBA.QESITM_INNB IN (
+		SELECT
+		FBF.QESITM_INNB
+		FROM
+		GC_BOARDFORM FBF
+		WHERE
+		FBF.ADIT_ITM_DV_CD = '03'
+		AND FBA.SOPMAL_CD = FBF.SOPMAL_CD
+		AND FBF.BBS_ID = FB.BBS_ID)
+		WHERE 1=1
+		<include refid="selectListWhere"/>
+		<if test = "@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(serverDv, 'sopmal')">
+			<include refid="selectSopmalNtceWhere"/>
+		</if>
+		AND (FB.USE_AT = 'Y'
+		/* 사용자 화면에선 삭제글은 보이지 않음 */
+		<if test = "!@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(serverDv, 'sopmal')">
+			OR ANSW.BBSCTT_INNB IS NOT NULL
+		</if>
+		)
+		AND FB.DEPTH = 0
+		AND FB.SOPMAL_CD = #{sopmalCd}
+		AND FB.BBS_ID = #{bbsId}
+		ORDER BY BBSCTT_INNB DESC) TB
+		WHERE (@rownum:=0)=0
+		) PV
+		WHERE    1=1
+		LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+	</select>
+
 
 	<!--*****************************************
         게시글 상세 조회 시작
@@ -1671,7 +1811,7 @@
 				,LEAD(FB.REGUSR_ID)OVER(ORDER BY FB.BBSCTT_INNB DESC)AS AFTER_REGUSR_ID
 				,LEAD(FB.REGUSR_NM)OVER(ORDER BY FB.BBSCTT_INNB DESC)AS AFTER_REGUSR_NM
 				</if>
-		<if test = "@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(rvwBbscttDv, 'rvw')">/* 리뷰 상세보기 일 때만  */
+		<if test = "@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(rvwBbscttDv, 'rvw') || @com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(bbsTyCd, '12')">/* 리뷰, 1:1문의 상세보기 일 때만  */
 		     	,FOI.ORDR_INNB
 		</if>
 				,GM.JOIN_MTH_CD
@@ -1691,7 +1831,7 @@
 			AND GM.MBR_INNB = FMGM.MBR_INNB
 		LEFT JOIN GC_MEMBER_GRAD FMG
 				ON FMGM.MBR_GRAD_INNB = FMG.MBR_GRAD_INNB
-		<if test = "@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(rvwBbscttDv, 'rvw')">/* 리뷰 상세보기 일 때만  */
+		<if test = "@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(rvwBbscttDv, 'rvw') || @com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(bbsTyCd, '12')">/* 리뷰, 1:1문의 상세보기 일 때만  */
 		LEFT JOIN GC_BOARDDATA_GOODS FBG
 		ON FB.BBSCTT_INNB = FBG.BBSCTT_INNB
 		AND FB.SOPMAL_CD = FBG.SOPMAL_CD
@@ -2472,6 +2612,37 @@
 			 #{goodsInnb})
 	</insert>
 
+	<!--*****************************************
+    게시글 연관상품 시작 (등록, 조회, 삭제)
+********************************************* -->
+	<insert id = "insertBOBbscttM2mGoods" parameterType="com.wb.domainserver.domain.gcone.bbs.gnrlbbsctt.vo.BOGnrlbbscttVO">
+		INSERT INTO GC_BOARDDATA_GOODS
+		(
+			SOPMAL_CD,
+			BBSCTT_INNB,
+			ORDR_GOODS_OPTN_INNB,
+			RE_ORDER_AT,
+			REGUSR,
+			REGIST_DT,
+			GOODS_INNB)
+			(SELECT GOI.SOPMAL_CD
+				  , #{bbscttInnb} AS BBSCTT_INNB
+				  , GOIO.ORDR_GOODS_OPTN_INNB
+				  , #{reOrderAt} AS RE_ORDER_AT
+				  , #{regusr} AS REGIST_DT
+				  , SYSDATE()
+				  , GOI.GOODS_INNB
+			 FROM  GC_ORDER_ITEM GOI
+					   JOIN GC_ORDER_ITEM_OPTION GOIO
+							ON  GOIO.ORDR_GOODS_INNB = GOI.ORDR_GOODS_INNB
+								AND GOIO.SOPMAL_CD = GOI.SOPMAL_CD
+			 WHERE GOI.ORDR_INNB = #{ordrInnb}
+			   AND GOI.SOPMAL_CD = #{sopmalCd}
+			 ORDER BY GOIO.ORDR_GOODS_OPTN_INNB ASC
+		     LIMIT 1
+			)
+	</insert>
+
 	<!-- 게시글 상세 조회 (연관상품) -->
 	<select id="selectBOBbscttDtlGoods"
 			parameterType="com.wb.domainserver.domain.gcone.bbs.gnrlbbsctt.vo.BOGnrlbbscttVO"

src/main/resources/mybatis/xml/mapper/gcone/goods/goods/BOGoodsMapper.xml

@@ -343,6 +343,8 @@
                 , CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
             FROM (
                 SELECT FG.GOODS_INNB
+                    , FGO.GOODS_OPTN_INNB
+                    , FGO.OPTN_TY
                     , FG.DLVY_GROUP_INNB
                     , FG.SOPMAL_CD
                     , FG.GOODS_NM
@@ -378,6 +380,7 @@
                     , FGO.CNSMRPRIC
                     , FGO.SLEPRIC
                     , FGO.SOPMAL_CD
+                    , FGO.OPTN_TY
                 FROM GC_GOODS_OPTION FGO
                 WHERE FGO.OPTN_EXPSR_AT = 'Y'
                     AND FGO.STDR_DV_AT = 'Y'

src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml

@@ -1269,7 +1269,9 @@ FROM (
              , FDA.RECPNT_NM
              , REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(FDA.TELNB), '1df5be2f7e90ae36') AS CHAR(50)), '(.{2})(.{4})(.{4})', '$1-$2-$3') AS TELNB
              , REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(FDA.MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3') AS MBTLNB
+             , FDA.DLVYLC_AREA_CD
              , FDA.ZIP
+             , FDA.PREFCD
              , FDA.ADRES_DV
              , FDA.RNM_ADRES
              , FDA.LNB_ADRES
@@ -1573,6 +1575,15 @@ FROM (
              , ROUND(IFNULL(FSG.BUNDLE_DLVY_CND_AMT, 0), '0') AS BUNDLE_DLVY_CND_AMT
              , FSG.DLVY_AREA_ADIT_AT
              , ROUND(IFNULL(FSG.AREA_ADIT_DLVY_AMT, 0), '0') AS AREA_ADIT_DLVY_AMT
+             , ROUND(IFNULL(FSG.DFT_DLVY_AMT2, 0), '0') AS DFT_DLVY_AMT2
+             , FSG.AMT_CND_USE_AT2
+             , ROUND(IFNULL(FSG.AMT_CND_ADIT_AMT2, 0), '0') AS AMT_CND_ADIT_AMT2
+             , FSG.CNT_CND_USE_AT2
+             , ROUND(IFNULL(FSG.CNT_CND_ADIT_AMT2, 0), '0') AS CNT_CND_ADIT_AMT2
+             , FSG.BUNDLE_DLVY_USE_AT2
+             , ROUND(IFNULL(FSG.BUNDLE_DLVY_CND_AMT2, 0), '0') AS BUNDLE_DLVY_CND_AMT2
+             , FSG.DLVY_AREA_ADIT_AT2
+             , ROUND(IFNULL(FSG.AREA_ADIT_DLVY_AMT2, 0), '0') AS AREA_ADIT_DLVY_AMT2
           FROM GC_SHIPPING_GROUPING FSG
          WHERE FSG.DLVY_GROUP_INNB = #{dlvyGroupInnb}
            AND FSG.SOPMAL_CD = #{sopmalCd}

src/main/resources/mybatis/xml/mapper/gcone/goods/subsvc/BOSubsvcMapper.xml

@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wb.domainserver.domain.gcone.goods.subsvc.mapper.BOSubsvcMapper">
+
+	<!-- 구독서비스 목록 조회 -->
+	<select id="selectBOSubsvcList"
+			parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO"
+			resultType="dataMap">
+		<![CDATA[
+			SELECT GS.SUBSVC_INNB
+			     , SUBSVC_STTUS_CD
+			     , CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
+			FROM GC_SUBSVC GS
+			WHERE GS.SOPMAL_CD = 'SK'
+			  AND GS.SUBSVC_STTUS_CD != '03'
+			  AND GS.EXPSR_DV_CD IN ('01','03')
+			  AND
+				CASE
+					WHEN EXPSR_DV_CD = '03'
+					THEN NOW() BETWEEN GS.EXPSR_BGN_DT AND GS.EXPSR_END_DT
+					ELSE 1=1
+				END
+		]]>
+	</select>
+
+	<!-- 구독서비스 상세 조회 -->
+	<select id="selectBOSubsvcDetail"
+			parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO"
+			resultType="dataMap">
+		<![CDATA[
+			SELECT GS.SUBSVC_INNB
+				 , GS.SOPMAL_CD
+				 , GS.SUBSVC_NM
+				 , GS.SUB_PD					/*구독기간*/
+				 , GS.SUBSVC_GNR				/*기수*/
+			     , (SELECT MAX(A.SUBSVC_GNR) + 1 FROM GC_SUBSVC A WHERE A.SOPMAL_CD = GS.SOPMAL_CD AND A.SUBSVC_NM = GS.SUBSVC_NM) AS SUBSVC_NEXT_GNR		/*다음기수*/
+				 , GS.SUBSVC_GNR_NM				/*기수명*/
+				 , CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
+				 , GS.DLVY_CNT					/*배송횟수*/
+				 , GS.DLVY_CYCLE 				/*배송주기*/
+				 , GS.SUBSVC_CT					/*구독료*/
+				 , GS.TME_DLVY_AMT				/*1회배송비*/
+				 , GS.CNSMRPRIC					/*소비자가*/
+				 , GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
+				 , ROUND((GS.CNSMRPRIC - (GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT))) / NULLIF(GS.CNSMRPRIC, 0) * 100, 0) AS DSCNT_RAITO
+				 , GS.INVNTRY_QY				/*재고수량*/
+				 , GS.USEFUL_INVNTRY_QY 		/*판매재고수량*/
+				 , GS.INVNTRY_QY - GS.USEFUL_INVNTRY_QY AS AVAIL_QT		/*가용제고*/
+				 , GS.SUBSVC_STTUS_CD			/*상태코드*/
+				 , FN_GET_COMMCODE_NAME('GOODS_STTUS', GS.SUBSVC_STTUS_CD) AS SUBSVC_STTUS
+				 , FN_GET_COMMCODE_NAME('EXPSR_DV', GS.EXPSR_DV_CD) AS EXPSR_DV
+				 , GS.EXPSR_DV_CD				/*노출구분코드*/
+				 , GS.EXPSR_BGN_DT				/*노출시작일시*/
+				 , GS.EXPSR_END_DT 				/*노출종료일시*/
+				 , GS.INVNTRY_POLICY_CD			/*재고정책코드*/
+				 , GS.AVLINV_LMTT_QY			/*가용재고제한수량*/
+				 , GS.SUBSVC_DC					/*구독서비스 설명*/
+				 , GS.IMG						/*섬네일 이미지*/
+				 , GS.MBL_SUBSVC_DC				/*모바일 구독서비스 설명*/
+				 , GS.MBL_SUBSVC_DC_PC_SAME_AT	/*모바일 구독서비스 설명 PC동일여부*/
+				 , GS.LAST_PROCS_ODR			/*최종차수*/
+				 , GS.DFT_GOODS_OPTN_INNB	 	/*기본상품옵션고유번호*/
+			FROM GC_SUBSVC GS
+			WHERE GS.SOPMAL_CD = #{sopmalCd}
+			  AND GS.SUBSVC_INNB = #{subsvcInnb}
+		]]>
+	</select>
+
+	<!-- 관리자 구독서비스 목록 조회 -->
+	<select id="selectBOMngrSubsvcList"  parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO" resultType="dataMap">
+		SELECT *
+		FROM (
+			SELECT TB.*
+			, CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
+			FROM (
+				SELECT COUNT(*) OVER() AS TOT_CNT
+				, GC.SUBSVC_INNB
+				, GC.SOPMAL_CD
+				, GC.SUBSVC_NM
+				, GC.SUBSVC_GNR
+				, GC.SUBSVC_GNR_NM
+				, GC.DLVY_CNT
+				, GC.INVNTRY_QY
+				, GC.INVNTRY_QY - GC.USEFUL_INVNTRY_QY AS AVAIL_QT		/*가용제고*/
+				, GC.SUBSVC_STTUS_CD
+				, FN_GET_COMMCODE_NAME('GOODS_STTUS', GC.SUBSVC_STTUS_CD) AS SUBSVC_STTUS		/*구독서비스 상태*/
+				, FN_GET_COMMCODE_NAME('EXPSR_DV', GC.EXPSR_DV_CD) AS EXPSR_DV				/*노출구분*/
+				, GC.SUBSVC_CT			/*구독료*/
+				, GC.TME_DLVY_AMT		/*1회배송비*/
+				, GC.CNSMRPRIC			/*소비자가*/
+				, GC.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
+				, GC.IMG							/*섬네일 이미지*/
+				, GC.LAST_PROCS_ODR				/*최종차수*/
+				FROM GC_SUBSVC GC
+				WHERE GC.USE_AT = 'Y'
+				  AND GC.SOPMAL_CD = #{sopmalCd}
+				<if test="srchSelSubsvcNm != null and srchSelSubsvcNm != ''">
+					AND GC.SUBSVC_NM = #{srchSelSubsvcNm}						/*구독서비스 명*/
+				</if>
+				<if test="srchSelSubsvcGnr != null and srchSelSubsvcGnr != ''">
+				AND GC.SUBSVC_GNR = #{srchSelSubsvcGnr}						/*기수*/
+				</if>
+				<if test="srchSubsvcNm != null and srchSubsvcNm != ''">
+				AND GC.SUBSVC_NM LIKE CONCAT('%',#{srchSubsvcNm},'%')			/*구독서비스 명*/
+				</if>
+				<if test="srchSubsvcGnrNm != null and srchSubsvcGnrNm != ''">
+				AND GC.SUBSVC_GNR_NM LIKE CONCAT('%',#{srchSubsvcGnrNm},'%')	/*기수명*/
+				</if>
+				<choose>
+					<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchArrSubsvcSttusCd)">
+						/*판매상태*/
+						AND GC.SUBSVC_STTUS_CD IN
+						<foreach collection="srchArrSubsvcSttusCd" item="subsvcSttusCd" open="(" close=")" separator=",">
+							#{subsvcSttusCd}
+						</foreach>
+					</when>
+				</choose>
+				<if test="srchExpsrDvCd != null and srchExpsrDvCd != ''">
+				AND GC.EXPSR_DV_CD = #{srchExpsrDvCd}						/*노출여부*/
+				</if>
+				ORDER BY
+				<choose>
+				    <when test="sortDv == 'subsvcGnrAsc'">
+						GC.SUBSVC_NM ASC, SUBSVC_GNR ASC,
+					</when>
+				    <otherwise>
+						GC.SUBSVC_NM DESC, SUBSVC_GNR DESC,
+					</otherwise>
+				</choose>
+				GC.SUBSVC_INNB ASC
+			) TB
+			WHERE (@ROWNUM:=0)=0
+		) PV
+		WHERE	1=1
+		LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+	</select>
+
+	<!-- 관리자 구독서비스 조회조건 구독서비스 -->
+	<select id="selectBOMngrSrchSubsvcList"  parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO" resultType="dataMap">
+		SELECT GC.SUBSVC_NM, MIN(GC.SUBSVC_INNB) SUBSVC_INNB
+		FROM GC_SUBSVC GC
+		WHERE GC.SOPMAL_CD = #{sopmalCd}
+		  AND GC.USE_AT = 'Y'
+		GROUP BY GC.SUBSVC_NM
+		ORDER BY SUBSVC_INNB ASC
+	</select>
+
+	<!-- 관리자 구독서비스 조회조건 구독서비스별 기수 -->
+	<select id="selectBOMngrSrchSubsvcGnrList"  parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO" resultType="dataMap">
+		<![CDATA[
+		SELECT GC.SUBSVC_GNR, CONCAT(GC.SUBSVC_GNR , '기 (', GC.SUBSVC_GNR_NM, ')') SUBSVC_GNR_NM
+		FROM GC_SUBSVC GC
+		WHERE GC.SUBSVC_NM = #{srchSelSubsvcNm}
+		  AND GC.SOPMAL_CD = #{sopmalCd}
+		  AND GC.USE_AT = 'Y'
+		GROUP BY GC.SUBSVC_GNR, GC.SUBSVC_GNR_NM
+		ORDER BY GC.SUBSVC_GNR ASC
+		]]>
+	</select>
+	<!--선택된 구독서비스 삭제(사용여부N처리)-->
+	<update id="deleteBOMngrSubsvc" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		UPDATE GC_SUBSVC
+		SET USE_AT = 'N'
+		   ,UPDUSR = #{updusr}
+		   ,UPDT_DT = NOW()
+		WHERE SOPMAL_CD = #{sopmalCd}
+		<choose>
+			<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(arrSubsvcInnb)">
+		  AND SUBSVC_INNB IN
+				<foreach collection="arrSubsvcInnb" item="subsvcInnb" open="(" separator="," close=")">
+					#{subsvcInnb}
+				</foreach>
+			</when>
+			<otherwise>
+		  AND 1=2
+			</otherwise>
+		</choose>
+	</update>
+	<!--선택된 구독서비스 수정-->
+	<update id="updateBOMngrSubsvc" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		UPDATE GC_SUBSVC
+		SET SOPMAL_CD = #{sopmalCd}
+		  , SUBSVC_NM = #{subsvcNm}
+		  , SUB_PD = #{subPd}
+		  , SUBSVC_GNR_NM = #{subsvcGnrNm}
+		  , DLVY_CNT = REPLACE(#{dlvyCnt},',','')
+		  , DLVY_CYCLE = #{dlvyCycle}
+		  , SUBSVC_CT = REPLACE(#{subsvcCt},',','')
+		  , TME_DLVY_AMT = REPLACE(#{tmeDlvyAmt},',','')
+		  , CNSMRPRIC = REPLACE(#{cnsmrpric},',','')
+		  , INVNTRY_QY = REPLACE(#{invntryQy},',','')
+		  , INVNTRY_POLICY_CD = #{invntryPolicyCd}
+		  , AVLINV_LMTT_QY = #{avlinvLmttQy}
+		  , SUBSVC_STTUS_CD = #{subsvcSttusCd}
+		  , EXPSR_DV_CD = #{expsrDvCd}
+		  <choose>
+		  	<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(expsrBgnDt)">
+		  , EXPSR_BGN_DT = #{expsrBgnDt}
+			</when>
+		  	<otherwise>
+		  , EXPSR_BGN_DT = null
+			</otherwise>
+		  </choose>
+		<choose>
+			<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(expsrEndDt)">
+		  , EXPSR_END_DT = #{expsrEndDt}
+			</when>
+			<otherwise>
+		  , EXPSR_END_DT = null
+			</otherwise>
+		</choose>
+		  , SUBSVC_DC = #{subsvcDc}
+		  , MBL_SUBSVC_DC = #{mblSubsvcDc}
+		  , MBL_SUBSVC_DC_PC_SAME_AT = #{mblSubsvcDcPcSameAt}
+		  <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(img)">
+		  , IMG = #{img}
+		  </if>
+		  , UPDUSR = #{updusr}
+		  , UPDT_DT = NOW()
+		WHERE SUBSVC_INNB = #{subsvcInnb}
+	</update>
+
+	<!-- 구독서비스 등록 -->
+	<insert id="insertBOMngrSubsvc" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO" useGeneratedKeys="true" keyProperty="subsvcInnb" keyColumn="SUBSVC_INNB">
+		INSERT INTO GC_SUBSVC (SOPMAL_CD
+				  , SUBSVC_NM
+				  , SUB_PD
+				  , SUBSVC_GNR
+				  , SUBSVC_GNR_NM
+				  , DLVY_CNT
+				  , DLVY_CYCLE
+				  , SUBSVC_CT
+				  , TME_DLVY_AMT
+				  , CNSMRPRIC
+				  , INVNTRY_QY
+				  , USEFUL_INVNTRY_QY
+				  , INVNTRY_POLICY_CD
+				  , AVLINV_LMTT_QY
+				  , SUBSVC_STTUS_CD
+				  , EXPSR_DV_CD
+				  , EXPSR_BGN_DT
+				  , EXPSR_END_DT
+				  , SUBSVC_DC
+				  , MBL_SUBSVC_DC
+				  , MBL_SUBSVC_DC_PC_SAME_AT
+				  , IMG
+				  , DFT_GOODS_OPTN_INNB
+				  , USE_AT
+				  , REGUSR
+				  , REGIST_DT)
+		VALUES    (#{sopmalCd}
+				, #{subsvcNm}
+				, #{subPd}
+				, #{subsvcGnr}
+				, #{subsvcGnrNm}
+				, REPLACE(#{dlvyCnt},',','')
+				, #{dlvyCycle}
+				, REPLACE(#{subsvcCt},',','')
+				, REPLACE(#{tmeDlvyAmt},',','')
+				, REPLACE(#{cnsmrpric},',','')
+				, REPLACE(#{invntryQy},',','')
+				, 0
+				, #{invntryPolicyCd}
+				, #{avlinvLmttQy}
+				, #{subsvcSttusCd}
+				, #{expsrDvCd}
+		<choose>
+			<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(expsrBgnDt)">
+				, #{expsrBgnDt}
+			</when>
+			<otherwise>
+				, null
+			</otherwise>
+		</choose>
+		<choose>
+			<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(expsrEndDt)">
+				, #{expsrEndDt}
+			</when>
+			<otherwise>
+				, null
+			</otherwise>
+		</choose>
+				, #{subsvcDc}
+				, #{mblSubsvcDc}
+				, #{mblSubsvcDcPcSameAt}
+				, #{img}
+				, #{dftGoodsOptnInnb}
+				, 'Y'
+				, #{regusr}
+				, NOW()
+			)
+	</insert>
+
+	<!-- 구독서비스명 중복체크 -->
+	<select id="selectBOMngrSubsvcNmDupCheck" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO" resultType="int">
+		SELECT COUNT(*) CNT
+		FROM GC_SUBSVC GS
+		WHERE GS.SOPMAL_CD = #{sopmalCd}
+		  AND GS.SUBSVC_NM = #{subsvcNm}
+	</select>
+</mapper>

src/main/resources/mybatis/xml/mapper/gcone/login/LoginMapper.xml

@@ -48,7 +48,7 @@
              ,TELNB
              ,MBTLNB
              , MNGR_DV
-             ,(SELECT SYS_DV_CD FROM site WHERE #{accessUrl} LIKE CONCAT('%',URL,'%')) AS SYS_DV_CD
+             ,(SELECT SYS_DV_CD FROM site WHERE URL = #{accessUrl}) AS SYS_DV_CD
              ,#{sopmalCd} AS SOPMAL_CD
           FROM GC_MANAGER
           WHERE 1=1

src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml

@@ -726,6 +726,15 @@
         AND MBTLNB = HEX(AES_ENCRYPT(#{mbtlnb}, #{secretKey}))
     </select>
 
+    <!--회원 핸드폰 번호와 바뀐 핸드폰 번호 비교-->
+    <select id = "selectBOMbrEmailCompare" parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO">
+        SELECT COUNT(1)
+        FROM GC_MEMBER MBR
+        WHERE MBR.MBR_INNB = #{mbrInnb}
+          AND MBR.MBR_DV_CD = #{mbrDvCd}
+          AND EMAIL = HEX(AES_ENCRYPT(#{email}, #{secretKey}))
+    </select>
+
     <!-- 회원 정보 수정 -->
     <update id="updateBOMbrInfoUpdt" parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO">
  		UPDATE GC_MEMBER SET
@@ -1607,7 +1616,12 @@
         WHERE 1 = 1
           AND MBR_NM = #{mbrNm}
           AND MBR_ID = #{mbrId}
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(email)">
+          AND EMAIL = HEX(AES_ENCRYPT(#{email}, #{secretKey}))
+        </if>
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbtlnb)">
           AND MBTLNB = HEX(AES_ENCRYPT(#{mbtlnb}, #{secretKey}))
+        </if>
           AND MBR_DV_CD = #{mbrDvCd}
     </select>
 
@@ -1669,7 +1683,12 @@
                   AND GM.USE_AT = 'Y'
                   AND GM.MBR_DV_CD = #{mbrDvCd}
                   AND GM.MBR_NM = #{mbrNm}
+            <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(email)">
+                  AND GM.EMAIL = HEX(AES_ENCRYPT(#{email}, #{secretKey}))
+            </if>
+            <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbtlnb)">
                   AND GM.MBTLNB = HEX(AES_ENCRYPT(#{mbtlnb}, #{secretKey}))
+            </if>
                 ) TGT
             WHERE 1 = 1
               AND RK = 1
@@ -1800,6 +1819,113 @@
         LIMIT 1
     </select>
 
+    <!--기존 가입 여부 조회 - Email -->
+    <select id="selectBOMbrwithdrawalSearchEmail"
+            parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO" resultType="dataMap">
+        SELECT TGT.*
+        FROM (
+                 SELECT GM.MBR_INNB,
+                        GM.MBR_ID,
+                        CAST(AES_DECRYPT(UNHEX(GEM.EMAIL_ADRES) , #{secretKey}) AS CHAR(50)) AS EMAIL_ADRES,
+                        SHOP.SOPMAL_NM AS BRAND,
+                        FN_GET_COMMCODE_NAME('EXTRL_INTRLCK_DV', GEM.EXTRL_INTRLCK_DV_CD) EXTRL_INTRLCK_DV,
+                        CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  2  ELSE 1  END IS_HM,
+                        GMS.LAST_PURCHS_DT,
+                        GMS.LAST_LOGIN_DT,
+                        CASE WHEN (GM.MBR_ID LIKE 'M-%' OR REGEXP_LIKE(GM.MBR_ID,'kko[0-9]{10}') OR GM.MBR_ID LIKE '%@%')
+                                 THEN CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  4 -- SNS 가입 AND 휴면인적이 있던 회원
+                                           ELSE 3 -- SNS 가입 AND 휴면인적이 없던 회원
+                                END
+                             ELSE CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  2 -- 사이트 가입 AND 휴면인적이 있던 회원
+                                       ELSE 1 -- 사이트 가입 AND 휴면인적이 없던 회원
+                                 END
+                            END DEV,
+                        RANK() OVER (PARTITION BY GM.MBR_NM, GM.MBTLNB
+                   ORDER BY (CASE WHEN (GM.MBR_ID LIKE 'M-%' OR REGEXP_LIKE(GM.MBR_ID,'kko[0-9]{10}') OR GM.MBR_ID LIKE '%@%')
+                   THEN CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  4
+                   ELSE 3
+                   END
+                   ELSE	CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  2
+                   ELSE 1
+                   END
+                   END),
+                   GMS.LAST_PURCHS_DT DESC, GMS.LAST_LOGIN_DT DESC, GMS.MBR_INNB DESC
+                   ) AS RK
+                 FROM GC_MEMBER GM
+                          INNER JOIN GC_MEMBER_SITE GMS
+                                     ON GM.MBR_INNB = GMS.MBR_INNB
+                                         AND GM.MBR_DV_CD = GMS.MBR_DV_CD
+                          LEFT JOIN GC_EXTRL_MEMBER GEM
+                                    ON GMS.MBR_INNB = GEM.MBR_INNB
+                                        AND GMS.MBR_DV_CD = GEM.MBR_DV_CD
+                                        AND GMS.SOPMAL_CD = GEM.SOPMAL_CD
+                          LEFT JOIN GC_SHOP SHOP
+                                    ON GMS.SOPMAL_CD = SHOP.SOPMAL_CD
+                 WHERE 1 = 1
+                   AND GM.USE_AT = 'Y'
+                   AND GM.MBR_DV_CD = #{mbrDvCd}
+                   AND GM.MBR_NM = #{mbrNm}
+                   AND GM.EMAIL = HEX(AES_ENCRYPT(#{email}, #{secretKey}))
+             ) TGT
+        WHERE 1 = 1
+          AND NOT (EXTRL_INTRLCK_DV IS NULL AND DEV >= 3)
+        ORDER BY DEV, RK
+    </select>
+
+    <!--기존 가입 여부 조회(SNS) - Email -->
+    <select id="selectBOMbrwithdrawalSnsSearchEmail"
+            parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO" resultType="dataMap">
+        SELECT TGT.*
+        FROM (
+        SELECT GM.MBR_INNB,
+        GM.MBR_ID,
+        CAST(AES_DECRYPT(UNHEX(GEM.EMAIL_ADRES) , #{secretKey}) AS CHAR(50)) AS EMAIL_ADRES,
+        SHOP.SOPMAL_NM AS BRAND,
+        FN_GET_COMMCODE_NAME('EXTRL_INTRLCK_DV', GEM.EXTRL_INTRLCK_DV_CD) EXTRL_INTRLCK_DV,
+        CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  2  ELSE 1  END IS_HM,
+        GMS.LAST_PURCHS_DT,
+        GMS.LAST_LOGIN_DT,
+        CASE WHEN (GM.MBR_ID LIKE 'M-%' OR REGEXP_LIKE(GM.MBR_ID,'kko[0-9]{10}') OR GM.MBR_ID LIKE '%@%')
+        THEN CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  4 -- SNS 가입 AND 휴면인적이 있던 회원
+        ELSE 3 -- SNS 가입 AND 휴면인적이 없던 회원
+        END
+        ELSE	CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  2 -- 사이트 가입 AND 휴면인적이 있던 회원
+        ELSE 1 -- 사이트 가입 AND 휴면인적이 없던 회원
+        END
+        END DEV,
+        RANK() OVER (PARTITION BY GM.MBR_NM, GM.MBTLNB
+        ORDER BY (CASE WHEN (GM.MBR_ID LIKE 'M-%' OR REGEXP_LIKE(GM.MBR_ID,'kko[0-9]{10}') OR GM.MBR_ID LIKE '%@%')
+        THEN CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  4
+        ELSE 3
+        END
+        ELSE	CASE WHEN GM.MNGR_LOG LIKE '%휴면해제%' THEN  2
+        ELSE 1
+        END
+        END),
+        GMS.LAST_PURCHS_DT DESC, GMS.LAST_LOGIN_DT DESC, GMS.MBR_INNB DESC
+        ) AS RK
+        FROM GC_MEMBER GM
+        INNER JOIN GC_MEMBER_SITE GMS
+        ON GM.MBR_INNB = GMS.MBR_INNB
+        AND GM.MBR_DV_CD = GMS.MBR_DV_CD
+        LEFT JOIN GC_EXTRL_MEMBER GEM
+        ON GMS.MBR_INNB = GEM.MBR_INNB
+        AND GMS.MBR_DV_CD = GEM.MBR_DV_CD
+        AND GMS.SOPMAL_CD = GEM.SOPMAL_CD
+        LEFT JOIN GC_SHOP SHOP
+        ON GMS.SOPMAL_CD = SHOP.SOPMAL_CD
+        WHERE 1 = 1
+        AND GM.USE_AT = 'Y'
+        AND GM.MBR_DV_CD = #{mbrDvCd}
+        AND GM.MBR_NM = #{mbrNm}
+        AND GM.EMAIL = HEX(AES_ENCRYPT(#{email}, #{secretKey}))
+        ) TGT
+        WHERE 1 = 1
+        AND NOT (EXTRL_INTRLCK_DV IS NULL AND DEV >= 3)
+        ORDER BY DEV, RK
+        LIMIT 1
+    </select>
+
     <!--동의 약정 조회 -->
     <select id="selectBOJoinAgreeTermsForm"
             parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO" resultType="dataMap">
@@ -1863,15 +1989,6 @@
         MBR_ID,
         JOIN_MTH_CD,
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEmpty(joinMthCd)">
-            ZIP,
-            ADRES_DV,
-            <if test="adresDv == '01'">
-                RNM_ADRES,
-            </if>
-            <if test="adresDv == '02'">
-                LNB_ADRES,
-            </if>
-            DTL_ADRES,
             PASSWORD_CHNG_DE,
         </if>
         MBR_PASSWORD,
@@ -1902,10 +2019,6 @@
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEmpty(joinMthCd)">
             #{mbrId},
             'none',
-            #{zip},
-            #{adresDv},
-            #{lnbAdres},
-            #{dtlAdres},
             SYSDATE(),
         </if>
         #{mbrPassword},
@@ -2028,6 +2141,42 @@
           AND CRTNB = #{crtnb}
     </select>
 
+    <!-- 이메일 인증번호 생성 -->
+    <insert id="insertBOEmailAuth"
+            parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO"
+            useGeneratedKeys="true"
+            keyProperty="sndngInnb">
+        INSERT
+        INTO GC_CRTNB (
+        EMAIL,
+        CRTNB,
+        REGUSR,
+        REGIST_DT
+        )
+        VALUES (
+        #{email},
+        #{crtnb},
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbrInnb)">
+            #{mbrInnb},
+        </if>
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEmpty(mbrInnb)">
+            '0',
+        </if>
+        SYSDATE()
+        )
+    </insert>
+
+    <!-- 이메일 인증 -->
+    <select id="selectBOEmailAuth"
+            parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO" resultType="Integer">
+        SELECT COUNT(1)
+        FROM GC_CRTNB
+        WHERE 1 = 1
+          AND SNDNG_INNB = #{sndngInnb}
+          AND EMAIL = #{email}
+          AND CRTNB = #{crtnb}
+    </select>
+
     <!-- 회원별 등급매핑 -->
     <insert id="insertBOMbrGradMapping"
             parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO">

src/main/resources/mybatis/xml/mapper/gcone/ordr/dlivy/BODlivyMapper.xml

@@ -27,6 +27,7 @@
 				AND OI.GOODS_INNB = G.GOODS_INNB
 			INNER JOIN GC_ORDER O ON EX.SOPMAL_CD = O.SOPMAL_CD
 				AND EX.ORDR_INNB = O.ORDR_INNB
+				/*AND O.SUBSVC_AT = 'N'*/		/*구독서비스 제외*/
 			INNER JOIN GC_ORDER_SHIPPING OSHIP ON EX.SOPMAL_CD = OSHIP.SOPMAL_CD
 				AND EX.ORDR_INNB = OSHIP.ORDR_INNB
 				AND EX.ORDR_DLVY_INNB = OSHIP.ORDR_DLVY_INNB
@@ -405,6 +406,7 @@
 				AND OI.GOODS_INNB = G.GOODS_INNB
 			INNER JOIN GC_ORDER O ON SH.SOPMAL_CD = O.SOPMAL_CD
 				AND SH.ORDR_INNB = O.ORDR_INNB
+				/*AND O.SUBSVC_AT = 'N'*/			/*구독서비스 제외*/
 			INNER JOIN GC_ORDER_SETLE ST ON SH.SOPMAL_CD = ST.SOPMAL_CD
 				AND SH.ORDR_INNB = ST.ORDR_INNB
 			LEFT JOIN GC_MEMBER MBR ON O.MBR_DV_CD = MBR.MBR_DV_CD
@@ -583,8 +585,10 @@
 					,SUM(OIOP.ORDR_QY) AS ORDR_QY -- 주문수량
 					,COUNT(OIOP.ORDR_GOODS_OPTN_INNB) AS CNT
 					,IFNULL(SUM(OIOP.STEP85), 0) AS SETLE_CANCEL_QY -- 취소수량
-					,SUM(OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75) AS SNDNG_QY -- 보낸 수량
+-- 					,SUM(OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75) AS SNDNG_QY -- 보낸 수량
-					,SUM((OIOP.ORDR_QY - OIOP.STEP85) - (OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75)) AS REMAIN_QY -- 남은 수량
+-- 					,SUM((OIOP.ORDR_QY - OIOP.STEP85) - (OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75)) AS REMAIN_QY -- 남은 수량
+					,SUM(OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75) AS SNDNG_QY -- 보낸 수량
+					,SUM((OIOP.ORDR_QY - OIOP.STEP85) - (OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75)) AS REMAIN_QY -- 남은 수량
 					,CASE --
 						WHEN COUNT(OIOP.ORDR_GOODS_OPTN_INNB) > 1 THEN CONCAT(MAX(OI.GOODS_NM) , ' 외 ', COUNT(OIOP.ORDR_GOODS_OPTN_INNB)-1, '종')
 						ELSE MAX(OI.GOODS_NM)
@@ -662,8 +666,10 @@
 										,SUM(OIOP.ORDR_QY) AS ORDR_QY -- 주문수량
 										,COUNT(OIOP.ORDR_GOODS_OPTN_INNB) AS CNT
 										,IFNULL(SUM(OIOP.STEP85), 0) AS SETLE_CANCEL_QY -- 취소수량
-										,SUM(OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75) AS SNDNG_QY -- 보낸 수량
+-- 										,SUM(OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75) AS SNDNG_QY -- 보낸 수량
-										,SUM((OIOP.ORDR_QY - OIOP.STEP85) - (OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75)) AS REMAIN_QY -- 남은 수량
+-- 										,SUM((OIOP.ORDR_QY - OIOP.STEP85) - (OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75)) AS REMAIN_QY -- 남은 수량
+										,SUM(OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75) AS SNDNG_QY -- 보낸 수량
+										,SUM((OIOP.ORDR_QY - OIOP.STEP85) - (OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75)) AS REMAIN_QY -- 남은 수량
 										,CASE --
 											WHEN COUNT(OIOP.ORDR_GOODS_OPTN_INNB) > 1 THEN CONCAT(MAX(OI.GOODS_NM) , ' 외 ', COUNT(OIOP.ORDR_GOODS_OPTN_INNB)-1, '종')
 											ELSE MAX(OI.GOODS_NM)
@@ -755,7 +761,8 @@
 			OIOP.ORDR_GOODS_OPTN_INNB
 			,OIOP.SOPMAL_CD
 			,OIOP.OPTN_TY
-			,((OIOP.ORDR_QY - OIOP.STEP85) - (OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75)) AS QY
+-- 			,((OIOP.ORDR_QY - OIOP.STEP85) - (OIOP.STEP35 + OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75)) AS QY
+			,((OIOP.ORDR_QY - OIOP.STEP85) - (OIOP.STEP45 + OIOP.STEP55 + OIOP.STEP65 + OIOP.STEP75)) AS QY		/*상품준비(35)는 출고대상으로 지정*/
 			,OI.GOODS_NM
 			,(
 				SELECT

src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml

@@ -79,14 +79,17 @@
                             MBR_INNB,
                             MBR_DV_CD,
                             DLVYLC_DC_CN,
+                            DLVYLC_AREA_CD,
                             RECPNT_NM,
                             CAST(AES_DECRYPT(UNHEX(MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)) AS MBTLNB,
                             ADRES_DV,
                             LNB_ADRES,
                             RNM_ADRES,
                             DTL_ADRES,
+                            CSTMCLER_CD,
                             DFT_DLVYLC_AT,
-                            ZIP
+                            ZIP,
+                            PREFCD
                         <include refid="dlvyAdresFrom"/>
                         <include refid="mbrInnbWhere"/>
                         ORDER BY (CASE WHEN DFT_DLVYLC_AT = 'Y' THEN 1 ELSE 2 END), ADBK_INNB DESC
@@ -179,12 +182,15 @@
         SELECT
                 ADBK_INNB,
                 MBR_INNB,
+                DLVYLC_AREA_CD,
                 RECPNT_NM,
                 ZIP,
+                PREFCD,
                 DLVYLC_DC_CN,
                 LNB_ADRES,
                 RNM_ADRES,
                 DTL_ADRES,
+                CSTMCLER_CD,
                 CAST(AES_DECRYPT(UNHEX(MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)) AS MBTLNB,
                 DFT_DLVYLC_AT,
                 REGIST_DT,
@@ -222,14 +228,17 @@
                 MBR_DV_CD,
                 MBR_INNB,
                 DLVYLC_DC_CN,
+                DLVYLC_AREA_CD,
                 RECPNT_NM,
                 TELNB,
                 MBTLNB,
                 ZIP,
+                PREFCD,
                 ADRES_DV,
                 LNB_ADRES,
                 RNM_ADRES,
                 DTL_ADRES,
+                CSTMCLER_CD,
                 DFT_DLVYLC_AT,
                 RECENT_DLVYLC_AT,
                 REGUSR,
@@ -241,14 +250,17 @@
                 #{mbrDvCd},
                 #{mbrInnb},
                 #{dlvylcDcCn},
+                #{dlvylcAreaCd},
                 #{recpntNm},
                 #{telnb},
                 HEX(AES_ENCRYPT(REPLACE(#{mbtlnb},'-',''), '1df5be2f7e90ae36')),
                 #{zip},
+                #{prefcd},
                 #{adresDv},
                 #{lnbAdres},
                 #{rnmAdres},
                 #{dtlAdres},
+                #{cstmclerCd},
                 #{dftDlvylcAt},
                 #{recentDlvylcAt},
                 #{regusr},
@@ -264,13 +276,16 @@
         <![CDATA[
             UPDATE GC_DELIVERY_ADDRESS
             SET
+            DLVYLC_AREA_CD= #{dlvylcAreaCd},
             RECPNT_NM     = #{recpntNm},
             MBTLNB 	      = HEX(AES_ENCRYPT(REPLACE(#{mbtlnb},'-',''), '1df5be2f7e90ae36')),
             ZIP           = #{zip},
+            PREFCD        = #{prefcd},
             ADRES_DV      = #{adresDv},
             RNM_ADRES     = #{rnmAdres},
             LNB_ADRES     = #{lnbAdres},
             DTL_ADRES     = #{dtlAdres},
+            CSTMCLER_CD     = #{cstmclerCd},
             DFT_DLVYLC_AT = #{dftDlvylcAt},
             UPDUSR        = #{updusr},
             UPDT_DT       = SYSDATE(),
@@ -482,6 +497,7 @@
                                  AND FOS.ORDR_INNB = FO.ORDR_INNB
          WHERE FO.USE_AT = 'Y'
            AND IFNULL(FOS.ORDR_INNB, '') != ''
+           /*AND FO.SUBSVC_AT = 'N'*/
            AND FO.SOPMAL_CD = #{sopmalCd}
         <include refid="orderWhere"/>
     </select>
@@ -585,6 +601,7 @@
         		ON FOS.SOPMAL_CD = FO.SOPMAL_CD
                 AND FOS.ORDR_INNB = FO.ORDR_INNB
         			WHERE FO.USE_AT = 'Y'
+                    /*AND FO.SUBSVC_AT = 'N'*/
         			AND   FOS.ORDR_INNB IS NOT NULL   -- GC_ORDER_SETLE 에 데이터가 있을 때 조건
         			#  AND IFNULL(FOS.ORDR_INNB, '') != ''    -- 필터조건의 의미가 inner join 을 의미하므로, GC_ORDER_SETLE 테이블과 inner join 으로 변경하였음.
         			  AND FO.SOPMAL_CD = #{sopmalCd}
@@ -2690,7 +2707,7 @@
 
     <!-- 다운로드항목 등록 -->
     <insert id="insertDwldForm" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BODwldItmVO">
-        <selectKey order="BEFORE" keyProperty="excelDwldFormSnb" resultType="java.lang.Long">
+        <selectKey order="BEFORE" keyProperty="excelDwldFormSnb" resultType="java.lang.String">
             SELECT IFNULL(MAX(EXCEL_DWLD_FORM_SNB), 0) + 1 FROM GC_EXCEL_DWLD_FORM
         </selectKey>
 
@@ -3803,6 +3820,7 @@
             LEFT JOIN GC_ORDER_SETLE FOS ON FOS.SOPMAL_CD = FO.SOPMAL_CD
                                         AND FOS.ORDR_INNB = FO.ORDR_INNB
                 WHERE FO.USE_AT = 'Y'
+                  AND FO.SUBSVC_AT = 'N'        /*구독서비스 제외*/
                   AND IFNULL(FOS.ORDR_INNB, '') != ''
                   AND FO.SOPMAL_CD = #{sopmalCd}
                   AND FO.MBR_DV_CD = #{mbrDvCd}
@@ -3939,6 +3957,7 @@
                                                                              AND GOR.SOPMAL_CD = #{sopmalCd}
                                                                              AND GOR.MBR_DV_CD = #{mbrDvCd}
                                                                              AND GOR.MBR_INNB = #{mbrInnb}
+                                                                             AND GOR.SUBSVC_INNB IS NULL /*구독서비스 제외*/
                                                                           )
                                GROUP BY FOI.ORDR_INNB
                                   ) ITEM ON ITEM.SOPMAL_CD = FO.SOPMAL_CD
@@ -3946,6 +3965,7 @@
                         LEFT JOIN GC_ORDER_SETLE FOS ON FOS.SOPMAL_CD = FO.SOPMAL_CD
                                                     AND FOS.ORDR_INNB = FO.ORDR_INNB
                             WHERE FO.USE_AT = 'Y'
+                              AND FO.SUBSVC_AT = 'N' /*구독서비스 제외*/
                               AND ( ( FO.ORDR_STTUS_CD BETWEEN '15' AND '75' ) OR FO.ORDR_STTUS_CD = '95' )
                               AND FO.SOPMAL_CD = #{sopmalCd}
                               AND FO.MBR_DV_CD = #{mbrDvCd}
@@ -4619,7 +4639,7 @@
     </select>
 
 
-    <!-- 추가지역별배송비 해당 여부 -->
+    <!-- 추가지역별배송비 해당 여부 (KR) -->
     <select id="selectBODefaultAdressAtInqire"
             resultType="java.lang.String">
         <![CDATA[
@@ -4637,6 +4657,24 @@
         ]]>
     </select>
 
+    <!-- 추가지역별배송비 해당 여부 (JP) -->
+    <select id="selectBODefaultAdressAtInqire2"
+            resultType="java.lang.String">
+        <![CDATA[
+        SELECT
+            CASE
+                WHEN EXISTS (
+                    SELECT 1
+                    FROM GC_DEFAULT_ADDSHIPPING
+                    WHERE SOPMAL_CD = #{sopmalCd}
+                      AND PREFCD = #{prefcd}
+                ) THEN 'Y'
+                ELSE 'N'
+                END AS ADDSHIPPING_AT
+        FROM DUAL
+        ]]>
+    </select>
+
 
 
 
@@ -5247,6 +5285,163 @@
         ]]>
     </select>
 
+    <!-- 사용자 > 마이페이지 > 구독서비스 주문/배송 목록 조회 -->
+    <select id="selectMbrSubsvcOrdrList" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrDlvyVO" resultType="dataMap">
+        <![CDATA[
+            SELECT *
+              FROM (
+                   SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
+                        , TB.*
+                     FROM (
+                          SELECT COUNT(*) OVER() TOT_CNT
+                               , FO.SOPMAL_CD
+                               , CAST(FO.ORDR_INNB AS CHAR) AS ORDR_INNB
+                               , FO.ORDR_RCEPT_DT
+                               , DATE_FORMAT(FO.ORDR_RCEPT_DT, '%Y.%m.%d') AS ORDR_DT
+                               , GS.IMG AS GOODS_IMAGE_URL
+                               , CONCAT(GS.SUBSVC_NM, '[', GS.SUBSVC_GNR_NM, ']') AS GOODS_NM
+                               , FN_GET_ORDER_GOODS_OPTN_NAME(FO.SOPMAL_CD, FO.ORDR_INNB, 0) AS OPTN_NM
+                               , GS.SUBSVC_INNB AS GOODS_INNB
+                               , ITEM.ORDR_DLVY_INNB
+                               , FO.RL_SETLE_AMT AS SETLE_AMT
+                               , FO.ORDR_STTUS_CD
+                               , CASE
+                                   WHEN FO.ORDR_STTUS_CD = '95' THEN '주문취소'
+                                   ELSE  FN_GET_COMMCODE_NAME('ORDR_STTUS', FO.ORDR_STTUS_CD)
+                                 END AS ORDR_STTUS_NM
+                               , (
+                                      SELECT
+                                          FN_GET_COMMCODE_NAME('GIFT_STTUS', SH.GIFT_STTUS_CD) AS GIFT_STTUS_CD
+                                      FROM GC_ORDER_SHIPPING SH
+                                      WHERE 1 =1
+                                          AND SH.SOPMAL_CD = FO.SOPMAL_CD
+                                          AND SH.ORDR_INNB = FO.ORDR_INNB
+                                      LIMIT 1
+                                ) AS GIFT_STTUS_CD_NM
+                               , (
+                                      SELECT
+                                          SH.GIFT_STTUS_CD
+                                      FROM GC_ORDER_SHIPPING SH
+                                      WHERE 1 =1
+                                          AND SH.SOPMAL_CD = FO.SOPMAL_CD
+                                          AND SH.ORDR_INNB = FO.ORDR_INNB
+                                      LIMIT 1
+                                ) AS GIFT_STTUS_CD
+                               , FO.ORDR_TY_CD
+                               , FO.SKN_ENVRN_CD
+                               , FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ORDR_TY_CD_NM
+                               , FO.MBR_INNB
+                               , FO.MBR_DV_CD
+                               , CASE
+                                         WHEN EXISTS (
+                                            SELECT 1
+                                            FROM GC_ORDER_ITEM_OPTION FOIO
+                                                     INNER JOIN GC_ORDER_ITEM FOI
+                                                                ON FOIO.SOPMAL_CD = FOI.SOPMAL_CD
+                                                                    AND FOIO.ORDR_GOODS_INNB = FOI.ORDR_GOODS_INNB
+                                                     INNER JOIN GC_GOODS FG
+                                                                ON FOI.GOODS_INNB = FG.GOODS_INNB
+                                                                    AND FOI.SOPMAL_CD = FG.SOPMAL_CD
+                                                                    AND FG.GOODS_KND_CD = '01'
+                                                     LEFT JOIN LATERAL ( SELECT FBG.ORDR_GOODS_OPTN_INNB
+                                                                              , FBG.SOPMAL_CD
+                                                                              , SUM(CASE WHEN FB.BBS_ID = 'goods_review' THEN 1 ELSE 0 END) RVW_CNT
+                                                                              , SUM(CASE WHEN FB.BBS_ID = 'goods_review_month' THEN 1 ELSE 0 END) MT_RVW_CNT
+                                                                         FROM GC_BOARDDATA_GOODS FBG
+                                                                                  INNER JOIN GC_BOARDDATA FB
+                                                                                             ON FBG.BBSCTT_INNB = FB.BBSCTT_INNB
+                                                                                                 AND FBG.SOPMAL_CD =  FB.SOPMAL_CD
+                                                                                                 AND FB.BBS_ID IN ('goods_review','goods_review_month')
+                                                                         WHERE FOIO.ORDR_GOODS_OPTN_INNB = FBG.ORDR_GOODS_OPTN_INNB
+                                                                         GROUP BY FBG.ORDR_GOODS_OPTN_INNB, FBG.SOPMAL_CD
+                                                                        )RVW
+                                                               ON FOIO.ORDR_GOODS_OPTN_INNB = RVW.ORDR_GOODS_OPTN_INNB
+                                                                   AND FOIO.SOPMAL_CD = RVW.SOPMAL_CD
+                                            WHERE 1 = 1
+                                                  AND FOIO.SOPMAL_CD = FO.SOPMAL_CD
+                                                  AND FOI.ORDR_INNB = FO.ORDR_INNB
+                                                  AND FOIO.PURCHS_DCSN_QY > 0
+                                                  AND FOIO.OPTN_TY <> '04'
+                                                  AND ((FG.RVW_WRITNG_POSBL_AT = 'Y' AND (CASE WHEN IFNULL(FOIO.PURCHS_DCSN_QY,0)  < IFNULL(FOIO.ORDR_QY,0) - IFNULL(STEP85,0) THEN IFNULL(FOIO.PURCHS_DCSN_QY,0)
+                                                                                               ELSE IFNULL(FOIO.ORDR_QY,0) - IFNULL(STEP85,0)  END) > IFNULL(RVW.RVW_CNT,0) )
+                                                    OR (FG.MT_RVW_WRITNG_POSBL_AT = 'Y' AND IFNULL(MT_RVW_CNT,0) < 1))
+                                                  AND FOIO.PURCHS_DCSN_DT > DATE_SUB(SYSDATE(),INTERVAL 6 MONTH)
+                                         ) THEN 'Y'
+                                         ELSE 'N'
+                                  END AS REVIEW_AT
+                                   , CASE
+                                         WHEN EXISTS (
+                                             SELECT
+                                                 1
+                                             FROM GC_ORDER_ITEM_OPTION OIOP
+                                                      INNER JOIN GC_ORDER_SHIPPING SH ON OIOP.SOPMAL_CD = SH.SOPMAL_CD
+                                                 AND OIOP.ORDR_DLVY_INNB = SH.ORDR_DLVY_INNB
+                                             WHERE 1 = 1
+                                                 AND OIOP.PURCHS_DCSN_AT = 'N'
+                                                 AND FO.SOPMAL_CD = SH.SOPMAL_CD
+                                                 AND FO.ORDR_INNB = SH.ORDR_INNB
+                                                 AND OIOP.ORDR_STTUS_CD BETWEEN '50' AND '75'
+                                         ) THEN 'Y'
+                                         ELSE 'N'
+                                  END AS PURCHS_DCSN_AT
+                               ,FOS.SETLE_TY_CD
+                            FROM GC_ORDER FO
+                            INNER JOIN GC_SUBSVC GS ON FO.SUBSVC_INNB = GS.SUBSVC_INNB
+                      INNER JOIN (
+                                 SELECT FOI.SOPMAL_CD
+                                      , FOI.ORDR_INNB
+                                      , MAX(FOI.GOODS_INNB) AS GOODS_INNB
+                                      , MAX(FOIO.ORDR_DLVY_INNB) AS ORDR_DLVY_INNB
+                                      , COUNT(DISTINCT FOI.ORDR_GOODS_INNB) AS CNT
+                                      , SUM(FOIO.ORDR_QY) AS ORDR_QY
+                                      , MAX(FN_GET_ORDER_INPUT_OPTN(FOI.SOPMAL_CD, FOI.ORDR_INNB, FOI.ORDR_GOODS_INNB, FOIO.ORDR_GOODS_OPTN_INNB)) AS INPUT_OPTN_TEXT
+                                      , MAX(FOI.GOODS_IMG_COURS) AS GOODS_IMG_COURS
+                                   FROM GC_ORDER_ITEM FOI
+                             INNER JOIN GC_ORDER_ITEM_OPTION FOIO ON FOI.SOPMAL_CD = FOIO.SOPMAL_CD
+                                    AND FOI.ORDR_GOODS_INNB = FOIO.ORDR_GOODS_INNB
+                                  WHERE FOI.SOPMAL_CD = #{sopmalCd}
+                                    AND FOI.GOODS_KND_CD = '01'
+                                    AND (FOI.SOPMAL_CD, FOI.ORDR_INNB) IN (
+                                                                          SELECT GOR.SOPMAL_CD
+                                                                               , GOR.ORDR_INNB
+                                                                            FROM GC_ORDER GOR
+                                                                           WHERE GOR.USE_AT = 'Y'
+                                                                             AND GOR.SOPMAL_CD = #{sopmalCd}
+                                                                             AND GOR.MBR_DV_CD = #{mbrDvCd}
+                                                                             AND GOR.MBR_INNB = #{mbrInnb}
+                                                                             AND GOR.SUBSVC_AT = 'Y' /*구독서비스*/
+                                                                          )
+                               GROUP BY FOI.ORDR_INNB
+                                  ) ITEM ON ITEM.SOPMAL_CD = FO.SOPMAL_CD
+                                        AND ITEM.ORDR_INNB = FO.ORDR_INNB
+                        LEFT JOIN GC_ORDER_SETLE FOS ON FOS.SOPMAL_CD = FO.SOPMAL_CD
+                                                    AND FOS.ORDR_INNB = FO.ORDR_INNB
+                            WHERE FO.USE_AT = 'Y'
+                              AND FO.SUBSVC_AT = 'Y' /*구독서비스*/
+                              AND ( ( FO.ORDR_STTUS_CD BETWEEN '15' AND '75' ) OR FO.ORDR_STTUS_CD = '95' )
+                              AND FO.SOPMAL_CD = #{sopmalCd}
+                              AND FO.MBR_DV_CD = #{mbrDvCd}
+                              AND FO.MBR_INNB = #{mbrInnb}
+                         ORDER BY FO.REGIST_DT DESC
+                          ) TB
+                    WHERE (@rownum:=0) = 0
+        ]]>
+        <include refid="mbrOrdrSubsvcListWhere"/>
+        ) PV
+        LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+    </select>
+
+    <sql id="mbrOrdrSubsvcListWhere">
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchwrd)">
+            AND (
+            TB.ORDR_INNB LIKE CONCAT('%', #{srchwrd}, '%') OR
+            TB.GOODS_NM  LIKE CONCAT('%', #{srchwrd}, '%')
+            )
+        </if>
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnDt) and @com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endDt)">
+            AND TB.ORDR_RCEPT_DT BETWEEN DATE(#{bgnDt}) AND DATE(#{endDt}) + 1
+        </if>
+    </sql>
 
 </mapper>
 

src/main/resources/mybatis/xml/mapper/gcone/ordr/subsvc/BOSubsvcOrdrMapper.xml

@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.wb.domainserver.domain.gcone.ordr.subsvc.mapper.BOSubsvcOrdrMapper">
+    <!--구독서비스 상품준비 관리 목록-->
+    <select id="selectBOSubsvcOrderList" parameterType="com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO" resultType="dataMap">
+        SELECT *
+        FROM (
+            SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
+                 , COUNT(*) OVER() AS TOT_CNT
+                 , MAIN.*
+            FROM (
+                SELECT ROW_NUMBER() OVER(PARTITION BY GO.ORDR_INNB ORDER BY GO.ORDR_INNB ASC, GOIO.ORDR_STTUS_CD ASC, GOI.ORDR_GOODS_INNB ASC, GOIO.ORDR_GOODS_OPTN_INNB ASC) AS LINE
+                     , GO.ORDR_INNB
+                     , GOI.ORDR_GOODS_INNB
+                     , GOIO.ORDR_GOODS_OPTN_INNB    /*일괄처리 대상 주문상품옵션고유번호*/
+                     , GOIO.ORDR_DLVY_INNB
+                     , GS.SUBSVC_NM
+                     , GS.SUBSVC_GNR
+                     , GS.SUBSVC_GNR_NM
+                     , GM.MBR_NM
+                     , GM.MBR_ID
+                     , GM.MBR_DV_CD
+                     , GM.MBR_INNB
+                     , fn_get_member_grad_name(GO.SOPMAL_CD, GM.MBR_DV_CD, GM.MBR_INNB) AS GRADE
+                     , SUM(CASE WHEN GOIO.ORDR_STTUS_CD BETWEEN '35' AND '75' THEN 1 ELSE 0 END) OVER(PARTITION BY GO.ORDR_INNB)+1 AS CURT_PROCS_ODR
+                     , SUM(CASE WHEN GOIO.ORDR_STTUS_CD BETWEEN '35' AND '75' THEN 1 ELSE 0 END) OVER(PARTITION BY GO.ORDR_INNB) AS MBR_LAST_PROCS_ODR /*회원별 최종차수 상품준비 ~ 배송완료*/
+                     , MAX(GOIO.UPDT_DT) OVER(PARTITION BY GO.ORDR_INNB) AS LAST_PRCS_DT/*최종처리일*/
+                     , IFNULL(GS.LAST_PROCS_ODR,0) AS LAST_PROCS_ODR		/*최종차수*/
+                     , GOIO.ORDR_STTUS_CD
+                FROM GC_ORDER GO
+                JOIN GC_SUBSVC GS ON GS.SOPMAL_CD = GO.SOPMAL_CD AND GS.SUBSVC_INNB = GO.SUBSVC_INNB
+                JOIN GC_MEMBER GM ON GM.MBR_DV_CD = GO.MBR_DV_CD AND GM.MBR_INNB = GO.MBR_INNB
+                JOIN GC_ORDER_ITEM GOI ON GO.SOPMAL_CD =GOI.SOPMAL_CD AND GO.ORDR_INNB = GOI.ORDR_INNB
+                JOIN GC_ORDER_ITEM_OPTION GOIO ON GOI.SOPMAL_CD = GOIO.SOPMAL_CD AND GOI.ORDR_GOODS_INNB = GOIO.ORDR_GOODS_INNB AND GOIO.OPTN_TY = '01'
+                WHERE GO.USE_AT = 'Y'
+                  AND GO.SUBSVC_AT = 'Y'
+                  AND GO.SOPMAL_CD = #{sopmalCd}
+        <if test='srchSelSubsvcNm != null and srchSelSubsvcNm != ""'>
+                  AND GS.SUBSVC_NM = #{srchSelSubsvcNm}						/*구독서비스 명*/
+        </if>
+        <if test='srchSelSubsvcGnr != null and srchSelSubsvcGnr != ""'>
+                  AND GS.SUBSVC_GNR = #{srchSelSubsvcGnr}						/*기수*/
+        </if>
+        <if test='srchSubsvcNm != null and srchSubsvcNm != ""'>
+                  AND GS.SUBSVC_NM LIKE CONCAT('%',#{srchSubsvcNm},'%')			/*구독서비스 명*/
+        </if>
+        <if test='srchSubsvcGnrNm != null and srchSubsvcGnrNm != ""'>
+                  AND GS.SUBSVC_GNR_NM LIKE CONCAT('%',#{srchSubsvcGnrNm},'%')	/*기수명*/
+        </if>
+            ) MAIN
+            WHERE (@ROWNUM:=0)=0
+              AND MAIN.LINE = 1
+              AND MAIN.ORDR_STTUS_CD = '25'
+        <if test='srchCurMonExclude!= null and srchCurMonExclude == "Y"'>
+        <![CDATA[
+              AND MAIN.LAST_PRCS_DT < CONCAT(DATE_FORMAT(NOW(),'%Y-%m'),'-01')			/*당월 처리자 제외*/
+        ]]>
+        </if>
+        <choose>
+            <when test='sortDv == "subsvcGnrAsc"'>
+            ORDER BY SUBSVC_NM ASC, SUBSVC_GNR ASC      /*구독서비스명+기수*/
+            </when>
+            <when test='sortDv == "subsvcGnrDesc"'>
+            ORDER BY SUBSVC_NM DESC, SUBSVC_GNR DESC    /*구독서비스명+기수*/
+            </when>
+            <when test='sortDv == "mbrAsc"'>
+            ORDER BY MBR_NM ASC, MBR_ID ASC             /*주문자순*/
+            </when>
+            <when test='sortDv == "mbrDesc"'>
+            ORDER BY MBR_NM DESC, MBR_ID DESC           /*주문자순*/
+            </when>
+            <when test='sortDv == "ordrAsc"'>
+            ORDER BY ORDR_INNB ASC                      /*주문번호순*/
+            </when>
+            <when test='sortDv == "ordrDesc"'>
+            ORDER BY ORDR_INNB DESC                     /*주문번호순*/
+            </when>
+            <when test='sortDv == "lastPrcsDtAsc"'>
+            ORDER BY LAST_PRCS_DT ASC                   /*최종처리일순*/
+            </when>
+            <when test='sortDv == "lastPrcsDtDesc"'>
+            ORDER BY LAST_PRCS_DT ASC                   /*최종처리일순*/
+            </when>
+            <otherwise>
+            ORDER BY SUBSVC_NM ASC, SUBSVC_GNR ASC
+            </otherwise>
+        </choose>
+        ) PV
+        WHERE	1=1
+        LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+
+    </select>
+
+    <!--구독서비스 상품준비 관리 목록 배송내역 팝업 배송내역목록-->
+    <select id="selectBOSubsvcOrderDlvyList" parameterType="com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO" resultType="dataMap">
+        SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
+             , GOIO.ORDR_GOODS_OPTN_INNB
+             , GO.ORDR_INNB
+             , GM.MBR_NM
+             , GM.MBR_ID
+             , GM.MBR_DV_CD
+             , GM.MBR_INNB
+             , fn_get_member_grad_name(GO.SOPMAL_CD, GM.MBR_DV_CD, GM.MBR_INNB) AS GRADE
+             , IFNULL(GOIO.UPDT_DT, GOIO.REGIST_DT) AS PROCS_DT	/*발생일자*/
+             , GOI.GOODS_IMG_COURS
+             , GOI.GOODS_NM
+             , GOIO.OPTN_NM_1
+             , GOIO.OPTN_VAL_1
+             , GOIO.CNSMRPRIC	/*정가*/
+             , GOIO.SLEPRIC 		/*판매가*/
+             , fn_get_commcode_name('ORDR_STTUS', GOIO.ORDR_STTUS_CD) AS ORDR_STTUS
+        FROM GC_ORDER GO
+            JOIN GC_MEMBER GM ON GM.MBR_DV_CD = GO.MBR_DV_CD AND GM.MBR_INNB = GO.MBR_INNB
+            JOIN GC_ORDER_ITEM GOI ON GOI.SOPMAL_CD = GO.SOPMAL_CD AND GOI.ORDR_INNB = GO.ORDR_INNB
+            JOIN GC_ORDER_ITEM_OPTION GOIO ON GOI.SOPMAL_CD = GOIO.SOPMAL_CD AND GOI.ORDR_GOODS_INNB = GOIO.ORDR_GOODS_INNB AND GOIO.OPTN_TY = '01'
+        WHERE (@ROWNUM:=0)=0
+          AND GOI.ORDR_INNB = #{ordrInnb}
+          AND GOI.SOPMAL_CD = #{sopmalCd}
+        ORDER BY GOIO.ORDR_GOODS_OPTN_INNB ASC
+    </select>
+    <!--구독서비스 상품준비 관리 상품매칭 - 1. GC_ORDER update-->
+    <update id="updateBOSubsvcGoodsMappgOrdr" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+        <foreach collection="arrOrdrInnb" item="ordrInnb" separator=";">
+            UPDATE GC_ORDER
+            SET ORDR_STTUS_CD = (CASE WHEN ORDR_STTUS_CD = '25' THEN '35' ELSE ORDR_STTUS_CD END)
+            , UPDT_DT = NOW()
+            WHERE SOPMAL_CD = #{sopmalCd}
+            AND ORDR_INNB = #{ordrInnb}
+        </foreach>
+    </update>
+    <!--구독서비스 상품준비 관리 상품매칭 - 2. GC_ORDER_ITEM update-->
+    <update id="updateBOSubsvcGoodsMappgOrdrItem" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+        <foreach collection="arrOrdrGoodsInnb" item="ordrGoodsInnb" separator=";">
+            UPDATE GC_ORDER_ITEM GOI, (SELECT GG.GOODS_INNB, GG.GOODS_NM, GGI.IMG
+                                       FROM GC_GOODS GG
+                                       JOIN GC_GOODS_IMAGE GGI ON GGI.SOPMAL_CD = GG.SOPMAL_CD AND GGI.GOODS_INNB = GG.GOODS_INNB AND GGI.CUT_NB = 1 AND GGI.IMG_KND = '02'
+                                       WHERE GG.GOODS_INNB = #{goodsInnb}
+                                       LIMIT 1) G
+            SET GOI.GOODS_INNB = G.GOODS_INNB
+            , GOI.GOODS_NM = G.GOODS_NM
+            , GOI.GOODS_IMG_COURS = G.IMG
+            WHERE SOPMAL_CD = #{sopmalCd}
+            AND GOI.ORDR_GOODS_INNB = #{ordrGoodsInnb}
+        </foreach>
+    </update>
+    <!--구독서비스 상품준비 관리 상품매칭 - 3. GC_ORDER_ITEM_OPTION update-->
+    <update id="updateBOSubsvcGoodsMappgOrdrItemOptn" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+        <foreach collection="arrOrdrGoodsOptnInnb" item="ordrGoodsOptnInnb" separator=";">
+            UPDATE GC_ORDER_ITEM_OPTION GOIO, (SELECT GOODS_OPTN_INNB
+                                                    , OPTN_TY
+                                                    , OPTN_NM_1
+                                                    , OPTN_NM_2
+                                                    , OPTN_NM_3
+                                                    , OPTN_NM_4
+                                                    , OPTN_VAL_1
+                                                    , OPTN_VAL_2
+                                                    , OPTN_VAL_3
+                                                    , OPTN_VAL_4
+                                                    , OPTN_CD_1
+                                                    , OPTN_CD_2
+                                                    , OPTN_CD_3
+                                                    , OPTN_CD_4
+                                                    , OPTN_INFO
+                                                    , CNSMRPRIC
+                                                    , SLEPRIC
+                                                    , GG.TAX_AT
+                                                FROM GC_GOODS_OPTION GGO
+                                                JOIN GC_GOODS GG ON GG.SOPMAL_CD = GGO.SOPMAL_CD AND GG.GOODS_INNB = GGO.GOODS_INNB
+                                                WHERE GGO.GOODS_OPTN_INNB = #{goodsOptnInnb}
+                                                AND GGO.OPTN_TY = #{optnTy}
+                                                LIMIT 1) G
+            SET GOIO.GOODS_OPTN_INNB = G.GOODS_OPTN_INNB
+              , GOIO.OPTN_TY = G.OPTN_TY
+              , GOIO.OPTN_NM_1 = G.OPTN_NM_1
+              , GOIO.OPTN_NM_2 = G.OPTN_NM_2
+              , GOIO.OPTN_NM_3 = G.OPTN_NM_3
+              , GOIO.OPTN_NM_4 = G.OPTN_NM_4
+              , GOIO.OPTN_VAL_1 = G.OPTN_VAL_1
+              , GOIO.OPTN_VAL_2 = G.OPTN_VAL_2
+              , GOIO.OPTN_VAL_3 = G.OPTN_VAL_3
+              , GOIO.OPTN_VAL_4 = G.OPTN_VAL_4
+              , GOIO.OPTN_CD_1 = G.OPTN_CD_1
+              , GOIO.OPTN_CD_2 = G.OPTN_CD_2
+              , GOIO.OPTN_CD_3 = G.OPTN_CD_3
+              , GOIO.OPTN_CD_4 = G.OPTN_CD_4
+              , GOIO.OPTN_INFO = G.OPTN_INFO
+              , GOIO.CNSMRPRIC = G.CNSMRPRIC
+              , GOIO.SLEPRIC = G.SLEPRIC
+              , GOIO.TAX_AT = G.TAX_AT
+              , GOIO.STEP85 = 0
+              , GOIO.STEP35 = GOIO.ORDR_QY
+              , GOIO.STEP45 = 0
+              , GOIO.STEP55 = 0
+              , GOIO.STEP65 = 0
+              , GOIO.STEP75 = 0
+              , GOIO.ORDR_STTUS_CD = '35'
+              , GOIO.UPDT_DT = NOW()
+            WHERE GOIO.SOPMAL_CD = #{sopmalCd}
+            AND GOIO.ORDR_GOODS_OPTN_INNB = #{ordrGoodsOptnInnb}
+        </foreach>
+    </update>
+    <!--구독서비스 상품준비 관리 상품매칭 - 4. GC_ORDER_SHIPPING update-->
+    <update id="updateBOSubsvcGoodsMappgShipping" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+        <foreach collection="arrOrdrDlvyInnb" item="ordrDlvyInnb" separator=";">
+            UPDATE GC_ORDER_SHIPPING
+            SET ORDR_STTUS_CD = '35'
+              , UPDT_DT = NOW()
+            WHERE SOPMAL_CD = #{sopmalCd}
+            AND ORDR_DLVY_INNB = #{ordrDlvyInnb}
+        </foreach>
+    </update>
+    <!--구독서비스 상품준비 관리 상품매칭 - 5. GC_SUBSVC update-->
+    <update id="updateBOSubsvcGoodsMappgSubsvc" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+            UPDATE GC_SUBSVC GS, (  SELECT SOPMAL_CD, SUBSVC_INNB, MAX(LAST_PROCS_ODR) LAST_PROCS_ODR
+                                    FROM (
+                                        SELECT GOIO.SOPMAL_CD, GO.SUBSVC_INNB, SUM(CASE WHEN GOIO.ORDR_STTUS_CD BETWEEN '35' AND '75' THEN 1 ELSE 0 END) OVER(PARTITION BY GO.SOPMAL_CD, GO.ORDR_INNB) AS LAST_PROCS_ODR
+                                        FROM GC_ORDER GO
+                                        JOIN GC_ORDER_ITEM GOI ON GOI.SOPMAL_CD = GO.SOPMAL_CD AND GOI.ORDR_INNB = GO.ORDR_INNB
+                                        JOIN GC_ORDER_ITEM_OPTION GOIO ON GOIO.SOPMAL_CD = GOI.SOPMAL_CD AND GOI.ORDR_GOODS_INNB = GOIO.ORDR_GOODS_INNB
+                                        WHERE GO.SUBSVC_AT = 'Y'
+                                        AND GO.SOPMAL_CD = #{sopmalCd}
+                                        AND GO.SUBSVC_INNB IN (SELECT DISTINCT SUBSVC_INNB
+                                                               FROM GC_ORDER
+                                                               WHERE SOPMAL_CD = #{sopmalCd}
+                                                               AND ORDR_INNB IN
+        <foreach collection="arrOrdrInnb" item="ordrInnb" open="(" close=")" separator=",">
+                                                                #{ordrInnb}
+        </foreach>
+                                                               )
+                                    ) M
+                                    GROUP BY SOPMAL_CD, SUBSVC_INNB
+                                ) MAIN
+            SET GS.LAST_PROCS_ODR = MAIN.LAST_PROCS_ODR
+            , UPDT_DT = NOW()
+            WHERE GS.SOPMAL_CD = MAIN.SOPMAL_CD
+            AND GS.SUBSVC_INNB = MAIN.SUBSVC_INNB
+    </update>
+
+    <!--구독서비스 상품변경 관리 목록-->
+    <select id="selectBOSubsvcOrderMappedList" parameterType="com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO" resultType="dataMap">
+        SELECT *
+        FROM (
+            SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
+            , COUNT(*) OVER() AS TOT_CNT
+            , MAIN.*
+            FROM (
+                SELECT ROW_NUMBER() OVER(PARTITION BY GO.ORDR_INNB ORDER BY GOI.ORDR_GOODS_INNB ASC, GOIO.ORDR_GOODS_OPTN_INNB ASC) AS CURT_PROCS_ODR		/*차수*/
+                , GO.ORDR_INNB					/*주문번호*/
+                , GOI.ORDR_GOODS_INNB
+                , GOIO.ORDR_GOODS_OPTN_INNB     /*일괄처리 대상 주문상품옵션고유번호*/
+                , GOIO.ORDR_DLVY_INNB
+                , GS.SUBSVC_NM
+                , GS.SUBSVC_GNR
+                , GS.SUBSVC_GNR_NM
+                , GM.MBR_NM						/*회원명*/
+                , GM.MBR_ID 					/*회원ID*/
+                , GM.MBR_DV_CD					/*회원구분코드*/
+                , GM.MBR_INNB					/*회원고유번호*/
+                , fn_get_member_grad_name(GO.SOPMAL_CD, GM.MBR_DV_CD, GM.MBR_INNB) AS GRADE		/*회원등급*/
+                , MAX(GOIO.UPDT_DT) OVER(PARTITION BY GO.ORDR_INNB) AS LAST_PRCS_DT/*최종처리일*/
+                , GOIO.ORDR_STTUS_CD
+                , GOI.GOODS_IMG_COURS		/*상품이미지*/
+                , GOI.GOODS_NM				/*상품명*/
+                , GOIO.OPTN_NM_1			/*상품옵션명*/
+                , GOIO.OPTN_VAL_1			/*상품옵션값*/
+                , GOIO.UPDT_DT				/*처리일자*/
+                FROM GC_ORDER GO
+                JOIN GC_SUBSVC GS ON GS.SOPMAL_CD = GO.SOPMAL_CD AND GS.SUBSVC_INNB = GO.SUBSVC_INNB
+                JOIN GC_MEMBER GM ON GM.MBR_DV_CD = GO.MBR_DV_CD AND GM.MBR_INNB = GO.MBR_INNB
+                JOIN GC_ORDER_ITEM GOI ON GO.SOPMAL_CD =GOI.SOPMAL_CD AND GO.ORDR_INNB = GOI.ORDR_INNB
+                JOIN GC_ORDER_ITEM_OPTION GOIO ON GOI.SOPMAL_CD = GOIO.SOPMAL_CD AND GOI.ORDR_GOODS_INNB = GOIO.ORDR_GOODS_INNB AND GOIO.OPTN_TY = '01'
+                WHERE GO.USE_AT = 'Y'
+                AND GO.SUBSVC_AT = 'Y'
+                AND GO.SOPMAL_CD = #{sopmalCd}
+        <if test='srchSelSubsvcNm != null and srchSelSubsvcNm != ""'>
+                AND GS.SUBSVC_NM = #{srchSelSubsvcNm}						/*구독서비스 명*/
+        </if>
+        <if test='srchSelSubsvcGnr != null and srchSelSubsvcGnr != ""'>
+                AND GS.SUBSVC_GNR = #{srchSelSubsvcGnr}						/*기수*/
+        </if>
+        <if test='srchSubsvcNm != null and srchSubsvcNm != ""'>
+                AND GS.SUBSVC_NM LIKE CONCAT('%',#{srchSubsvcNm},'%')			/*구독서비스 명*/
+        </if>
+        <if test='srchSubsvcGnrNm != null and srchSubsvcGnrNm != ""'>
+                AND GS.SUBSVC_GNR_NM LIKE CONCAT('%',#{srchSubsvcGnrNm},'%')	/*기수명*/
+        </if>
+        <if test='srchOrdrInnb != null and srchOrdrInnb != ""'>
+            AND GO.ORDR_INNB = #{srchOrdrInnb}						            /*주문번호*/
+        </if>
+        <if test='srchMbrNm != null and srchMbrNm != ""'>
+            AND GM.MBR_NM LIKE CONCAT('%',#{srchMbrNm},'%')						/*주문자명*/
+        </if>
+        <if test='srchMbrId != null and srchMbrId != ""'>
+            AND GM.MBR_ID LIKE CONCAT('%',#{srchMbrId},'%')						/*주문자id*/
+        </if>
+            ) MAIN
+            WHERE (@ROWNUM:=0)=0
+              AND MAIN.ORDR_STTUS_CD = '35'
+        <if test='srchCurMonExclude!= null and srchCurMonExclude == "Y"'>
+            <![CDATA[
+              AND MAIN.LAST_PRCS_DT < CONCAT(DATE_FORMAT(NOW(),'%Y-%m'),'-01')			/*당월 처리자 제외*/
+        ]]>
+        </if>
+        <choose>
+            <when test='sortDv == "subsvcGnrAsc"'>
+            ORDER BY SUBSVC_NM ASC, SUBSVC_GNR ASC      /*구독서비스명+기수*/
+            </when>
+            <when test='sortDv == "subsvcGnrDesc"'>
+            ORDER BY SUBSVC_NM DESC, SUBSVC_GNR DESC    /*구독서비스명+기수*/
+            </when>
+            <when test='sortDv == "mbrAsc"'>
+            ORDER BY MBR_NM ASC, MBR_ID ASC             /*주문자순*/
+            </when>
+            <when test='sortDv == "mbrDesc"'>
+            ORDER BY MBR_NM DESC, MBR_ID DESC           /*주문자순*/
+            </when>
+            <when test='sortDv == "ordrAsc"'>
+            ORDER BY ORDR_INNB ASC                      /*주문번호순*/
+            </when>
+            <when test='sortDv == "ordrDesc"'>
+            ORDER BY ORDR_INNB DESC                     /*주문번호순*/
+            </when>
+            <when test='sortDv == "lastPrcsDtAsc"'>
+            ORDER BY UPDT_DT ASC                        /*처리일순*/
+            </when>
+            <when test='sortDv == "lastPrcsDtDesc"'>
+            ORDER BY UPDT_DT ASC                        /*처리일순*/
+            </when>
+            <otherwise>
+            ORDER BY SUBSVC_NM ASC, SUBSVC_GNR ASC
+            </otherwise>
+        </choose>
+        ) PV
+        WHERE	1=1
+        LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+    </select>
+
+
+    <!--구독서비스 구독자조회 목록-->
+    <select id="selectBOSubsvcOrderMbrList" parameterType="com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO" resultType="dataMap">
+        SELECT *
+        FROM (
+            SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
+            , COUNT(*) OVER() AS TOT_CNT
+            , MAIN.*
+            FROM (
+                WITH ORDR AS (SELECT COUNT(DISTINCT GO.ORDR_INNB) AS SUBSCRIBER_CNT
+                                   , MAX(GOIO.UPDT_DT) AS LAST_PRCS_DT
+                                   , GO.SOPMAL_CD
+                                   , GO.SUBSVC_INNB
+                              FROM GC_ORDER GO
+                                  JOIN GC_ORDER_ITEM GOI ON GOI.SOPMAL_CD = GO.SOPMAL_CD AND GOI.ORDR_INNB = GO.ORDR_INNB
+                                  JOIN GC_ORDER_ITEM_OPTION GOIO ON GOIO.SOPMAL_CD = GOI.SOPMAL_CD AND GOIO.ORDR_GOODS_INNB AND GOI.ORDR_GOODS_INNB
+                              WHERE GO.SUBSVC_AT = 'Y'
+                                AND GO.USE_AT = 'Y'
+                              GROUP BY GO.SOPMAL_CD, GO.SUBSVC_INNB)
+                SELECT GS.SUBSVC_INNB
+                     , GS.SUBSVC_NM				/*구독서비스명*/
+                     , GS.SUBSVC_GNR			/*구독서비스명 기수*/
+                     , GS.SUBSVC_GNR_NM			/*구독서비스명 기수명*/
+                     , GS.SUBSVC_CT + (GS.TME_DLVY_AMT * GS.DLVY_CNT) as SELPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
+                     , GS.DLVY_CNT				/*배송횟수*/
+                     , IFNULL(GS.LAST_PROCS_ODR, 0) AS LAST_PROCS_ODR		/*최종차수*/
+                     , IFNULL(ORDR.SUBSCRIBER_CNT, 0) AS SUBSCRIBER_CNT		/*구독자수*/
+                     , ORDR.LAST_PRCS_DT
+                FROM GC_SUBSVC GS
+                LEFT JOIN ORDR ON ORDR.SOPMAL_CD = GS.SOPMAL_CD AND ORDR.SUBSVC_INNB = GS.SUBSVC_INNB
+                WHERE GS.USE_AT = 'Y'
+                  AND GS.SOPMAL_CD = #{sopmalCd}
+        <if test='srchSelSubsvcNm != null and srchSelSubsvcNm != ""'>
+                  AND GS.SUBSVC_NM = #{srchSelSubsvcNm}						/*구독서비스 명*/
+        </if>
+        <if test='srchSelSubsvcGnr != null and srchSelSubsvcGnr != ""'>
+                  AND GS.SUBSVC_GNR = #{srchSelSubsvcGnr}						/*기수*/
+        </if>
+        <if test='srchSubsvcNm != null and srchSubsvcNm != ""'>
+                  AND GS.SUBSVC_NM LIKE CONCAT('%',#{srchSubsvcNm},'%')			/*구독서비스 명*/
+        </if>
+        <if test='srchSubsvcGnrNm != null and srchSubsvcGnrNm != ""'>
+                  AND GS.SUBSVC_GNR_NM LIKE CONCAT('%',#{srchSubsvcGnrNm},'%')	/*기수명*/
+        </if>
+        <if test='srchSubEndAt == "Y"'>
+            <![CDATA[
+                  AND (GS.LAST_PROCS_ODR IS NULL OR GS.LAST_PROCS_ODR < DLVY_CNT)	/*구독종료여부*/
+            ]]>
+        </if>
+        <choose>
+            <when test='sortDv == "subsvcGnrAsc"'>
+                ORDER BY SUBSVC_NM ASC, SUBSVC_GNR ASC      /*구독서비스명+기수*/
+            </when>
+            <when test='sortDv == "subsvcGnrDesc"'>
+                ORDER BY SUBSVC_NM DESC, SUBSVC_GNR DESC    /*구독서비스명+기수*/
+            </when>
+            <when test='sortDv == "subscriberAsc"'>
+                ORDER BY SUBSCRIBER_CNT ASC 				  /*구독자수 정렬*/
+            </when>
+            <when test='sortDv == "subscriberDesc"'>
+                ORDER BY SUBSCRIBER_CNT DESC				  /*구독자수 정렬*/
+            </when>
+            <otherwise>
+                ORDER BY SUBSVC_NM ASC, SUBSVC_GNR ASC
+            </otherwise>
+        </choose>
+            ) MAIN
+            WHERE (@ROWNUM:=0)=0
+        ) PV
+        WHERE	1=1
+        LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+    </select>
+
+    <!--구독서비스 구독자조회 - 구독자목록 팝업 - 구독서비스 정보-->
+    <select id="selectBOSubsvcInfo" parameterType="com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO" resultType="dataMap">
+        SELECT GS.SUBSVC_NM, GS.SUBSVC_GNR, GS.SUBSVC_GNR_NM
+        FROM GC_SUBSVC GS
+        WHERE GS.SUBSVC_INNB  = #{subsvcInnb}
+    </select>
+
+    <!--구독서비스 구독자조회 - 구독자목록 팝업 - 구독자목록 조회-->
+    <select id="selectBOSubsvcOrderMbrInfoList" parameterType="com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO" resultType="dataMap">
+        SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
+             , COUNT(*) OVER() AS TOT_CNT
+	         , MAIN.*
+        FROM (
+                SELECT GO.ORDR_INNB
+                      , GM.MBR_NM
+                      , GM.MBR_ID
+                      , GM.MBR_DV_CD
+                      , fn_get_member_grad_name(GO.SOPMAL_CD, GM.MBR_DV_CD, GM.MBR_INNB) AS GRADE
+                      , SUM(CASE WHEN GOIO.ORDR_STTUS_CD BETWEEN '35' AND '75' THEN 1 ELSE 0 END) AS LAST_PROCS_ODR/*최종차수 상품준비 ~ 배송완료*/
+                      , MAX(GOIO.UPDT_DT) AS LAST_PRCS_DT/*최종처리일*/
+                FROM GC_ORDER GO
+	                JOIN GC_MEMBER GM ON GM.MBR_DV_CD = GO.MBR_DV_CD AND GM.MBR_INNB = GO.MBR_INNB
+                    JOIN GC_ORDER_ITEM GOI ON GO.SOPMAL_CD =GOI.SOPMAL_CD AND GO.ORDR_INNB = GOI.ORDR_INNB
+                    JOIN GC_ORDER_ITEM_OPTION GOIO ON GOI.SOPMAL_CD = GOIO.SOPMAL_CD AND GOI.ORDR_GOODS_INNB = GOIO.ORDR_GOODS_INNB AND GOIO.OPTN_TY = '01'
+                WHERE GO.USE_AT = 'Y'
+                  AND GO.SUBSVC_AT = 'Y'
+                  AND GO.SUBSVC_INNB  = #{subsvcInnb}		/*구독서비스 고유번호*/
+                GROUP BY GO.SOPMAL_CD, GO.ORDR_INNB, GM.MBR_DV_CD, GM.MBR_NM, GM.MBR_ID
+                ORDER BY GO.ORDR_INNB ASC
+             )MAIN
+        WHERE (@ROWNUM:=0)=0
+    </select>
+
+    <!--구독서비스 구독자조회 - 배송상품 목록팝업 - 배송상품목록 조회-->
+    <select id="selectBOSubsvcOrderGoodsInfoList" parameterType="com.wb.domainserver.domain.gcone.ordr.subsvc.vo.BOSubsvcOrderVO" resultType="dataMap">
+        SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
+             , COUNT(*) OVER() AS TOT_CNT
+             , MAIN.*
+        FROM (
+                SELECT GOIO.GOODS_OPTN_INNB
+                     , GOI.GOODS_IMG_COURS
+                     , GOI.GOODS_NM
+                     , GOIO.OPTN_NM_1
+                     , GOIO.OPTN_VAL_1
+                     , COUNT(DISTINCT GO.ORDR_INNB) AS APPLY_CNT/*적용횟수*/
+                FROM GC_ORDER GO
+	                JOIN GC_ORDER_ITEM GOI ON GO.SOPMAL_CD =GOI.SOPMAL_CD AND GO.ORDR_INNB = GOI.ORDR_INNB
+                    JOIN GC_ORDER_ITEM_OPTION GOIO ON GOI.SOPMAL_CD = GOIO.SOPMAL_CD AND GOI.ORDR_GOODS_INNB = GOIO.ORDR_GOODS_INNB AND GOIO.OPTN_TY = '01'
+                WHERE GO.USE_AT = 'Y'
+                  AND GO.SUBSVC_AT = 'Y'
+                  AND GOIO.ORDR_STTUS_CD BETWEEN '35' AND '75'			/*상품준비 ~ 배송완료*/
+                  AND GO.SUBSVC_INNB = #{subsvcInnb}            		/*구독서비스 고유번호*/
+                GROUP BY GOIO.GOODS_OPTN_INNB, GOODS_IMG_COURS, GOI.GOODS_NM, GOIO.OPTN_NM_1, GOIO.OPTN_VAL_1
+                ORDER BY GOI.GOODS_NM, GOIO.OPTN_NM_1, GOIO.OPTN_VAL_1
+             ) MAIN
+        WHERE (@ROWNUM:=0)=0
+    </select>
+</mapper>
+
+

src/main/resources/mybatis/xml/mapper/gcone/promtn/coupon/BOCouponMapper.xml

@@ -1293,7 +1293,7 @@
 			parameterType = "com.wb.domainserver.domain.gcone.promtn.coupon.vo.BOCouponPkSndngVO"
 			resultType = "dataMap">
 		<![CDATA[
-		SET @ROWNUM = 0;
+ 		/*SET @ROWNUM = 0;*/
 		SELECT 	*
 				  FROM	(
 						SELECT	CAST(@ROWNUM:=@ROWNUM+1 AS UNSIGNED)  AS RNUM

src/main/resources/mybatis/xml/mapper/gcone/setup/dlvygrp/BODlvygrpMapper.xml

@@ -129,6 +129,19 @@
 			  		,RETURN_DLVY_APPLC_AT
 			  		,RETURN_DLVY_AMT
 			  		,EXCHNG_DLVY_AMT
+			  		,RTNLC_INNB2
+			  		,DFT_DLVY_AMT2
+			  		,AMT_CND_USE_AT2
+			  		,AMT_CND_ADIT_AMT2
+			  		,CNT_CND_USE_AT2
+			  		,CNT_CND_ADIT_AMT2
+			  		,DLVY_AREA_ADIT_AT2
+			  		,AREA_ADIT_DLVY_AMT2
+			  		,BUNDLE_DLVY_USE_AT2
+			  		,BUNDLE_DLVY_CND_AMT2
+			  		,RETURN_DLVY_APPLC_AT2
+			  		,RETURN_DLVY_AMT2
+			  		,EXCHNG_DLVY_AMT2
 			  		,USE_AT
 			  		,REGUSR
 			  		,REGIST_DT
@@ -154,6 +167,19 @@
 			  		,#{returnDlvyApplcAt}
 			  		,#{returnDlvyAmt}
 			  		,#{exchngDlvyAmt}
+			  		,#{rtnlcInnb2}
+					,#{dftDlvyAmt2}
+					,#{amtCndUseAt2}
+					,#{amtCndAditAmt2}
+					,#{cntCndUseAt2}
+					,#{cntCndAditAmt2}
+					,#{dlvyAreaAditAt2}
+					,#{areaAditDlvyAmt2}
+					,#{bundleDlvyUseAt2}
+					,#{bundleDlvyCndAmt2}
+			  		,#{returnDlvyApplcAt2}
+			  		,#{returnDlvyAmt2}
+			  		,#{exchngDlvyAmt2}
 					,'Y'
 					,#{regusr}
 					,now()
@@ -200,12 +226,50 @@
 					)
 	</insert>
 
+	<!-- 배송 반송지 등록 -->
+	<insert id="insertBODlvyGroupAddress2" parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
+		<selectKey 	keyProperty="rtnlcInnb2"
+					  resultType="java.lang.Integer"
+					  order="BEFORE">
+			SELECT IFNULL(MAX(RTNLC_INNB),0) + 1 FROM GC_SHIPPING_ADDRESS WHERE SOPMAL_CD = #{sopmalCd}
+		</selectKey>
+		INSERT INTO	GC_SHIPPING_ADDRESS
+		(
+		RTNLC_INNB
+		, SOPMAL_CD
+		, RTNLC_ZIP
+		, RTNLC_ADRES
+		, RTNLC_DTL_ADRES
+		, RTNLC_TELNB
+		, USE_AT
+		, REGUSR
+		, REGIST_DT
+		, UPDUSR
+		, UPDT_DT
+		)
+		VALUES
+		(
+		#{rtnlcInnb2}
+		, #{sopmalCd}
+		, #{rtnlcZip2}
+		, #{rtnlcAdres2}
+		, #{rtnlcDtlAdres2}
+		, #{rtnlcTelnb2}
+		, 'Y'
+		, #{regusr}
+		, now()
+		, #{regusr}
+		, now()
+		)
+	</insert>
+
 	<!-- 배송그룹 정보 조회 -->
 	<select id="selectBODlvyGroupDtlForm"
 			parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO"
 			resultType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
 			SELECT
 					SG.DLVY_GROUP_INNB
+			     	,SG.SOPMAL_CD
 			  		,SG.DLVY_GROUP_DV_CD
 			  		,SG.DLVY_GROUP_NM
 			  		,SG.DFT_DLVY_AMT
@@ -220,19 +284,41 @@
 			     	,SG.RETURN_DLVY_APPLC_AT
 			     	,SG.RETURN_DLVY_AMT
 			     	,SG.EXCHNG_DLVY_AMT
+					,SG.DFT_DLVY_AMT2
+					,SG.AMT_CND_USE_AT2
+					,SG.AMT_CND_ADIT_AMT2
+					,SG.CNT_CND_USE_AT2
+					,SG.CNT_CND_ADIT_AMT2
+					,SG.DLVY_AREA_ADIT_AT2
+					,SG.AREA_ADIT_DLVY_AMT2
+					,SG.BUNDLE_DLVY_USE_AT2
+					,SG.BUNDLE_DLVY_CND_AMT2
+					,SG.RETURN_DLVY_APPLC_AT2
+					,SG.RETURN_DLVY_AMT2
+					,SG.EXCHNG_DLVY_AMT2
 					,SG.RTNLC_INNB
-					,SA.RTNLC_ZIP
+			     	,SG.RTNLC_INNB2
-					,SA.RTNLC_ADRES
+					,SA1.RTNLC_ZIP
-					,SA.RTNLC_DTL_ADRES
+					,SA1.RTNLC_ADRES
-					,SA.RTNLC_TELNB
+					,SA1.RTNLC_DTL_ADRES
+					,SA1.RTNLC_TELNB
+					,SA2.RTNLC_ZIP AS RTNLC_ZIP2
+					,SA2.RTNLC_ADRES AS RTNLC_ADRES2
+					,SA2.RTNLC_DTL_ADRES AS RTNLC_DTL_ADRES2
+					,SA2.RTNLC_TELNB AS RTNLC_TELNB2
 					,SG.RETURN_DLVY_AMT
 					,SG.EXCHNG_DLVY_AMT
 			FROM GC_SHIPPING_GROUPING SG
-			LEFT JOIN GC_SHIPPING_ADDRESS SA
+			LEFT JOIN GC_SHIPPING_ADDRESS SA1
-			ON SG.RTNLC_INNB = SA.RTNLC_INNB
+					  ON SG.RTNLC_INNB = SA1.RTNLC_INNB
-			AND SG.SOPMAL_CD = SA.SOPMAL_CD
+						  AND SG.SOPMAL_CD = SA1.SOPMAL_CD
- 			AND SG.USE_AT = 'Y'
+						  AND SG.USE_AT = 'Y'
- 			AND SA.USE_AT = 'Y'
+						  AND SA1.USE_AT = 'Y'
+			LEFT JOIN GC_SHIPPING_ADDRESS SA2
+					  ON SG.RTNLC_INNB2 = SA2.RTNLC_INNB
+						  AND SG.SOPMAL_CD = SA2.SOPMAL_CD
+						  AND SG.USE_AT = 'Y'
+						  AND SA2.USE_AT = 'Y'
 			WHERE 1=1
 			 AND SG.SOPMAL_CD = #{sopmalCd}
 			 AND DLVY_GROUP_INNB = #{dlvyGroupInnb}
@@ -257,6 +343,18 @@
 			     	,RETURN_DLVY_APPLC_AT = #{returnDlvyApplcAt}
 			     	,RETURN_DLVY_AMT = #{returnDlvyAmt}
 			     	,EXCHNG_DLVY_AMT = #{exchngDlvyAmt}
+			     	,DFT_DLVY_AMT2 = #{dftDlvyAmt2}
+			   		,AMT_CND_USE_AT2 = #{amtCndUseAt2}
+			   		,AMT_CND_ADIT_AMT2 = #{amtCndAditAmt2}
+			   		,CNT_CND_USE_AT2 = #{cntCndUseAt2}
+			   		,CNT_CND_ADIT_AMT2 = #{cntCndAditAmt2}
+			   		,DLVY_AREA_ADIT_AT2 = #{dlvyAreaAditAt2}
+			   		,AREA_ADIT_DLVY_AMT2 = #{areaAditDlvyAmt2}
+			   		,BUNDLE_DLVY_USE_AT2 = #{bundleDlvyUseAt2}
+			   		,BUNDLE_DLVY_CND_AMT2 = #{bundleDlvyCndAmt2}
+			     	,RETURN_DLVY_APPLC_AT2 = #{returnDlvyApplcAt2}
+			     	,RETURN_DLVY_AMT2 = #{returnDlvyAmt2}
+			     	,EXCHNG_DLVY_AMT2 = #{exchngDlvyAmt2}
 			   		,UPDUSR = #{updusr}
 			   		,UPDT_DT = NOW()
 		]]>
@@ -278,11 +376,27 @@
 			AND		SOPMAL_CD = #{sopmalCd}
 	</update>
 
+	<!-- 배송그룹 수정 -->
+	<update id="updateBODlvyGroupRtnlc2"
+			parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
+		UPDATE	GC_SHIPPING_ADDRESS
+		SET	RTNLC_ZIP = #{rtnlcZip2}
+		  , RTNLC_ADRES = #{rtnlcAdres2}
+		  , RTNLC_DTL_ADRES = #{rtnlcDtlAdres2}
+		  , RTNLC_TELNB = #{rtnlcTelnb2}
+		  , UPDUSR = #{updusr}
+		  , UPDT_DT = NOW()
+		WHERE	1=1
+		  AND RTNLC_INNB = #{rtnlcInnb2}
+		  AND SOPMAL_CD = #{sopmalCd}
+	</update>
+
 	<!-- 배송그룹 삭제(사용여부 Update y > n) -->
 	<update id="deleteBODlvyGroup" parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
 		<![CDATA[
 			UPDATE	GC_SHIPPING_GROUPING
 			   SET	USE_AT = 'N'
+				  , UPDT_DT = NOW()
 		]]>
 		<include refid="selectDlvyKeyWhere"/>
 	</update>
@@ -291,10 +405,20 @@
 	<update id="deleteBODlvyGroupRtnlc" parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
 			UPDATE	GC_SHIPPING_ADDRESS
 			   SET	USE_AT = 'N'
+				 , UPDT_DT = NOW()
 			WHERE	RTNLC_INNB = #{rtnlcInnb}
 			AND		SOPMAL_CD = #{sopmalCd}
 	</update>
 
+	<!-- 배송그룹 삭제(사용여부 Update y > n) -->
+	<update id="deleteBODlvyGroupRtnlc2" parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO">
+		UPDATE	GC_SHIPPING_ADDRESS
+		SET	USE_AT = 'N'
+		  , UPDT_DT = NOW()
+		WHERE	RTNLC_INNB = #{rtnlcInnb2}
+		  AND		SOPMAL_CD = #{sopmalCd}
+	</update>
+
 	<!-- 배송그룹 고유키로 연결 상품의 갯수 검색 -->
 	<select id="isIncludeGoods"
 			parameterType="com.wb.domainserver.domain.gcone.setup.dlvygrp.vo.BODlvygrpVO"

src/main/resources/secured-config.yml

@@ -25,6 +25,14 @@ secured:
         - /**/fonts/**
         - /favicon.ico
         - /**/vender/**
+    batch:
+      accessip:
+        - 127.0.0.1
+        - 10.2.1.76
+        - 115.68.232.36
+      uri:
+        - /gcone/mbr/mbr/selectBOJoinGuidanceForm   # 셈플로 넣음 사용하는 uri 설정해야함
+
 
 
 #secured:

src/main/resources/static/ckeditor/uploadAdapter.js

@@ -1,6 +1,7 @@
 class UploadAdapter {
-    constructor(loader) {
+    constructor(loader, url) {
         this.loader = loader;
+        this.url = url;
     }
 
     upload() {
@@ -13,7 +14,7 @@ class UploadAdapter {
 
     _initRequest() {
         const xhr = this.xhr = new XMLHttpRequest();
-        xhr.open('POST', '/comm/ckeditor/image/fileUpload', true);
+        xhr.open('POST', this.url, true);
         xhr.responseType = 'json';
     }
 
@@ -43,5 +44,5 @@ class UploadAdapter {
     }
 }
 function getDownloadUrl(item) {
-  return encodeURI(`${API_ROOT_URL}/download/images/${item.linkId}`);
+    return encodeURI(`${API_ROOT_URL}/download/images/${item.linkId}`);
 }