쇼핑몰 사이트맵 xml 자동 생성

This reverts commit 7b24a5395f.

Jenkinsfile

@@ -8,7 +8,7 @@ pipeline {
     environment {
         SERVER_IP = "${DEPLOY_WAS_SERVER_IP}"
         SERVER_USER = "tomcat"
-        TOMCAT_HOME = "${ENVIRONMENT == 'dev' ? '/var/lib/tomcat' : '/usr/local/tomcat'}"
+        TOMCAT_HOME = "${ENVIRONMENT == 'dev' ? '/usr/local/tomcat' : '/usr/local/tomcat'}"
         APP_NAME = "sakemall"
         ROOT_NAME = "ROOT"
         DEPLOY_PATH = "${TOMCAT_HOME}/webapps"
@@ -21,7 +21,7 @@ pipeline {
         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'}"
+        NGINX_USER = "${ENVIRONMENT == 'dev' ? 'ubuntu' : 'ubuntu'}"
 //         SSH_KEY_PATH = "C:/Users/CHAMDAHAN-41/.ssh/id_rsa"
     }
 
@@ -41,8 +41,8 @@ pipeline {
 							properties([
 		                        parameters([
                                     choice(name: 'ENVIRONMENT', choices: ['dev'], description: '배포할 어플리케이션 profile 선택'),
-                                    choice(name: 'DEPLOY_WAS_SERVER_IP', choices: ['00.00.00.00'], description: 'WAR 배포할 서버IP 선택'),
-                                    choice(name: 'DEPLOY_WEB_SERVER_IP', choices: ['00.00.00.00'], description: 'STATIC RESOURCE 배포할 서버IP 선택'),
+                                    choice(name: 'DEPLOY_WAS_SERVER_IP', choices: ['10.2.0.129'], description: 'WAR 배포할 서버IP 선택'),
+                                    choice(name: 'DEPLOY_WEB_SERVER_IP', choices: ['10.2.1.226'], description: 'STATIC RESOURCE 배포할 서버IP 선택'),
 //                                     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: '배포 대상 선택')
@@ -84,6 +84,26 @@ pipeline {
             }
         }
 
+        stage('Web Server block activate') {
+            when {
+                expression { params.DEPLOY_TARGET in ['ALL', 'WAS_ONLY'] }
+            }
+            steps {
+                script {
+                    // Nginx 서버에 점검 페이지로 블록 설정
+                    sshCommand remote: [
+                        name: 'Nginx Server',
+                        host: "${env.NGINX_SERVER_IP}",
+                        user: "${env.NGINX_USER}",
+                        identityFile: "${env.SSH_KEY_PATH}",
+                        allowAnyHosts: true
+                    ], command: "/etc/nginx/weboff.sh"
+
+                    echo "점검 web서버 config 구동"
+                }
+            }
+        }
+
         stage('Prepare and Deploy Static Resources') {
             when {
                 expression { params.DEPLOY_TARGET in ['ALL', 'WEB_ONLY'] }
@@ -254,6 +274,20 @@ pipeline {
                         ${env.TOMCAT_HOME}/bin/startup.sh
                     """
 
+                    // Nginx 서버에 정상 페이지로 블록 해제
+                    sshCommand remote: [
+                        name: 'Nginx Server',
+                        host: "${env.NGINX_SERVER_IP}",
+                        user: "${env.NGINX_USER}",
+                        identityFile: "${env.SSH_KEY_PATH}",
+                        allowAnyHosts: true
+                    ], command: """
+                        sleep 30
+                        /etc/nginx/webon.sh
+                    """
+
+                    echo "점검 web서버 config 구동"
+
                     echo "Deploy 완료 (${params.ENVIRONMENT} 환경, ${env.GIT_BRANCH} 브랜치)"
                 }
             }

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

@@ -286,6 +286,7 @@ public class BOMaMtngController {
 				return ApiResponse.of(content).ifPresentOrElse(HttpStatus.OK, HttpStatus.NOT_FOUND);
 			}
 		} else {
+			// 여러곳배송처럼 처리하더라도 주소는 하나이므로 shipping 체크
 			if (CollectionUtils.isEmpty(shipping)) {
 				log.info("배송지 정보를 찾을 수 없습니다.");
 				content.put("result","Y");

src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/mapper/BOMaMtngMapper.java

@@ -52,6 +52,9 @@ public interface BOMaMtngMapper {
 	/** 주문 전 쿠폰정보 재확인*/
     public List<String> selectBOPreOrderValidationCouponList(BOPreOrderValidVO goods);
 
+	/** 구독서비스 주문 전 주문정보 재확인*/
+	public List<DataMap> selectBOSubsvcPreOrderValidation(BOPreOrderValidVO goods);
+
 	/*쇼핑몰 구매요청 재검증 확인 여부*/
 	public String selectPurchsValidUseAt(String sopmalCd);
 }

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

@@ -306,8 +306,12 @@ public class BOMaMtngService {
 		}
 
 		for(BOPreOrderValidVO goods : goodsList) {
-
-			List<DataMap> resultValid = mapper.selectBOPreOrderValidation(goods);
+			List<DataMap> resultValid = new ArrayList<>();
+			if(goods.getSubsvcInnb() != "") {
+				resultValid = mapper.selectBOSubsvcPreOrderValidation(goods);
+			} else {
+				resultValid = mapper.selectBOPreOrderValidation(goods);
+			}
 
 			//구매정보 변경대상 필터링
 			// 값이 1인 항목 == 변경항목
@@ -406,6 +410,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<>();
@@ -417,8 +423,15 @@ public class BOMaMtngService {
 		//상품별 총 구매갯수 합계
 		Map<String, Integer> qySums = goodsList.stream()
 				.collect(Collectors.groupingBy(
-						// goodsInnb기준 키로 묶음
-						goods -> goods.get("goodsInnb").toString(),
+						goods -> {
+							// goodsInnb기준 키로 묶음
+							Object key = goods.get("goodsInnb");
+							if(key == null) {
+								// subsvcInnb기준 키로 묶음
+								key = goods.get("subsvcInnb");
+							}
+							return key.toString();
+						},
 						// qy 값을 합산
 						Collectors.summingInt(goods -> Integer.parseInt(goods.getOrDefault("qy", "0").toString()))
 				));
@@ -464,12 +477,14 @@ public class BOMaMtngService {
 		goodsList.forEach(goods -> {
 
 			String goodsInnb = StringUtil.isNullToString(goods.get("goodsInnb"));
-
+			String subsvcInnb = StringUtil.isNullToString(goods.get("subsvcInnb"));
 
 			//상품별 수량합계
 			int goodsTotalQy = 0;
 			if(qySums.containsKey(goodsInnb)){
 				goodsTotalQy = qySums.getOrDefault(goodsInnb, 0);
+			} else if (qySums.containsKey(subsvcInnb)) {
+				goodsTotalQy = qySums.getOrDefault(subsvcInnb, 0);
 			}
 
 
@@ -505,6 +520,7 @@ public class BOMaMtngService {
 						.sopmalCd(StringUtil.isNullToString(goods.get("sopmalCd")))
 						.goodsInnb(StringUtil.isNullToString(goods.get("goodsInnb")))
 						.goodsOptnInnb(StringUtil.isNullToString(goods.get("goodsOptnInnb")))
+						.subsvcInnb(StringUtil.isNullToString(goods.get("subsvcInnb")))
 						.mbrInnb(StringUtil.isNullToString(goods.get("mbrInnb")))
 						.mbrDvCd(StringUtil.isNullToString(goods.get("mbrDvCd")))
 						.qy(StringUtil.isNullToString(goods.get("qy")))

src/main/java/com/wb/domainserver/domain/admin/instcSle/mtng/vo/BOPreOrderValidVO.java

@@ -24,6 +24,9 @@ public class BOPreOrderValidVO {
     /*상품옵션고유번호*/
     private String goodsOptnInnb;
 
+    /*구독서비스고유번호*/
+    private String subsvcInnb;
+
     /*회원고유번호*/
     private String mbrInnb;
 

src/main/java/com/wb/domainserver/domain/admin/ntcn/email/vo/BOMaEmailSrchVO.java

@@ -28,4 +28,12 @@ public class BOMaEmailSrchVO extends AbstractVO {
 
 	/*secretkey*/
 	private String secretKey;
+
+	/** 셋팅용 파라미터 tab구분
+	 * send : 이메일 수동발송
+	 * search : 이메일 발송내역*/
+	private String reqTab;
+
+	/** 셋팅용 파라미터 받는사람 이메일주소*/
+	private String email;
 }

src/main/java/com/wb/domainserver/domain/admin/store/sopmal/mapper/BOMaSopmalMapper.java

@@ -3,13 +3,13 @@ package com.wb.domainserver.domain.admin.store.sopmal.mapper;
 import java.util.List;
 
 import com.wb.domainserver.domain.admin.store.sopmal.vo.Shop;
+import com.wb.domainserver.domain.gcone.goods.goods.vo.BOGoodsVO;
 import com.wb.domainserver.domain.gcone.promtn.coupon.vo.BOCouponVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
 import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
 import com.wb.domainserver.domain.admin.store.sopmal.vo.BOShopSetupVO;
-import com.wb.domainserver.domain.admin.sys.menu.vo.BOMaMenuVO;
 import com.wb.domainserver.util.dataaccess.DataMap;
 
 /**
@@ -81,6 +81,10 @@ public interface BOMaSopmalMapper {
 
 	public int updateBOSopmalUpdt(BOMaSopmalVO vo);
 
+	public int updateBOExchngrtSetup(BOMaSopmalVO vo);
+
+	public int updateBOGuidanceSetup(BOMaSopmalVO vo);
+
 	public int deteteBOShopFamilySite(BOMaSopmalVO vo);
 
 	public int deteteBOShopClause(BOMaSopmalVO vo);
@@ -199,4 +203,7 @@ public interface BOMaSopmalMapper {
 
 	/*전체 쇼핑몰 목록*/
 	List<DataMap> selectSopmalList();
+
+	// XML 수정 임시
+	public List<DataMap> selectSitemapXml(String sopmalCd);
 }

src/main/java/com/wb/domainserver/domain/admin/store/sopmal/service/BOMaSopmalService.java

@@ -19,6 +19,7 @@ import com.wb.domainserver.domain.admin.sys.menu.vo.BOMaMenuVO;
 import com.wb.domainserver.domain.gcone.goods.goodsinfo.mapper.BOGoodsinfoMapper;
 import com.wb.domainserver.domain.gcone.goods.goodsinfo.vo.BOGoodsInfoVO;
 import lombok.Data;
+import org.apache.commons.text.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -437,39 +438,12 @@ public class BOMaSopmalService {
 				log.debug("masopmal {}", vo);
 				// update payLink
 				mapper.updateBOShopPayLink(vo);
-				// PC 결제 정보
-				String pcSetleType = vo.getPcSetleTypeList();
-				String[] pcSetleTypeArr = null;
-				DataMap pcSetleInfoDm = new DataMap();
-				if (!StringUtil.isEmpty(pcSetleType)) {
-					pcSetleTypeArr = StringUtil.split(pcSetleType, "$");
-					pcSetleInfoDm = ynSetParam(pcSetleTypeArr);
-					pcSetleInfoDm.put("updusr", vo.getUpdusr());
-					pcSetleInfoDm.put("setleInfoInnb", vo.getPcSetleInfoInnb());
-					mapper.updateBOShopPayInfo(pcSetleInfoDm);
-				} else {
-					pcSetleInfoDm = ynSetParam(pcSetleTypeArr);
-					pcSetleInfoDm.put("updusr", vo.getUpdusr());
-					pcSetleInfoDm.put("setleInfoInnb", vo.getPcSetleInfoInnb());
-					mapper.updateBOShopPayInfo(pcSetleInfoDm);
-				}
 
-				// MOBILE 결제 정보
-				String mobileSetleType = vo.getMobileSetleTypeList();
-				String[] mobileSetleTypeArr = null;
-				DataMap mobileSetleInfoDm = new DataMap();
-				if (!StringUtil.isEmpty(mobileSetleType)) {
-					mobileSetleTypeArr = StringUtil.split(mobileSetleType, "$");
-					mobileSetleInfoDm = ynSetParam(mobileSetleTypeArr);
-					mobileSetleInfoDm.put("updusr", vo.getUpdusr());
-					mobileSetleInfoDm.put("setleInfoInnb", vo.getMobileSetleInfoInnb());
-					mapper.updateBOShopPayInfo(mobileSetleInfoDm);
-				} else {
-					mobileSetleInfoDm = ynSetParam(mobileSetleTypeArr);
-					mobileSetleInfoDm.put("updusr", vo.getUpdusr());
-					mobileSetleInfoDm.put("setleInfoInnb", vo.getMobileSetleInfoInnb());
-					mapper.updateBOShopPayInfo(mobileSetleInfoDm);
-				}
+				// 결제 정보 업데이트
+				updateSetleInfo(vo.getPcSetleTypeList(), vo.getPcSetleInfoInnb(), vo.getUpdusr());			// PC
+				updateSetleInfo(vo.getMobileSetleTypeList(), vo.getMobileSetleInfoInnb(), vo.getUpdusr());	// MOBILE
+				updateSetleInfo(vo.getPcSubsvcSetleTypeList(), vo.getPcSubsvcSetleInfoInnb(), vo.getUpdusr());			// 구독서비스 PC
+				updateSetleInfo(vo.getMobileSubsvcSetleTypeList(), vo.getMobileSubsvcSetleInfoInnb(), vo.getUpdusr());	// 구독서비스 MOBILE
 
 				if (!ObjectUtils.isEmpty(vo.getFamilySiteNmArr())) {
 					String[] siteNm = vo.getFamilySiteNmArr();
@@ -523,6 +497,26 @@ public class BOMaSopmalService {
 		return message;
 	}
 
+	/**
+	 * 결제정보 업데이트
+	 * @param setleType 	결제정보 List
+	 * @param setleInfoInnb	결제정보 고유번호
+	 * @param updusr		수정자 고유번호
+	 */
+	private void updateSetleInfo(String setleType, String setleInfoInnb, int updusr) {
+		String[] setleTypeArr = null;
+
+		if (!StringUtil.isEmpty(setleType)) {
+			setleTypeArr = StringUtil.split(setleType, "$");
+		}
+
+		DataMap dm = ynSetParam(setleTypeArr);
+		dm.put("updusr", updusr);
+		dm.put("setleInfoInnb", setleInfoInnb);
+
+		mapper.updateBOShopPayInfo(dm);
+	}
+
 	private void setBOMaSopmalVO(BOMaSopmalVO vo) {
 
 		if(!StringUtil.isEmpty(vo.getSmsAtmcSndngLmttBgntme()))
@@ -991,4 +985,43 @@ public class BOMaSopmalService {
 		return mapper.selectSopmalList();
 	}
 
+	/**
+	 * 사이트맵 XML
+	 * @param sopmalCd
+	 * @return
+	 */
+	@Transactional
+	public String selectSitemapXml(String sopmalCd) {
+		List<DataMap> resultList = new ArrayList<>();
+		StringBuilder xml = new StringBuilder();
+
+		try {
+			xml.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+			xml.append("<?xml-stylesheet type=\"text/css\" href=\"https://www.xml-sitemaps.com/css/sitemap.css\"?>");
+			xml.append("<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\">\n");
+
+			resultList = mapper.selectSitemapXml(sopmalCd);
+			for (DataMap data : resultList) {
+				xml.append("  <url>");
+				xml.append("       <loc>")
+						.append(StringEscapeUtils.escapeXml11(String.valueOf(data.get("targetUrl"))))
+						.append("</loc>");
+				xml.append("       <lastmod>")
+						.append(StringEscapeUtils.escapeXml11(String.valueOf(data.get("lastModified"))))
+						.append("</lastmod>");
+				xml.append("       <priority>")
+						.append(StringEscapeUtils.escapeXml11(String.valueOf(data.get("priority"))))
+						.append("</priority>");
+				xml.append("  </url>");
+			}
+
+			xml.append("</urlset>");
+		} catch (WnbtRestException wre){
+			throw new WnbtRestException(wre.getMessage());
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+
+		return xml.toString();
+	}
 }

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

@@ -483,12 +483,24 @@ public class BOMaSopmalVO extends AbstractVO {
 	/** mobile 결제정보 List */
 	private String mobileSetleTypeList;
 
+	/** 구독서비스 pc 결제정보 List */
+	private String pcSubsvcSetleTypeList;
+
+	/** 구독서비스 mobile 결제정보 List */
+	private String mobileSubsvcSetleTypeList;
+
 	/** pc 결제정보 Innb */
 	private String pcSetleInfoInnb;
 
 	/** mobile 결제정보 Innb */
 	private String mobileSetleInfoInnb;
 
+	/** 구독서비스 pc 결제정보 Innb */
+	private String pcSubsvcSetleInfoInnb;
+
+	/** 구독서비스 mobile 결제정보 Innb */
+	private String mobileSubsvcSetleInfoInnb;
+
 	/** 회원가입 안내 타이틀 */
 	private String joinGuidanceSj;
 

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

@@ -393,6 +393,7 @@ public class BOBbsService {
 				if (vo.getBbscttRedngAuthorDvCd() != null && "01".equals(vo.getBbscttRedngAuthorDvCd())) {
 					vo.setBbscttRedngAuthorDvCd("[all]");
 				} else if (vo.getBbscttRedngAuthorDvCd() != null && "02".equals(vo.getBbscttRedngAuthorDvCd())) {
+					validateMemberGradeSelection(vo.getBbscttRedngAuthorDvCd_c(), "게시판 읽기");
 
 					StringBuilder sb = new StringBuilder();
 					for (String mbrInnb : vo.getBbscttRedngAuthorDvCd_c()) {
@@ -431,6 +432,8 @@ public class BOBbsService {
 				if (vo.getBbscttRegistAuthorDvCd() != null && "01".equals(vo.getBbscttRegistAuthorDvCd())) {
 					vo.setBbscttRegistAuthorDvCd("[all]");
 				} else if (vo.getBbscttRegistAuthorDvCd() != null && "02".equals(vo.getBbscttRegistAuthorDvCd())) {
+					validateMemberGradeSelection(vo.getBbscttRegistAuthorDvCd_c(), "게시판 쓰기");
+
 					StringBuilder sb = new StringBuilder();
 					for (String mbrInnb : vo.getBbscttRegistAuthorDvCd_c()) {
 
@@ -465,6 +468,8 @@ public class BOBbsService {
 				if (vo.getAnswRegistAuthorDvCd() != null && "01".equals(vo.getAnswRegistAuthorDvCd())) {
 					vo.setAnswRegistAuthorDvCd("[all]");
 				} else if (vo.getAnswRegistAuthorDvCd() != null && "02".equals(vo.getAnswRegistAuthorDvCd())) {
+					validateMemberGradeSelection(vo.getAnswRegistAuthorDvCd_c(), "답글 쓰기");
+
 					StringBuilder sb = new StringBuilder();
 					for (String mbrInnb : vo.getAnswRegistAuthorDvCd_c()) {
 
@@ -499,6 +504,8 @@ public class BOBbsService {
 				if (vo.getCmRegistAuthorDvCd() != null && "01".equals(vo.getCmRegistAuthorDvCd())) {
 					vo.setCmRegistAuthorDvCd("[all]");
 				} else if (vo.getCmRegistAuthorDvCd() != null && "02".equals(vo.getCmRegistAuthorDvCd())) {
+					validateMemberGradeSelection(vo.getCmRegistAuthorDvCd_c(), "댓글 쓰기");
+
 					StringBuilder sb = new StringBuilder();
 					for (String mbrInnb : vo.getCmRegistAuthorDvCd_c()) {
 
@@ -685,15 +692,21 @@ public class BOBbsService {
 			msgMap.put("bbsid", bbsId);
 
 		} catch (WnbtRestException wre){
-			throw new WnbtRestException(wre.getMessage());
+			throw wre;
 		}  catch (Exception e) {
-
 			log.error(e.getMessage(), e);
+			throw new WnbtRestException("게시판 등록 중 오류가 발생했습니다.", e);
 		}
 
 		return msgMap;
 	}
 
+	private void validateMemberGradeSelection(String[] memberGradeArr, String authorizationName) {
+		if (memberGradeArr == null || memberGradeArr.length == 0) {
+			throw new WnbtRestException(authorizationName + " 권한의 회원등급을 선택해 주세요.");
+		}
+	}
+
 
 	/**
 	 * 게시판 삭제
@@ -978,9 +991,9 @@ public class BOBbsService {
 
 						log.debug("분류 oldDvQesitmInnbs : {}", oldDvQesitmInnbs);
 						log.debug("분류 olddvItmInnbs : {}", olddvItmInnbs);
-						log.debug("분류 olddvItmInnbsArr : {}", olddvItmInnbsArr);
-						log.debug("분류 qesitmInnb_d : {}", qesitmInnb_d);
-						log.debug("분류 qesitmNm_d : {}", qesitmNm_d);
+						log.debug("분류 olddvItmInnbsArr : {}", (Object) olddvItmInnbsArr);
+						log.debug("분류 qesitmInnb_d : {}", (Object) qesitmInnb_d);
+						log.debug("분류 qesitmNm_d : {}", (Object) qesitmNm_d);
 						log.debug("분류 qesitmInnb : {}", qesitmInnb);
 						log.debug("분류 itmInnb_del : {}", itmInnb_del);
 
@@ -1055,8 +1068,8 @@ public class BOBbsService {
 
 				}
 				log.debug("필수 {}", vo.getOldIpQesitmInnbs());
-				log.debug("필수 {}", vo.getQesitmEssntlAt_i());
-				log.debug("사용 {}", vo.getQesitmUseAt_i());
+				log.debug("필수 {}", (Object) vo.getQesitmEssntlAt_i());
+				log.debug("사용 {}", (Object) vo.getQesitmUseAt_i());
 				/** 게시판 추가 문항 수정 */
 				if (!ObjectUtils.isEmpty(vo.getQesitmInnb_i())) {
 					String[] qesitmNm_i = vo.getQesitmNm_i();

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

@@ -232,6 +232,9 @@ public class BOGnrlbbscttService {
         BOGnrlbbscttVO resultCnt = new BOGnrlbbscttVO();
         switch (bbsTyCd) {
             case "01": //일반게시글 조회
+                log.debug("일반게시글 getServerDv : {}",bbsctt.getServerDv());
+                log.debug("일반게시글 getMbrDvCd : {}",bbsctt.getMbrDvCd());
+                log.debug("일반게시글 getSopmalCd : {}",bbsctt.getSopmalCd());
                 resultCnt = mapper.selectBOGnrlBbscttListCnt(bbsctt);
                 totCnt = resultCnt.getTotCnt();
                 if (StringUtil.isEmpty(bbsctt.getNtcAt())) {/*공지 제외 검색 조건*/
@@ -567,19 +570,11 @@ public class BOGnrlbbscttService {
         Map<String, Object> map = new HashMap<String, Object>();
         // 게시글 연관상품 조회
         List<DataMap> goodsList = new ArrayList<>();
-        DataMap result = new DataMap();
-
         goodsList = mapper.selectBOBbscttDtlGoods(bbsctt);
 
-        /*게시판 설정 > 추천 상품 노출 선택 시 사용자 게시글 상세 상품 노출 */
-        if (!goodsList.isEmpty()) {
-            if ("sopmal".equals(bbsctt.getServerDv())) {
-                result = goodsService.selectBoGoodsRelateList(goodsList);
-            }
-        }
         /*사용자 , 관리자 페이지 구분*/
         if ("sopmal".equals(bbsctt.getServerDv())) {
-            map.put("goodsList", result);
+            map.put("goodsList", goodsList);
         } else {
             map.put("goodsList", goodsList);
         }
@@ -917,6 +912,7 @@ public class BOGnrlbbscttService {
             throw new WnbtRestException(wre.getMessage());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            throw new WnbtRestException("게시글 등록 중 오류가 발생했습니다.", e);
         }
 
         return message;
@@ -1103,7 +1099,7 @@ public class BOGnrlbbscttService {
                     }
                 }
                 /*1:1 문의 게시판이 아닌경우만 처리 */
-                if("12".equals(bbsctt.getBbsTyCd())){
+                if(!"12".equals(bbsctt.getBbsTyCd())){
                     //게시글 연관 상품 삭제
                     mapper.deleteBOBbscttGoods(bbsctt);
                     //게시글 연관 상품 등록(fm_boarddata_goods)
@@ -1134,6 +1130,7 @@ public class BOGnrlbbscttService {
             throw new WnbtRestException(wre.getMessage());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
+            throw new WnbtRestException("게시글 수정 중 오류가 발생했습니다.", e);
         }
 
         return message;

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

@@ -75,6 +75,8 @@ public class BOGnrlbbscttVO extends AbstractVO {
 	@Length(max = 16777215, message = "내용")
 	/** 내용 */
 	private String cn;
+	/** 내용 */
+	private String relateGoodsWords;
 	/** 조회건수 */
 	private Integer inqireCnt;
 	/** 댓글건수 */

src/main/java/com/wb/domainserver/domain/gcone/common/service/BOCommonService.java

@@ -46,6 +46,9 @@ public class BOCommonService {
 
 	@Value("${secret.key}")
 	private String secretKey;
+
+	@Value("${aciexpress.apikey}")
+	private String aciApiKey;
     
 	/**
 	 * <p>비밀번호를 암호화 한다</p>
@@ -287,4 +290,10 @@ public class BOCommonService {
 		return secretKey;
 	}
 
+	/**
+	 * aci Api키 조회
+	 * @return String
+	 */
+	public String selectAciApiKey() {return aciApiKey;}
+
 }

src/main/java/com/wb/domainserver/domain/gcone/goods/badge/mapper/BOGoodsBadgeMapper.java

@@ -0,0 +1,17 @@
+package com.wb.domainserver.domain.gcone.goods.badge.mapper;
+
+import com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO;
+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 BOGoodsBadgeMapper {
+	List<DataMap> selectBOGoodsBadgeList(BOGoodsBadgeVO vo);
+	int selectBOGoodsBadgeCount(BOGoodsBadgeVO vo);
+	int insertBOGoodsBadge(BOGoodsBadgeVO vo);
+	int updateBOGoodsBadge(BOGoodsBadgeVO vo);
+}

src/main/java/com/wb/domainserver/domain/gcone/goods/badge/service/BOGoodsBadgeService.java

@@ -0,0 +1,113 @@
+package com.wb.domainserver.domain.gcone.goods.badge.service;
+
+import com.wb.domainserver.domain.gcone.goods.badge.mapper.BOGoodsBadgeMapper;
+import com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+@Service
+public class BOGoodsBadgeService {
+	private static final Pattern COLOR_PATTERN = Pattern.compile("^#[0-9A-Fa-f]{6}$");
+	private static final Pattern BADGE_CODE_PATTERN = Pattern.compile("^[A-Za-z0-9_-]+$");
+
+	@Autowired
+	private BOGoodsBadgeMapper mapper;
+
+	public List<DataMap> selectBOGoodsBadgeList(BOGoodsBadgeVO vo) {
+		return mapper.selectBOGoodsBadgeList(vo);
+	}
+
+	@Transactional
+	public DataMap updateBOGoodsBadgeSetup(BOGoodsBadgeVO request) {
+		DataMap message = new DataMap();
+		String[] badgeCdArr = request.getBadgeCdArr();
+		if (badgeCdArr == null || badgeCdArr.length == 0) {
+			message.put("result", "success");
+			return message;
+		}
+
+		validateArrayLengths(request, badgeCdArr.length);
+		Set<String> newBadgeCodes = new HashSet<>();
+		for (int i = 0; i < badgeCdArr.length; i++) {
+			BOGoodsBadgeVO badge = createBadge(request, i);
+			validateBadge(badge);
+			if ("Y".equals(badge.getNewAt())) {
+				if (!newBadgeCodes.add(badge.getBadgeCd()) || mapper.selectBOGoodsBadgeCount(badge) > 0) {
+					throw new WnbtRestException("이미 등록된 배지코드입니다.");
+				}
+				mapper.insertBOGoodsBadge(badge);
+			} else {
+				if (!badge.getBadgeCd().equals(trim(request.getOriginalBadgeCdArr()[i]))) {
+					throw new WnbtRestException("기존 배지코드는 변경할 수 없습니다.");
+				}
+				if (mapper.selectBOGoodsBadgeCount(badge) == 0) {
+					throw new WnbtRestException("존재하지 않는 배지코드입니다.");
+				}
+				mapper.updateBOGoodsBadge(badge);
+			}
+		}
+
+		message.put("result", "success");
+		return message;
+	}
+
+	private void validateArrayLengths(BOGoodsBadgeVO vo, int size) {
+		if (vo.getOriginalBadgeCdArr() == null || vo.getBadgeNmArr() == null || vo.getFontColorArr() == null || vo.getBgColorArr() == null
+				|| vo.getBorderColorArr() == null || vo.getSortOrdrArr() == null || vo.getUseAtArr() == null
+				|| vo.getNewAtArr() == null || vo.getOriginalBadgeCdArr().length != size || vo.getBadgeNmArr().length != size || vo.getFontColorArr().length != size
+				|| vo.getBgColorArr().length != size || vo.getBorderColorArr().length != size
+				|| vo.getSortOrdrArr().length != size || vo.getUseAtArr().length != size || vo.getNewAtArr().length != size) {
+			throw new WnbtRestException("배지 저장 요청 값이 올바르지 않습니다.");
+		}
+	}
+
+	private BOGoodsBadgeVO createBadge(BOGoodsBadgeVO request, int index) {
+		BOGoodsBadgeVO badge = new BOGoodsBadgeVO();
+		badge.setSopmalCd(request.getSopmalCd());
+		badge.setRegusr(request.getRegusr());
+		badge.setUpdusr(request.getUpdusr());
+		badge.setBadgeCd(trim(request.getBadgeCdArr()[index]));
+		badge.setBadgeNm(trim(request.getBadgeNmArr()[index]));
+		badge.setFontColor(trim(request.getFontColorArr()[index]));
+		badge.setBgColor(trim(request.getBgColorArr()[index]));
+		badge.setBorderColor(trim(request.getBorderColorArr()[index]));
+		badge.setSortOrdr(trim(request.getSortOrdrArr()[index]));
+		badge.setUseAt(trim(request.getUseAtArr()[index]));
+		badge.setNewAt(trim(request.getNewAtArr()[index]));
+		return badge;
+	}
+
+	private void validateBadge(BOGoodsBadgeVO badge) {
+		if (!StringUtils.hasText(badge.getBadgeCd()) || ("Y".equals(badge.getNewAt()) && !BADGE_CODE_PATTERN.matcher(badge.getBadgeCd()).matches())) {
+			throw new WnbtRestException("배지코드는 영문, 숫자, 밑줄, 하이픈만 입력할 수 있습니다.");
+		}
+		if (!StringUtils.hasText(badge.getBadgeNm()) || !COLOR_PATTERN.matcher(badge.getFontColor()).matches()
+				|| !COLOR_PATTERN.matcher(badge.getBgColor()).matches() || !COLOR_PATTERN.matcher(badge.getBorderColor()).matches()) {
+			throw new WnbtRestException("배지명과 색상값을 확인해 주세요.");
+		}
+		try {
+			if (Integer.parseInt(badge.getSortOrdr()) < 0) {
+				throw new NumberFormatException();
+			}
+		} catch (NumberFormatException e) {
+			throw new WnbtRestException("노출순서는 0 이상의 정수만 입력할 수 있습니다.");
+		}
+		if (!("Y".equals(badge.getUseAt()) || "N".equals(badge.getUseAt()))
+				|| !("Y".equals(badge.getNewAt()) || "N".equals(badge.getNewAt()))) {
+			throw new WnbtRestException("배지 저장 요청 값이 올바르지 않습니다.");
+		}
+	}
+
+	private String trim(String value) {
+		return value == null ? "" : value.trim();
+	}
+}

src/main/java/com/wb/domainserver/domain/gcone/goods/badge/vo/BOGoodsBadgeVO.java

@@ -0,0 +1,28 @@
+package com.wb.domainserver.domain.gcone.goods.badge.vo;
+
+import com.wb.domainserver.domain.comm.vo.AbstractVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BOGoodsBadgeVO extends AbstractVO {
+
+	private String sopmalCd;
+	private String badgeCd;
+	private String badgeNm;
+	private String fontColor;
+	private String bgColor;
+	private String borderColor;
+	private String sortOrdr;
+	private String newAt;
+	private String[] badgeCdArr;
+	private String[] originalBadgeCdArr;
+	private String[] badgeNmArr;
+	private String[] fontColorArr;
+	private String[] bgColorArr;
+	private String[] borderColorArr;
+	private String[] sortOrdrArr;
+	private String[] useAtArr;
+	private String[] newAtArr;
+}

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

@@ -34,6 +34,8 @@ public interface BOGoodsMapper {
 	public Integer selectBOGoodsCount(BOGoodsVO vo);
 	// 일반 상품 목록 리스트
 	public List<DataMap> selectBOGoodsList(BOGoodsVO vo);
+	// 관리자 상품 배지 목록
+	public List<DataMap> selectBOGoodsBadgeList(BOGoodsVO vo);
 	// 카테고리별 상품 목록 수정
 	public void updateBOCtgryGoodsList(BOGoodsVO vo);
 	// 관리자 > 일반 상품 상세
@@ -85,6 +87,8 @@ public interface BOGoodsMapper {
 	public void updateBOGoodsAdditionDtl(BOGoodsAdditionVO vo);
 	// 일반 상품 > 추가정보 삭제
 	public void deleteBOGoodsAddition(BOGoodsAdditionVO vo);
+	// 사용자 - 검색 - 검색어 로그 저장
+	public int insertBOSrchwrdLog(BOGoodsVO vo);
 	// 사용자 - 검색 - 상품명 검색어 조회
 	public List<DataMap> selectBOSrchGoodsNm(BOGoodsVO vo);
 	// 일반 상품 > 일괄 업데이트

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

@@ -7,6 +7,7 @@ import com.wb.domainserver.domain.gcone.common.service.BOCommonService;
 import com.wb.domainserver.domain.gcone.goods.goods.mapper.BOGoodsMapper;
 import com.wb.domainserver.domain.gcone.goods.goods.vo.*;
 import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.exception.code.ErrorCode;
 import com.wb.domainserver.util.dataaccess.DataMap;
 import com.wb.domainserver.util.string.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import java.io.File;
 import java.math.BigInteger;
@@ -74,6 +76,15 @@ public class BOGoodsService {
 		return resultList;
 	}
 
+	/**
+	 * 관리자 상품 배지 목록 조회
+	 * @param vo
+	 * @return
+	 */
+	public List<DataMap> selectBOGoodsBadgeList(BOGoodsVO vo) {
+		return mapper.selectBOGoodsBadgeList(vo);
+	}
+
 	/**
 	 * 사용자 > 상품 목록 조회
 	 * @param vo
@@ -1505,6 +1516,27 @@ public class BOGoodsService {
 		return mapper.selectBOGoodsCategoryLink(vo);
 	}
 
+	/**
+	 * 검색어 로그 저장
+	 * @param vo
+	 * @return
+	 */
+	public DataMap insertBOSrchwrdLog(BOGoodsVO vo){
+		DataMap message = new DataMap();
+
+		try {
+			mapper.insertBOSrchwrdLog(vo);
+
+			message.put("result", "success");
+		} catch (WnbtRestException wre) {
+			throw new WnbtRestException(wre.getMessage());
+		} catch (Exception e) {
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
+		}
+
+		return message;
+	}
+
 	/**
 	 * 상품명 검색어 조회
 	 * @param vo

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

@@ -47,6 +47,10 @@ public class BOGoodsOptionVO extends AbstractVO {
     private String optnCd4;
     /** 옵션정보 */
     private String optnInfo;
+    /** HS Code */
+    private String hscode;
+    /** 실무게(KG) */
+    private String realWt;
     /** 재고수량 */
     private String invntryQy;
     /** 가용재고수량 */

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

@@ -41,6 +41,9 @@ public class BOGoodsVO extends AbstractVO {
     /** 상품명 */
     @NotBlank(message = "상품명")
     private String goodsNm;
+    /** 상품명(영문) */
+    @NotBlank(message = "상품명(영문)")
+    private String goodsNmEn;
     /** 입점상품명 */
     private String tentMarktGoodsNm;
     /** ? */
@@ -220,6 +223,10 @@ public class BOGoodsVO extends AbstractVO {
     private String optnCd4;
     /** 옵션정보 */
     private String optnInfo;
+    /** HS Code */
+    private String hscode;
+    /** 실무게(KG) */
+    private String realWt;
     /** 재고수량 */
     private Integer invntryQy;
     /** 가용재고수량 */
@@ -478,6 +485,10 @@ public class BOGoodsVO extends AbstractVO {
     private String srchType;
     /** 검색어 */
     private String srchStr;
+    /** 유입경로 */
+    private String conectUrl;
+    /** 유입경로 도메인 */
+    private String conectDomn;
     /** 선택 삭제 */
     private List<HashMap<String, Object>> delInnbArr;
     /** 이미지 파일 업로드 */

src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/mapper/BOPurchsMapper.java

@@ -470,6 +470,8 @@ public interface BOPurchsMapper {
      */
     public String selectRlSetleAmt(DataMap param);
 
+    public String selectWonRlSetleAmt(DataMap param);
+
     /**
      * 0원 상품 포함시 짜투리 업데이트 ( 장바구니, 마일리지, 애누리 )
      * @param itemOptnVO

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

@@ -2,16 +2,15 @@ package com.wb.domainserver.domain.gcone.goods.purchs.service;
 
 import com.nimbusds.jose.shaded.gson.Gson;
 import com.wb.domainserver.domain.admin.instcSle.mtng.service.BOMaMtngService;
-import com.wb.domainserver.domain.admin.instcSle.mtng.vo.BOInstcSleVO;
 import com.wb.domainserver.domain.gcone.bbs.cnslt.service.BOCnsltService;
 import com.wb.domainserver.domain.gcone.bbs.cnslt.vo.BOCnsltVO;
 import com.wb.domainserver.domain.gcone.common.service.BOCommonService;
 import com.wb.domainserver.domain.gcone.goods.purchs.mapper.BOPurchsMapper;
 import com.wb.domainserver.domain.gcone.goods.purchs.vo.*;
+import com.wb.domainserver.domain.gcone.ordr.ordr.mapper.BOOrdrMapper;
 import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrderRestAmtVO;
 import com.wb.domainserver.exception.WnbtRestException;
 import com.wb.domainserver.security.authentication.AnonymousUser;
-import com.wb.domainserver.security.authentication.MemberJwtToken;
 import com.wb.domainserver.util.dataaccess.DataMap;
 import com.wb.domainserver.util.string.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -24,8 +23,9 @@ import org.springframework.util.StringUtils;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
-import java.text.DecimalFormat;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Service
 @Slf4j
@@ -33,6 +33,9 @@ public class BOOrderService {
     @Autowired
     private BOPurchsMapper mapper;
 
+    @Autowired
+    private BOOrdrMapper boOrdrMapper;
+
     @Autowired
     private BOMaMtngService maMtngService;
 
@@ -74,6 +77,11 @@ public class BOOrderService {
         LinkedHashMap setle = (LinkedHashMap) param.get("setle"); // 결제정보
         List<LinkedHashMap> prsntList = (List<LinkedHashMap>) param.get("prsnt"); // 사은품 정보
 
+        Boolean subsvcAt = param.containsKey("subsvcInnb"); // 구독서비스 여부
+        if(subsvcAt) {
+            setle.put("subsvcInnb", param.get("subsvcInnb"));
+        }
+
         log.debug("구매자정보 => {} ", new Gson().toJson(purchsr));
         log.debug("상품정보 => {} ", new Gson().toJson(goodsList));
         log.debug("배송정보 => {} ", new Gson().toJson(shipping));
@@ -81,27 +89,465 @@ public class BOOrderService {
         log.debug("결제정보 => {} ", new Gson().toJson(setle));
         log.debug("사은품 => {} ", new Gson().toJson(prsntList));
 
+        String sopmalCd = "";
+        if("01".equals(user.getSysDvCd())){
+            sopmalCd = user.getSopmalCd();
+        }else{
+            sopmalCd = param.get("sopmalCd").toString();
+        }
+
+        String ordrTyCd = (String) param.get("ordrTyCd");
+        String bfOrdrTyCd = (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 (!CollectionUtils.isEmpty(multiOrdrDlvylcMap)) {
-            // 배송지 리스트
-            dlvylcListMulti = (List<LinkedHashMap<String, Object>>) multiOrdrDlvylcMap.get("dlvylc");
-            log.debug("dlvylcListMulti : {}", dlvylcListMulti);
+
+        String dlvylcAreaCd = (String) shipping.get("dlvylcAreaCd");
+        String ordrAdressZip = StringUtil.isNullToString(shipping.get("dlvylcZip"));
+        String prefcd = (String) shipping.get("prefcd");
+        String defaultAdressAt = "N";
+        String sopmalCode = sopmalCd;
+
+        DataMap defaultAdressVO = new DataMap() {{ //
+            put("sopmalCd", sopmalCode); // 쇼핑몰 코드
+            put("zip", ordrAdressZip); // 우편번호
+            put("prefcd", prefcd); // 도도부현코드
+        }};
+
+        // 추가 배송비 여부 조회
+        if("KR".equals(dlvylcAreaCd)){
+            defaultAdressAt = boOrdrMapper.selectBODefaultAdressAtInqire(defaultAdressVO);
+        }
+        if("JP".equals(dlvylcAreaCd)){
+            defaultAdressAt = boOrdrMapper.selectBODefaultAdressAtInqire2(defaultAdressVO);
+        }
+
+        // DlvyGroupList 조회
+        List<DataMap> DlvyGroupList = new ArrayList<>();
+
+        goodsList.forEach(goods -> {
+            DataMap item = new DataMap();
+
+            item.put("goodsInnb", new BigInteger(String.valueOf(goods.get("goodsInnb"))));
+            item.put("goodsOptnInnb", new BigInteger(String.valueOf(goods.get("goodsOptnInnb"))));
+            item.put("dlvyGroupInnb", new BigInteger(String.valueOf(goods.get("dlvyGroupInnb"))));
+            item.put("qy", new BigInteger(String.valueOf((int) goods.get("qy"))));
+
+            item.put("dscntApplyAmt", new BigInteger(String.valueOf((int) goods.get("dscntApplyAmt"))));
+            item.put("slepric", new BigInteger(String.valueOf((int) goods.get("slepric"))));
+            item.put("subSlepric", new BigInteger(String.valueOf((int) goods.get("subSlepric"))));
+            item.put("dscntAmt", new BigInteger(String.valueOf((int) goods.get("dscntAmt"))));
+
+            // dscntApplyAmt 4500
+            // slepric 5000
+            // subSlepric 5000
+            // dscntAmt 500
+
+            item.put("mbrInnb", new BigInteger(String.valueOf(goods.get("mbrInnb"))));
+            item.put("mbrDvCd", String.valueOf(goods.get("mbrDvCd")));
+            item.put("sopmalCd", String.valueOf(goods.get("sopmalCd")));
+
+            DlvyGroupList.add(item);
+        });
+
+        BigDecimal bundleDlvyAmtYSlepricSum = new BigDecimal(0); // 조건부 무료배송 묶음 O : 상품금액 합
+
+        DlvyGroupList.sort(Comparator.comparing((DataMap map) -> (BigInteger) map.get("goodsInnb")).thenComparing((DataMap map) -> (BigInteger) map.get("goodsOptnInnb")) .thenComparing((DataMap map) -> (BigInteger) map.get("dlvyGroupInnb"))); // 정렬
+
+        // 배송그룹고유번호별 상품목록
+        Map<BigInteger, List<DataMap>> goodsByDlvyGroupMap = DlvyGroupList.stream().collect(Collectors.groupingBy(m -> ((BigInteger) m.get("dlvyGroupInnb")), HashMap::new, Collectors.toList()));
+
+        List<DataMap> dlvyAmtByDlvyGroupList = new ArrayList<>();
+
+        if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송
+            for (Map.Entry<BigInteger, List<DataMap>> dlvyGroupEtry : goodsByDlvyGroupMap.entrySet()) {
+                int dlvyGroupInnb = dlvyGroupEtry.getKey().intValue();
+                List<DataMap> goodsByDlvyGroupList = dlvyGroupEtry.getValue();
+
+                DataMap shippingParam = new DataMap() {{
+                    put("dlvyGroupInnb", dlvyGroupInnb);
+                    put("sopmalCd", sopmalCode);
+                }};
+
+                DataMap shippingGrouping = mapper.selectShippingGrouping(shippingParam);
+
+                // "KR".equals(dlvylcAreaCd)인 경우
+                String itemDlvyGroupDvCd = (String) shippingGrouping.get("dlvyGroupDvCd");
+                BigDecimal itemDftDlvyAmt = (BigDecimal) shippingGrouping.get("dftDlvyAmt"); // 기본배송비
+                BigDecimal itemDlvyAmt = itemDftDlvyAmt; // 배송비
+                String itemDlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt"); // 도서산간 추가 배송비 조건
+                BigDecimal itemAreaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt"); // 도서산간 추가 배송비
+                String itemBundleDlvyUseAt = (String) shippingGrouping.get("bundleDlvyUseAt"); // 묶음배송 사용여부
+                BigDecimal itemBundleDlvyCndAmt = (BigDecimal) shippingGrouping.get("bundleDlvyCndAmt"); // 묶음배송 사용금액
+                String itemAmtCndUseAt = (String) shippingGrouping.get("amtCndUseAt"); // 금액조건
+                BigDecimal itemAmtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt");
+                String itemCntCndUseAt = (String) shippingGrouping.get("cntCndUseAt"); // 수량조건
+                BigDecimal itemCntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt"); // 수량
+
+                if("JP".equals(dlvylcAreaCd)){
+                    itemDftDlvyAmt = (BigDecimal) shippingGrouping.get("dftDlvyAmt2"); // 기본배송비
+                    itemDlvyAmt = itemDftDlvyAmt; // 배송비
+                    itemDlvyAreaAditAt = (String) shippingGrouping.get("dlvyAreaAditAt2"); // 도서산간 추가 배송비 조건
+                    itemAreaAditDlvyAmt = (BigDecimal) shippingGrouping.get("areaAditDlvyAmt2"); // 도서산간 추가 배송비
+                    itemBundleDlvyUseAt = (String) shippingGrouping.get("bundleDlvyUseAt2"); // 묶음배송 사용여부
+                    itemBundleDlvyCndAmt = (BigDecimal) shippingGrouping.get("bundleDlvyCndAmt2"); // 묶음배송 사용금액
+                    itemAmtCndUseAt = (String) shippingGrouping.get("amtCndUseAt2"); // 금액조건
+                    itemAmtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt");
+                    itemCntCndUseAt = (String) shippingGrouping.get("cntCndUseAt2"); // 수량조건
+                    itemCntCndAditAmt = (BigDecimal) shippingGrouping.get("cntCndAditAmt2"); // 수량
+                }
+
+//                 else if ("03".equals(itemDlvyGroupDvCd)) { // 유료배송
+                if ("02".equals(itemDlvyGroupDvCd) || "03".equals(itemDlvyGroupDvCd) || subsvcAt) { // 유료배송
+
+                    // 추가배송비 계산 (MUL)
+                    if (!StringUtils.isEmpty(itemDlvyAreaAditAt) && "Y".equals(itemDlvyAreaAditAt)) {
+                        if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
+                            itemDlvyAmt = itemDlvyAmt.add(itemAreaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
+                        }
+                    }
+
+                    // 무료 or 유료배송 + 수량 조건
+                    if (("Y".equals(itemCntCndUseAt) && itemCntCndAditAmt.compareTo(BigDecimal.ZERO) > 0) || subsvcAt) {
+                        // 수량 조건 있을 경우
+                        for (DataMap goodsMap : goodsByDlvyGroupList) {
+
+                            BigDecimal qy = new BigDecimal(String.valueOf(goodsMap.get("qy"))); // 수량
+                            BigDecimal unitQy = subsvcAt ? qy : qy.divide(itemCntCndAditAmt, 0, RoundingMode.CEILING); // 단위수량
+                            BigDecimal goodsDscntAmt = new BigDecimal(String.valueOf(goodsMap.get("dscntAmt")));
+                            BigInteger unitDscntAmt = BigInteger.valueOf(goodsDscntAmt.intValue());
+
+                            int goodsQy = unitQy.intValue();
+
+                            // cntCndAditAmt(설정수량)으로 배송 나누기
+                            for (int j = 0; j < goodsQy; j++) {
+
+                                goodsMap.put("goodsInnb", new BigInteger(String.valueOf(goodsMap.get("goodsInnb"))).intValue());
+                                goodsMap.put("goodsOptnInnb", new BigInteger(String.valueOf(goodsMap.get("goodsOptnInnb"))).intValue());
+                                goodsMap.put("dlvyGroupInnb", new BigInteger(String.valueOf(goodsMap.get("dlvyGroupInnb"))).intValue());
+                                goodsMap.put("slepric", new BigInteger(String.valueOf(goodsMap.get("slepric"))).intValue());
+                                goodsMap.put("mbrInnb", new BigInteger(String.valueOf(goodsMap.get("mbrInnb"))).intValue());
+
+                                // cntCndAditAmt(설정수량)단위로 으로 goodsList qy(수량) 설정
+                                if ((goodsQy - j) > 1) {
+                                    goodsMap.put("qy", itemCntCndAditAmt.intValue());
+                                } else {
+                                    goodsMap.put("qy", qy.intValue() - (itemCntCndAditAmt.intValue() * j));
+                                }
+
+                                //  goodsDscntAmt(할인금액)이 있을 경우
+                                if (goodsDscntAmt.compareTo(BigDecimal.ZERO) > 0) {
+                                    unitDscntAmt = new BigInteger(String.valueOf(goodsDscntAmt.divide(qy, 0, RoundingMode.DOWN)));   // 소수점이하 나머지 버림
+                                    goodsMap.put("dscntAmt", unitDscntAmt.intValueExact());
+                                    goodsMap.put("subSlepric", new BigInteger(String.valueOf(((int) goodsMap.get("slepric") * (int) goodsMap.get("qy")))).intValueExact());
+                                    goodsMap.put("dscntApplyAmt", new BigInteger(String.valueOf(((int) goodsMap.get("slepric") * (int) goodsMap.get("qy")) - (int) goodsMap.get("dscntAmt"))).intValueExact());
+
+                                } else {
+                                    // goodsDscntAmt(할인금액)이 0일 경우
+                                    goodsMap.put("dscntAmt", unitDscntAmt.intValueExact());
+                                    goodsMap.put("subSlepric", new BigInteger(String.valueOf(((int) goodsMap.get("slepric") * (int) goodsMap.get("qy")))).intValueExact());
+                                    goodsMap.put("dscntApplyAmt", new BigInteger(String.valueOf(((int) goodsMap.get("slepric") * (int) goodsMap.get("qy")) - (int) goodsMap.get("dscntAmt"))).intValueExact());
+                                }
+
+                                // item.put("subSlepric", new BigDecimal(String.valueOf(( (int) goods.get("slepric") * (int) goods.get("qy")) - (int) goods.get("dscntAmt") )));
+
+                                // GoodsList에 추가
+                                List<LinkedHashMap> itemGoodsList = new ArrayList<>();
+                                itemGoodsList.add(new LinkedHashMap<>(goodsMap));
+
+                                List<LinkedHashMap> itempPrsntList = new ArrayList<>();
+//                                if(!prsntList.isEmpty()){
+//                                    itempPrsntList.add(prsntList.get(i));
+//                                    for (LinkedHashMap<String, Object> itemPrsntMap : itempPrsntList) {
+//                                        if((goodsQy-j) > 1){
+//                                            itemPrsntMap.put("qy", itemCntCndAditAmt.intValue());
+//                                        } else {
+//                                            itemPrsntMap.put("qy", qy.intValue() - (itemCntCndAditAmt.intValue() * 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("dlvylcAreaCd", shipping.get("dlvylcAreaCd"));
+                                dlvyMap.put("cstmclerCd", shipping.get("cstmclerCd"));
+                                dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip"));
+                                dlvyMap.put("prefcd", shipping.get("prefcd"));
+                                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);
+                            } // for j
+
+                        } // for goodsByDlvyGroupList
+
+                    } else {
+                        // 수량 조건 없을 경우
+
+                        List<LinkedHashMap> itemGoodsList = new ArrayList<>();
+
+                        for (DataMap goodsMap : goodsByDlvyGroupList) {
+//                            BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량
+                            goodsMap.put("goodsInnb", new BigInteger(String.valueOf(goodsMap.get("goodsInnb"))).intValue());
+                            goodsMap.put("goodsOptnInnb", new BigInteger(String.valueOf(goodsMap.get("goodsOptnInnb"))).intValue());
+                            goodsMap.put("dlvyGroupInnb", new BigInteger(String.valueOf(goodsMap.get("dlvyGroupInnb"))).intValue());
+                            goodsMap.put("qy", new BigInteger(String.valueOf(goodsMap.get("qy"))).intValue());
+
+                            goodsMap.put("dscntApplyAmt", new BigInteger(String.valueOf(goodsMap.get("dscntApplyAmt"))).intValue());
+                            goodsMap.put("slepric", new BigInteger(String.valueOf(goodsMap.get("slepric"))).intValue());
+                            goodsMap.put("subSlepric", new BigInteger(String.valueOf(goodsMap.get("subSlepric"))).intValue());
+                            goodsMap.put("dscntAmt", new BigInteger(String.valueOf(goodsMap.get("dscntAmt"))).intValue());
+                            goodsMap.put("mbrInnb", new BigInteger(String.valueOf(goodsMap.get("mbrInnb"))).intValue());
+
+
+                            itemGoodsList.add(new LinkedHashMap<>(goodsMap));
+
+                        }
+
+                        List<LinkedHashMap> itempPrsntList = new ArrayList<>();
+//                        if(!prsntList.isEmpty()){
+//                            itempPrsntList.add(prsntList.get(i));
+//                            for (LinkedHashMap<String, Object> itemPrsntMap : itempPrsntList) {
+//                                itemPrsntMap.put("qy", qy.intValue());
+//                            }
+//                        }
+
+                        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("dlvylcAreaCd", shipping.get("dlvylcAreaCd"));
+                        dlvyMap.put("cstmclerCd", shipping.get("cstmclerCd"));
+                        dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip"));
+                        dlvyMap.put("prefcd", shipping.get("prefcd"));
+                        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);
+                    }
+
+//                } // DlvyGroupDvCd 무료배송, 유료배송
+                } else { // 조건부 무료 or 무료 배송일 경우
+
+                    // 무료배송(조건부)
+                    if ("01".equals(itemDlvyGroupDvCd)) {
+
+                        List<LinkedHashMap> itemGoodsList = new ArrayList<>();
+
+                        for (DataMap goodsMap : goodsByDlvyGroupList) {
+
+                            BigDecimal subSlepric = new BigDecimal(String.valueOf(goodsMap.get("subSlepric"))); // 판매가 * 수량
+
+                            // 금액 조건
+                            if ("Y".equals(itemAmtCndUseAt)) {
+                                // subSlepric(금액)이 무료배송 금액조건보다 크거나 같을 경우 [상품 기준]
+                                if (subSlepric.compareTo(itemAmtCndAditAmt) >= 0) {
+                                    itemDlvyAmt = new BigDecimal(0);
+                                }
+                            }
+
+                            // 수량 조건
+                            if ("Y".equals(itemCntCndUseAt)) {
+                                BigDecimal qy = new BigDecimal(String.valueOf(goodsMap.get("qy"))); // 수량
+
+                                // qy(수량)이 무료배송 수량조건보다 크거나 같을 경우 [상품 기준]
+                                if (qy.compareTo(itemCntCndAditAmt) >= 0) {
+                                    itemDlvyAmt = new BigDecimal(0);
+                                }
+                            }
+
+                            // 묶음배송 조건 사용여부 [상품리스트 전체 기준]
+                            if ("Y".equals(itemBundleDlvyUseAt)) { // 묶음 O
+
+                                // 묶음배송 사용여부 Y && 상품건수 1개 이상
+                                if (goodsByDlvyGroupList.size() > 0) {
+                                    // 묶음배송 조건금액이 있으면
+                                    if (itemBundleDlvyCndAmt != null && itemBundleDlvyCndAmt.compareTo(BigDecimal.ZERO) > 0) {
+
+                                        bundleDlvyAmtYSlepricSum = bundleDlvyAmtYSlepricSum.add(subSlepric);
+
+                                        // bundleDlvyAmtYSlepricSum 값이 itemBundleDlvyCndAmt 보다 크거나 같으면( 묶음배송 무료조건을 만족하면)
+                                        if (bundleDlvyAmtYSlepricSum.compareTo(itemBundleDlvyCndAmt) >= 0) {
+                                            itemDlvyAmt = new BigDecimal(0);
+                                        }
+                                    }
+                                }
+                            }
+
+                            // multi shipping -> goodsList int값으로 변환
+                            goodsMap.put("goodsInnb", new BigInteger(String.valueOf(goodsMap.get("goodsInnb"))).intValue());
+                            goodsMap.put("goodsOptnInnb", new BigInteger(String.valueOf(goodsMap.get("goodsOptnInnb"))).intValue());
+                            goodsMap.put("dlvyGroupInnb", new BigInteger(String.valueOf(goodsMap.get("dlvyGroupInnb"))).intValue());
+                            goodsMap.put("qy", new BigInteger(String.valueOf(goodsMap.get("qy"))).intValue());
+
+                            goodsMap.put("dscntApplyAmt", new BigInteger(String.valueOf(goodsMap.get("dscntApplyAmt"))).intValue());
+                            goodsMap.put("slepric", new BigInteger(String.valueOf(goodsMap.get("slepric"))).intValue());
+                            goodsMap.put("subSlepric", new BigInteger(String.valueOf(goodsMap.get("subSlepric"))).intValue());
+                            goodsMap.put("dscntAmt", new BigInteger(String.valueOf(goodsMap.get("dscntAmt"))).intValue());
+                            goodsMap.put("mbrInnb", new BigInteger(String.valueOf(goodsMap.get("mbrInnb"))).intValue());
+
+                            itemGoodsList.add(new LinkedHashMap<>(goodsMap));
+
+                        }
+
+                        List<LinkedHashMap> itempPrsntList = new ArrayList<>();
+//                        if(!prsntList.isEmpty()){
+//                            itempPrsntList.add(prsntList.get(i));
+//                            for (LinkedHashMap<String, Object> itemPrsntMap : itempPrsntList) {
+//                                itemPrsntMap.put("qy", qy.intValue());
+//                            }
+//                        }
+
+                        // 추가배송비 계산 (MUL)
+                        if (!StringUtils.isEmpty(itemDlvyAreaAditAt) && "Y".equals(itemDlvyAreaAditAt)) {
+                            if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
+                                itemDlvyAmt = itemDlvyAmt.add(itemAreaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
+                            }
+                        }
+
+                        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("dlvylcAreaCd", shipping.get("dlvylcAreaCd"));
+                        dlvyMap.put("cstmclerCd", shipping.get("cstmclerCd"));
+                        dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip"));
+                        dlvyMap.put("prefcd", shipping.get("prefcd"));
+                        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 ("02".equals(itemDlvyGroupDvCd)) { // 무료 배송일 경우
+
+                        // 추가배송비 계산 (MUL)
+                        if (!StringUtils.isEmpty(itemDlvyAreaAditAt) && "Y".equals(itemDlvyAreaAditAt)) {
+                            if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
+                                itemDlvyAmt = itemDlvyAmt.add(itemAreaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
+                            }
+                        }
+
+                        List<LinkedHashMap> itemGoodsList = new ArrayList<>();
+
+                        for (DataMap goodsMap : goodsByDlvyGroupList) {
+//                            BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량
+
+                            goodsMap.put("goodsInnb", new BigInteger(String.valueOf(goodsMap.get("goodsInnb"))).intValue());
+                            goodsMap.put("goodsOptnInnb", new BigInteger(String.valueOf(goodsMap.get("goodsOptnInnb"))).intValue());
+                            goodsMap.put("dlvyGroupInnb", new BigInteger(String.valueOf(goodsMap.get("dlvyGroupInnb"))).intValue());
+                            goodsMap.put("qy", new BigInteger(String.valueOf(goodsMap.get("qy"))).intValue());
+
+                            goodsMap.put("dscntApplyAmt", new BigInteger(String.valueOf(goodsMap.get("dscntApplyAmt"))).intValue());
+                            goodsMap.put("slepric", new BigInteger(String.valueOf(goodsMap.get("slepric"))).intValue());
+                            goodsMap.put("subSlepric", new BigInteger(String.valueOf(goodsMap.get("subSlepric"))).intValue());
+                            goodsMap.put("dscntAmt", new BigInteger(String.valueOf(goodsMap.get("dscntAmt"))).intValue());
+                            goodsMap.put("mbrInnb", new BigInteger(String.valueOf(goodsMap.get("mbrInnb"))).intValue());
+
+                            itemGoodsList.add(new LinkedHashMap<>(goodsMap));
+
+                        }
+
+                        List<LinkedHashMap> itempPrsntList = new ArrayList<>();
+//                        if(!prsntList.isEmpty()){
+//                            itempPrsntList.add(prsntList.get(i));
+//                            for (LinkedHashMap<String, Object> itemPrsntMap : itempPrsntList) {
+//                                itemPrsntMap.put("qy", qy.intValue());
+//                            }
+//                        }
+
+                        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("dlvylcAreaCd", shipping.get("dlvylcAreaCd"));
+                        dlvyMap.put("cstmclerCd", shipping.get("cstmclerCd"));
+                        dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip"));
+                        dlvyMap.put("prefcd", shipping.get("prefcd"));
+                        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);
+
+                    }
+
+                } // 조건부 무료 or 무료 배송일 경우
+//                dlvyAmtByDlvyGroupList.add(dlvyGroupMap); // 배송그룹별 배송비 목록
+            } // for : dlvyGroupEtry
+
+            // 배송지가 1개 이상이면 여러곳 배송으로 변경
+            if(dlvylcListMulti.size() > 1) {
+                ordrTyCd = "05";
+            }
+
+        } else if ("05".equals(ordrTyCd)) { // 여러곳 배송, 선물하기
+            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();
-        }else{
-            sopmalCd = param.get("sopmalCd").toString();
-        }
-
-        String ordrTyCd = (String) param.get("ordrTyCd");
 
         /* *****************************
             1. 주문등록(GC_ORDER)
@@ -124,10 +570,11 @@ public class BOOrderService {
         /* ***********************************
             4. 주문상품 등록(GC_ORDER_ITEM)
          *********************************** */
-        List<BOOrderItemVO> insertedGoodsList = insertOrdrGoods(sopmalCd, "01", ordrInnb, goodsList);
+        List<BOOrderItemVO> insertedGoodsList = insertOrdrGoods(sopmalCd, "01", ordrInnb, goodsList, subsvcAt);
 
         BOOrderShippingVO shippingEscrowVO = new BOOrderShippingVO();
         if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송
+
             BOOrderShippingVO shippingVO = new BOOrderShippingVO();
 
             shippingVO.setSopmalCd(sopmalCd);
@@ -423,8 +870,17 @@ public class BOOrderService {
                             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);
+                            List<BOOrderItemVO> orderItemVOList = insertedGoodsList.stream().filter(obj-> Objects.equals(ordrInnb, obj.getOrdrInnb()) &&
+                                                                                                          Objects.equals(BigInteger.valueOf(goodsInnb), obj.getGoodsInnb())).toList();
+                            BOOrderItemVO orderItemVO = new BOOrderItemVO();
+                            // 구독서비스 여부(subsvcAt)에 따라 주문상품 취급 방식 분기
+                            if(subsvcAt) {
+                                // 구독서비스	: 동일 상품이라도 순번에 따라 개별 옵션 유지
+                                orderItemVO = orderItemVOList.size() > allGoodsCount ? orderItemVOList.get(allGoodsCount) : null;
+                            } else {
+                                // 일반 주문	: 동일 상품과 옵션은 하나로 병합하여 처리
+                                orderItemVO = orderItemVOList.stream().findAny().orElse(null);
+                            }
 
                             /* ***********************************************
                                 6. 주문 상품 옵션 정보 등록(GC_ORDER_ITEM_OPTION)
@@ -487,7 +943,7 @@ public class BOOrderService {
                                             inputOptnVO.setOptnVal4(optns[3]);
                                         }
 
-                                        itemOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
+                                        inputOptnVO.setOrdrGoodsOptnInnb(orderNoService.generateOrderItemOptnNo());
                                         mapper.insertOrdrGoodsOption(inputOptnVO); // 주문 상품 입력 옵션 정보 등록
                                     }
                                 }
@@ -509,154 +965,6 @@ public class BOOrderService {
 
             }
 
-//            LinkedHashMap prsntMapByOrdrShpping = new LinkedHashMap();
-//            LinkedHashMap tmpQyMap = new LinkedHashMap();
-//
-//            int totOrdrQy = goodsList.stream().mapToInt(obj -> (int) obj.get("qy")).sum();
-//
-//            if ("05".equals(ordrTyCd)) {
-//                int mngrFreeDlvyUseAmt = shipping.values().stream().map(obj-> (LinkedHashMap) obj).mapToInt(obj -> (int) obj.get("mngrFreeDlvyUseAmt")).sum();
-//
-//                if (0 < mngrFreeDlvyUseAmt) {
-//                    BigDecimal dscntAmt = new BigDecimal(StringUtils.hasText((String) enuri.get("enuriAmt")) ? (String) enuri.get("enuriAmt") : "0");
-//
-//                    // enuri.put("enuriAmt", dscntAmt.add(BigDecimal.valueOf(mngrFreeDlvyUseAmt)).toString()); // (2025-02-28) 무료배송시 할인 금액을 애누리에 넣지않고 무료 배송비 여부만 gc_order_shipping 마킹함.
-//                }
-//            }
-
-//            for (String adbkInnb : shipping.keySet()) {
-//                LinkedHashMap shippingMap = (LinkedHashMap) shipping.get(adbkInnb);
-//
-//                BOOrderShippingVO shippingVO = new BOOrderShippingVO();
-//
-//                shippingVO.setSopmalCd(sopmalCd);
-//                shippingVO.setOrdrInnb(ordrInnb);
-//                shippingVO.setAdbkInnb(adbkInnb);
-//                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"); // TODO : 여러곳 배송일 경우 모료배송비 여부 일반주문과 같이 고려 필요 (2025-02-28)
-//
-//                /* *****************************************
-//                    4. 주문배송 정보 등록(GC_ORDER_SHIPPING)
-//                 ***************************************** */
-//                insertShipping(ordrTyCd, shippingMap, shippingVO); // 주문배송 정보 등록
-//                shippingEscrowVO = shippingVO;  //에스크로에 보낼 배송정보  (TODO :: 여러곳배송은 배송지가 여러곳이라 어느 정보일지 결정해야 함. 현재는 1번으로)
-//
-//                BigInteger ordrDlvyInnb = shippingVO.getOrdrDlvyInnb();
-//
-//                List<LinkedHashMap> dlvylcByGoodsList = (List<LinkedHashMap>) shippingMap.get("goodsList");
-//
-//                // 분배된 할인 금액 누적
-//                BOOrderRestAmtVO discountInfo = new BOOrderRestAmtVO();
-//
-//                /* ***********************************************
-//                    5. 주문 상품 옵션 정보 등록(GC_ORDER_ITEM_OPTION)
-//                       주문 상품 입력 옵션 정보 등록
-//                 *********************************************** */
-//                if (!CollectionUtils.isEmpty(dlvylcByGoodsList)) {
-//                    for (int i = 0; i < dlvylcByGoodsList.size(); i++) {
-//                        LinkedHashMap goods = dlvylcByGoodsList.get(i);
-//
-//                        if (!CollectionUtils.isEmpty(goods)) {
-//                            int goodsInnb = (int) goods.get("goodsInnb");
-//                            int goodsOptnInnb = (int) goods.get("goodsOptnInnb");
-//                            int qy = (int) goods.get("qy");
-//                            int ordrQy = (int) goods.get("ordrQy");
-//
-//                            BOOrderItemVO orderItemVO = insertedGoodsList.stream().filter(obj -> Objects.equals(ordrInnb, obj.getOrdrInnb()) &&
-//                                                                                          Objects.equals(BigInteger.valueOf(goodsInnb), obj.getGoodsInnb())).findAny().orElse(null);
-//
-//                            if (orderItemVO != null) {
-//                                int preQy = tmpQyMap.get(String.valueOf(goodsOptnInnb)) != null ? (int) tmpQyMap.get(String.valueOf(goodsOptnInnb)) : 0;
-//                                int subTotQy = (qy + preQy);
-//
-//                                boolean isSubLast = (subTotQy == ordrQy);
-//                                boolean isLast = false;
-//
-//                                if (isSubLast) {
-//                                    int preOrderGoodsQy = tmpQyMap.get(String.valueOf(ordrInnb)) != null ? (int) tmpQyMap.get(String.valueOf(ordrInnb)) : 0;
-//                                    int orderGoodsQy = (subTotQy + preOrderGoodsQy);
-//
-//                                    isLast = (orderGoodsQy == totOrdrQy);
-//
-//                                    tmpQyMap.put(String.valueOf(ordrInnb), subTotQy);
-//                                }
-//
-//                                BOOrderItemOptnVO itemOptnVO = new BOOrderItemOptnVO();
-//
-//                                itemOptnVO.setSopmalCd(sopmalCd);
-//                                itemOptnVO.setOrdrGoodsInnb(orderItemVO.getOrdrGoodsInnb());
-//                                itemOptnVO.setOrdrDlvyInnb(ordrDlvyInnb);
-//                                itemOptnVO.setOrdrSttusCd(orderVO.getOrdrSttusCd());
-//
-//                                setGoodsOptn(sopmalCd, goodsInnb, goodsOptnInnb, qy, itemOptnVO); // 상품 옵션정보 세팅
-//
-//                                setDscntDtls(goodsInnb, goodsOptnInnb, adbkInnb, goodsList, shipping, enuri, itemOptnVO, isSubLast, isLast, discountInfo); // 상품 할인내역 세팅
-//
-//                                if (StringUtils.hasText((String) purchsr.get("mbrId"))) { // 회원
-//                                    setMlgAmt(ordrTyCd, goodsInnb, goodsOptnInnb, qy, goodsList, itemOptnVO); // 상품 마일리지 정보 세팅
-//                                } else {
-//                                    itemOptnVO.setMlgAccmlUnit(new BigDecimal(0)); // 마일리지적립금액(개당)
-//                                    itemOptnVO.setMlgAccmlRest(new BigDecimal(0)); // 마일리지적립금액(짜투리)
-//                                }
-//
-//                                mapper.insertOrdrGoodsOption(itemOptnVO); // 주문 상품 옵션 정보 등록
-//
-//                                tmpQyMap.put(String.valueOf(goodsOptnInnb), qy);
-//
-//                                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("0"); // 주문상태(99:결제실패)
-//                                        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]);
-//                                        }
-//
-//                                        mapper.insertOrdrGoodsOption(inputOptnVO); // 주문 상품 입력 옵션 정보 등록
-//                                    }
-//                                }
-//                            }
-//                        }
-//                    }
-//
-//                    List<LinkedHashMap> prsntListByOrdrShpping = (List<LinkedHashMap>) shippingMap.get("prsntList");
-//
-//                    if (!CollectionUtils.isEmpty(prsntListByOrdrShpping)) {
-//                        prsntMapByOrdrShpping.put(ordrDlvyInnb.toString(), prsntListByOrdrShpping); // 주문배송 별 사은품 정보 등록
-//                    }
-//                } else {
-//                    throw new WnbtRestException("배송지별 주문상품정보를 찾을 수 없습니다.");
-//                }
-//            }
-
-            /* *****************************************************
-                6. 주문 상품 옵션(사은품) 정보 등록(GC_ORDER_ITEM_OPTION)
-             ***************************************************** */
-//            if (!CollectionUtils.isEmpty(prsntMapByOrdrShpping)) {
-//                insertPrsntByOrdrShpping(sopmalCd, ordrInnb, prsntMapByOrdrShpping);
-//            }
         }
 
         // mapper.updateUsefulInvntryQy(orderVO); // 가용제고수량 수정 ( 주석 처리자 : 추지훈 :: 주문 등록할때 재고떨고 결제될때 또 재고 떨어서 주석처리함 )
@@ -668,6 +976,9 @@ public class BOOrderService {
          ***************************************** */
         BOOrderSetleVO setleVO = insertSetle(orderVO, setle, insertedGoodsList, enuri, purchsr); // 결제 정보 등록
 
+        // 결제금액 원화로 변경
+//        setleVO.setSetleAmt(setleVO.getWonSetleAmt());
+
         content.put("ordr", orderVO);
         content.put("setle", setleVO);
         content.put("shipping", shippingEscrowVO);
@@ -750,7 +1061,14 @@ public class BOOrderService {
      * @return
      */
     public List<BOOrderItemVO> insertOrdrGoods(String sopmalCd, String goodsKndCd, BigInteger ordrInnb, List<LinkedHashMap> goodsList) {
-        List<Integer> goodsInnbList = (goodsList.stream().map(obj-> (int) obj.get("goodsInnb")).toList()).stream().distinct().toList(); // 상품번호 목록(중복제거)
+        return insertOrdrGoods(sopmalCd, goodsKndCd, ordrInnb, goodsList, false);
+    }
+    public List<BOOrderItemVO> insertOrdrGoods(String sopmalCd, String goodsKndCd, BigInteger ordrInnb, List<LinkedHashMap> goodsList, Boolean subsvcAt) {
+        Stream<Integer> goodsInnbstream = goodsList.stream().map(obj -> (int) obj.get("goodsInnb"));
+        if(!subsvcAt) // 상품번호 목록(중복제거)
+            goodsInnbstream = goodsInnbstream.distinct();
+        List<Integer> goodsInnbList = goodsInnbstream.toList();
+
         boolean tmAt = goodsList.stream().anyMatch(map -> map.containsKey("tmAt")); //tm주문 여부
         List<BOOrderItemVO> insertedGoodsList = new ArrayList<>(); // 주문상품 목록
 
@@ -776,6 +1094,7 @@ public class BOOrderService {
                     itemVO.setGoodsKndCd((String) goods.get("goodsKndCd"));
                     itemVO.setGoodsImgCours((String) goods.get("goodsImgWithoutHostImage"));
                     itemVO.setGoodsNm((String) goods.get("goodsNm"));
+                    itemVO.setGoodsNmEn((String) goods.get("goodsNmEn"));
                     itemVO.setTaxtTrgetAt((String) goods.get("taxtTrgetAt"));
                     itemVO.setSubscrptWthdrawPosblAt((String) goods.get("subscrptWthdrawPosblAt"));
                     itemVO.setIndvdlzCanclPosblAt((String) goods.get("indvdlzCanclPosblAt"));
@@ -924,11 +1243,13 @@ public class BOOrderService {
         BOOrderSetleVO setleVO = new BOOrderSetleVO();
 
         BigDecimal rlSetleAmt = new BigDecimal((String) setle.get("rlSetleAmt"));
+        BigDecimal wonRlSetleAmt = new BigDecimal((String) setle.get("wonRlSetleAmt"));
 
         setleVO.setSopmalCd(sopmalCd);
         setleVO.setOrdrInnb(ordrInnb);
         setleVO.setGoodsNm(goodsNm);
         setleVO.setSetleAmt(rlSetleAmt);
+        setleVO.setWonSetleAmt(wonRlSetleAmt);
 
         String pgCmpnyNm = (String) setle.get("pgCmpnyNm");
         String setleTyCd = (String) setle.get("setleTyCd");
@@ -949,7 +1270,7 @@ public class BOOrderService {
             setleVO.setPgCmpnyNm("");
         }
 
-        if (StringUtils.hasText((String) purchsr.get("mbrId"))) { // GC머니는 회원만 적용
+        if (StringUtils.hasText((String) purchsr.get("mbrId")) && orderVO.getSubsvcInnb() == null) { // GC머니는 회원만 적용
             // GC 머니 사용했을 경우 여부, 금액 세팅 ( 결제유형과는 무관 )
             Object useCashMlgAmt = enuri.get("useCashMlgAmt"); // 사용 GC 머니
             if (useCashMlgAmt != null) {
@@ -1223,6 +1544,9 @@ public class BOOrderService {
             shippingVO.setRecpntTelnb((String) shipping.get("recpntTelnb"));
             shippingVO.setRecpntMbtlnb((String) shipping.get("recpntMbtlnb"));
 
+            shippingVO.setDlvylcAreaCd((String) shipping.get("dlvylcAreaCd"));
+            shippingVO.setCstmclerCd((String) shipping.get("cstmclerCd"));
+            shippingVO.setPrefcd((String) shipping.get("prefcd"));
             shippingVO.setDlvylcZip((String) shipping.get("dlvylcZip"));
             shippingVO.setDlvylcAdresDvCd((String) shipping.get("dlvylcAdresDvCd"));
             shippingVO.setDlvylcLnbAdres((String) shipping.get("dlvylcLnbAdres"));
@@ -1261,6 +1585,9 @@ public class BOOrderService {
             shippingVO.setRecpntTelnb(StringUtil.isNullToString(shipping.get("recpntTelnb")));
             shippingVO.setRecpntMbtlnb(StringUtil.isNullToString(shipping.get("recpntMbtlnb")));
 
+            shippingVO.setDlvylcAreaCd(StringUtil.isNullToString(shipping.get("dlvylcAreaCd")));
+            shippingVO.setCstmclerCd(StringUtil.isNullToString(shipping.get("cstmclerCd")));
+            shippingVO.setPrefcd(StringUtil.isNullToString(shipping.get("prefcd")));
             shippingVO.setDlvylcZip(StringUtil.isNullToString(shipping.get("dlvylcZip")));
             shippingVO.setDlvylcAdresDvCd(StringUtil.isNullToString(shipping.get("dlvylcAdresDvCd")));
             shippingVO.setDlvylcLnbAdres(StringUtil.isNullToString(shipping.get("dlvylcLnbAdres")));
@@ -1486,6 +1813,17 @@ public class BOOrderService {
                 orderVO.setRlSetleAmt(new BigDecimal(rlSetleAmt));
             }
 
+            String wonRlSetleAmt = (String) setle.get("wonRlSetleAmt"); // 실결제금액(원화)
+
+            if (StringUtils.hasText(wonRlSetleAmt)) {
+                orderVO.setWonRlSetleAmt(new BigDecimal(wonRlSetleAmt));
+            }
+
+            DataMap paramMap = new DataMap();
+            paramMap.put("sopmalCd", orderVO.getSopmalCd());
+            BigDecimal buyRate = boOrdrMapper.selectBuyRate(paramMap); // 살때환율
+            orderVO.setBuyRate(buyRate);
+
             String setleTyCd = (String) setle.get("setleTyCd");
 
             if ("02".equals(setleTyCd)) { //|| "04".equals(setleTyCd) || "05".equals(setleTyCd)) { // KCP 무통장, 가상계좌, 가상계좌(에스크로) leeks
@@ -1506,6 +1844,11 @@ public class BOOrderService {
                 orderVO.setMngrId((String) setle.get("mngrId")); // 관리자ID
                 orderVO.setMngrNm((String) setle.get("mngrNm")); // 관리자명
             }
+
+            if (setle.containsKey("subsvcInnb")) { // 구독서비스 고유번호
+                int subsvcInnb = (Integer) setle.get("subsvcInnb");
+                orderVO.setSubsvcInnb(subsvcInnb);
+            }
         } else {
             orderVO.setOrdrSttusCd("0");
             orderVO.setUseAt("Y");
@@ -1580,6 +1923,10 @@ public class BOOrderService {
             itemOptnVO.setOptnCd2((String) goodsOptn.get("optnCd2"));
             itemOptnVO.setOptnCd3((String) goodsOptn.get("optnCd3"));
             itemOptnVO.setOptnCd4((String) goodsOptn.get("optnCd4"));
+            itemOptnVO.setHscode((String) goodsOptn.get("hscode"));
+            itemOptnVO.setRealWt((BigDecimal) goodsOptn.get("realWt"));
+            itemOptnVO.setVolWt((BigInteger) goodsOptn.get("volWt"));
+            itemOptnVO.setPackageCnt((Integer) goodsOptn.get("packageCnt"));
             itemOptnVO.setOptnInfo((String) goodsOptn.get("optnInfo"));
             itemOptnVO.setCnsmrpric((BigDecimal) goodsOptn.get("cnsmrpric")); // 소비자가
             itemOptnVO.setSlepric((BigDecimal) goodsOptn.get("slepric")); // 판매가

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);
@@ -1836,6 +1837,8 @@ public class BOPurchsService {
     public Map<String, Object> selectSetleExpectAmt(DataMap param) {
         Map<String, Object> content = new HashMap<>();
 
+        log.debug("BOPurchsService.selectSetleExpectAmt-param : {}", param);
+
         String sopmalCd = (String) param.get("sopmalCd");
 
         LinkedHashMap setleExpectAmtMap = new LinkedHashMap(){{
@@ -1854,6 +1857,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 +1927,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 +1952,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 +1963,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 +2109,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); // 실 최종 배송비
 
@@ -2171,45 +2177,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 cntCndUseAt = (String) shippingGrouping.get("cntCndUseAt"); // 수량조건
+//                        String amtCndUseAt = (String) shippingGrouping.get("amtCndUseAt"); // 금액조건
+//                        String cntCndUseAt = (String) shippingGrouping.get("cntCndUseAt"); // 수량조건
 
                         for (DataMap goodsMap : goodsByDlvyGroupList) {
 
-                            BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량
+//                            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) {
+                                if (slepric.compareTo(amtCndAditAmt) >= 0) {
                                     dlvyAmt = new BigDecimal(0);
-                                } else {
-                                    //배송비 합(같은상품 수량당 배송비 책정)
-                                    dlvyAmt = dlvyAmt.multiply(qy);
                                 }
+//                                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) {
+                                if (qy.compareTo(cntCndAditAmt) >= 0) {
                                     dlvyAmt = new BigDecimal(0);
-                                } else {
-                                    //배송비 합(같은상품 수량당 배송비 책정)
-                                    dlvyAmt = dlvyAmt.multiply(qy);
                                 }
+//                                else {
+//                                    //배송비 합(같은상품 수량당 배송비 책정)
+//                                    dlvyAmt = dlvyAmt.multiply(qy);
+//                                }
                             }
                         }
 
@@ -2268,29 +2294,69 @@ public class BOPurchsService {
 
                     } else if ("03".equals(dlvyGroupDvCd)) { // 유료배송
 
-                        BigDecimal goodsQy = new BigDecimal(0);
-                        // 유료배송비 합(같은상품 수량당 배송비 책정)
-                        for (DataMap goodsMap : goodsByDlvyGroupList) {
-                            goodsQy = (BigDecimal) goodsMap.get("qy");
-                            dlvyAmt = dlvyAmt.multiply(goodsQy);
+                        if("KR".equals(dlvylcAreaCd) || "JP".equals(dlvylcAreaCd)) {
 
-                            paidDlvyAmt = paidDlvyAmt.add(dlvyAmt);
-                        }
-                        // 유료배송비 합(같은상품 묶음 처리)
-                        //paidDlvyAmt = paidDlvyAmt.add(dlvyAmt);
+                            BigDecimal goodsQy = new BigDecimal(0);
 
-                        if (!StringUtils.isEmpty(dlvyAreaAditAt) && "Y".equals(dlvyAreaAditAt)) {
-                            if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
-                                addPaidDlvyAmt = addPaidDlvyAmt.add(areaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
+                            // 수량 조건
+                            if ("Y".equals(cntCndUseAt) && cntCndAditAmt.compareTo(BigDecimal.ZERO) > 0) {
+
+                                for (DataMap goodsMap : goodsByDlvyGroupList) {
+
+                                    BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량
+
+                                    qy = (BigDecimal) goodsMap.get("qy"); // 수량
+
+                                    //  cntCndAditAmt(설정수량)보다 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); // 유료 배송 도서산간 추가 배송비
+                                            }
+                                        }
+                                    }
+                                }   //for
+                            } else {
+                                //수량 조건 없는 경우
+                                paidDlvyAmt = paidDlvyAmt.add(dlvyAmt); // 유료배송비 합
+
+                                // 추가배송비 계산
+                                if (!StringUtils.isEmpty(dlvyAreaAditAt) && "Y".equals(dlvyAreaAditAt)) {
+                                    if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
+                                        addPaidDlvyAmt = addPaidDlvyAmt.add(areaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
+                                    }
+                                }
                             }
+
+                        } 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);
                     }};
 
@@ -2453,7 +2519,7 @@ public class BOPurchsService {
                                 BigDecimal amtCndAditAmt = (BigDecimal) shippingGrouping.get("amtCndAditAmt"); // 금액조건 추가금액
                                 BigDecimal slepric = (BigDecimal) goodsMap.get("subSlepric"); // 판매가 * 수량
 
-                                if (slepric.compareTo(amtCndAditAmt) > 0) {
+                                if (slepric.compareTo(amtCndAditAmt) >= 0) {
                                     dlvyAmt = new BigDecimal(0);
                                 }
                             }
@@ -2462,7 +2528,7 @@ public class BOPurchsService {
                                 BigInteger cntCndAditAmt = (BigInteger) shippingGrouping.get("cntCndAditAmt"); // 금액조건 추가금액
                                 BigInteger qy = (BigInteger) goodsMap.get("qy"); // 수량
 
-                                if (cntCndAditAmt.intValue() < qy.intValue()) {
+                                if (cntCndAditAmt.intValue() <= qy.intValue()) {
                                     dlvyAmt = new BigDecimal(0);
                                 }
                             }
@@ -2478,7 +2544,7 @@ public class BOPurchsService {
                                 if (bundleDlvyCndAmt != null && bundleDlvyCndAmt.intValue() > 0) {
                                     BigDecimal subSlepric = goodsByDlvyGroupList.stream().map(o -> (BigDecimal) o.get("subSlepric")).reduce(BigDecimal.ZERO, BigDecimal::add); // 합 (판매가 * 수량)
 
-                                    if (subSlepric.compareTo(bundleDlvyCndAmt) > 0) {
+                                    if (subSlepric.compareTo(bundleDlvyCndAmt) >= 0) {
                                         dlvyAmt = new BigDecimal(0);
                                     }
                                 }

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

@@ -142,6 +142,14 @@ public class BOOrderItemOptnVO extends AbstractVO {
 
     private BigDecimal step85 = new BigDecimal(0);
 
+    private String hscode;
+
+    private BigDecimal realWt;
+
+    private BigInteger volWt;
+
+    private Integer packageCnt;
+
     private String restUpdtDv;
 
     private BigDecimal updtRestAmt = new BigDecimal(0);

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

@@ -23,6 +23,8 @@ public class BOOrderItemVO extends AbstractVO {
 
     private String goodsNm;
 
+    private String goodsNmEn;
+
     private String goodsKndCd;
 
     private String taxtTrgetAt;

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

@@ -20,6 +20,8 @@ public class BOOrderSetleVO extends AbstractVO {
 
     private BigDecimal setleAmt;
 
+    private BigDecimal wonSetleAmt;
+
     private String pgCmpnyNm;
 
     private String setleTyCd;

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

@@ -26,8 +26,14 @@ public class BOOrderShippingVO extends AbstractVO {
 
     private String recpntMbtlnb;
 
+    private String dlvylcAreaCd;
+
+    private String cstmclerCd;
+
     private String dlvylcZip;
 
+    private String prefcd;
+
     private String dlvylcAdresDvCd;
 
     private String dlvylcLnbAdres;

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

@@ -40,7 +40,11 @@ public class BOOrderVO extends AbstractVO {
 
     private BigDecimal rlSetleAmt = new BigDecimal("0");
 
-    private BigDecimal enuriAmt = new BigDecimal("0");;
+    private BigDecimal enuriAmt = new BigDecimal("0");
+
+    private BigDecimal wonRlSetleAmt = new BigDecimal("0");
+
+    private BigDecimal buyRate = new BigDecimal("0");
 
     private String ordrrNm;
 
@@ -141,4 +145,6 @@ public class BOOrderVO extends AbstractVO {
     private String secretKey;
 
     private String currOrdrSttusCd;
+
+    private Integer subsvcInnb;
 }

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

@@ -30,4 +30,13 @@ public interface BOSubsvcMapper {
 	void insertBOMngrSubsvc(BOSubsvcVO vo);
 	/** 관리자 구독서비스 명 중복체크*/
 	int selectBOMngrSubsvcNmDupCheck(BOSubsvcVO vo);
+
+	/** 구독서비스 주문에 따른 판매재고수량 수정*/
+	public void updateSubsvcOrdrUsefulInvntryQy(BOSubsvcVO vo);
+	/** 구독서비스 환불에 따른 판매재고수량 수정*/
+	public void updateSubsvcRefundUsefulInvntryQy(BOSubsvcVO vo);
+	/** 구독서비스 주문취소에 따른 판매재고수량 수정*/
+	public void updateSubsvcCancelOrderUsefulInvntryQy(BOSubsvcVO vo);
+	/** 판매재고수량 변경에 따른 구독서비스 상태 수정*/
+	public void updateInvntryPolicySubsvcSttusChng(BOSubsvcVO vo);
 }

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

@@ -1,13 +1,15 @@
 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.domain.gcone.ordr.ordr.vo.BOOrdrVO;
 import com.wb.domainserver.util.dataaccess.DataMap;
 import io.micrometer.common.util.StringUtils;
 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.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -137,4 +139,51 @@ public class BOSubsvcService {
 		return message;
 	}
 
+	/**
+	 * 주문에 따른 판매재고수량 수정
+	 * @param ordrVO
+	 * @return
+	 */
+	@Transactional
+	public void updateSubsvcOrdrUsefulInvntryQy(BOOrdrVO ordrVO) throws Exception {
+		BOSubsvcVO subsvcVO = new BOSubsvcVO();
+		BeanUtils.copyProperties(ordrVO, subsvcVO);
+
+		//판매수량 수정
+		mapper.updateSubsvcOrdrUsefulInvntryQy(subsvcVO);
+		//구독서비스 상태 수정
+		mapper.updateInvntryPolicySubsvcSttusChng(subsvcVO);
+	}
+
+	/**
+	 * 환불에 따른 판매재고수량 수정
+	 * @param ordrVO
+	 * @return
+	 */
+	@Transactional
+	public void updateSubsvcRefundUsefulInvntryQy(BOOrdrVO ordrVO) throws Exception {
+		BOSubsvcVO subsvcVO = new BOSubsvcVO();
+		BeanUtils.copyProperties(ordrVO, subsvcVO);
+
+		//판매수량 수정
+		mapper.updateSubsvcRefundUsefulInvntryQy(subsvcVO);
+		//구독서비스 상태 수정
+		mapper.updateInvntryPolicySubsvcSttusChng(subsvcVO);
+	}
+
+	/**
+	 * 주문취소에 따른 판매재고수량 수정
+	 * @param ordrVO
+	 * @return
+	 */
+	@Transactional
+	public void updateSubsvcCancelOrderUsefulInvntryQy(BOOrdrVO ordrVO) throws Exception {
+		BOSubsvcVO subsvcVO = new BOSubsvcVO();
+		BeanUtils.copyProperties(ordrVO, subsvcVO);
+
+		//판매수량 수정
+		mapper.updateSubsvcCancelOrderUsefulInvntryQy(subsvcVO);
+		//구독서비스 상태 수정
+		mapper.updateInvntryPolicySubsvcSttusChng(subsvcVO);
+	}
 }

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

@@ -4,6 +4,7 @@ import com.wb.domainserver.domain.comm.vo.AbstractVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigInteger;
 import java.util.List;
 
 @Data
@@ -12,14 +13,14 @@ 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 subsvcInnb;
 	/** 구독서비스기수 */
 	private String subsvcGnr;
 	/** 구독서비스명 다음기수 */
@@ -37,11 +38,13 @@ private static final long serialVersionUID = 1L;
 	/** 소비자가 */
 	private String cnsmrpric;
 	/** 판매가 */
-	private String slepric;
+	private Integer slepric;
 	/** 재고수량 */
 	private String invntryQy;
 	/** 판매재고수량 */
 	private String usefulInvntryQy;
+	/** 판매수량 초기화여부*/
+	private String usefulInvntryQyInit;
 	/** 재고정책 */
 	private String invntryPolicyCd;
 	/** 가용재고제한수량 */
@@ -99,4 +102,62 @@ private static final long serialVersionUID = 1L;
 	private String sortDv;
 	/** 배열 구독서비스고유번호  */
 	private List<String> arrSubsvcInnb;
+
+
+	/** 결제정보 */
+	/** 회원고유번호 */
+	private Integer mbrInnb;
+	/** 회원구분코드 */
+	private String mbrDvCd;
+	/** 주문고유번호 */
+	private String ordrInnb;
+
+
+	/** 결제상품정보 */
+	/** 판매상품 고유번호 */
+	private Integer goodsInnb;
+	/** 상품옵션 고유번호 */
+	private Integer goodsOptnInnb;
+	/** 개수 */
+	private Integer qy;
+	/** 입력옵션 텍스트 */
+	private String inputOptn;
+	/** 입력옵션 텍스트 */
+	private String inputOptnText;
+	/** 배송그룹고유번호 */
+	private Integer dlvyGroupInnb;
+	/** 상품상태코드 */
+	private String goodsSttusCd;
+	/** 상품상태명 */
+	private String goodsSttusNm;
+	/** 상품명 */
+	private String goodsNm;
+	/** 상품옵션 타입 */
+	private String optnTy;
+	/** 옵션관계번호 */
+	private String optnRelateNb;
+	/** 복수할인여부 */
+	private String compnbDscntAt;
+	/** 구간할인여부 */
+	private String sctnDscntAt;
+	/** 옵션필수여부 */
+	private String optnEssntlAt;
+	/** 소비자가 합계 (형식적용) */
+	private String subCnsmrpricByFormat;
+	/** 소비자가 합계 */
+	private Integer subCnsmrpric;
+	/** 소비자가 (형식적용) */
+	private String cnsmrpricByFormat;
+	/** 옵션주문단가 × 옵션주문수량 (형식적용) */
+	private String subSlepricByFormat;
+	/** 옵션주문단가 × 옵션주문수량 */
+	private Integer subSlepric;
+	/** 할인금액 */
+	private Integer dscntAmt;
+	/** 할인적용금액 */
+	private Integer dscntApplyAmt;
+	/** 판매가 합계  (형식적용) */
+	private String slepricByFormat;
+	/** 상품이미지경로 */
+	private String goodsImgCours;
 }

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

@@ -101,6 +101,11 @@ public class BOMbrService {
 
         List<DataMap> resultList = null;
         Map<String, Object> resultMap = new HashMap<>();
+
+        BOMaComncdVO comncdVO = new BOMaComncdVO();
+        comncdVO.setGroupCd("SRCH_DV");
+        bOMbrSrchVO.setSrchDv((String) selectCommCode(comncdVO).get(0).get("cd"));
+
         // 건수 조회
         Integer totCnt = mapper.selectBOMbrListTotCnt(bOMbrSrchVO);
         // 건수 갯수 페이징vo에 set

src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/vo/BOMbrSrchVO.java

@@ -26,35 +26,38 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BOMbrSrchVO extends AbstractVO {
-	 private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 	/**검색어 구분*/
-	 private String srchKywordDv;
+	private String srchKywordDv;
 
-	 /**검색어 키워드*/
-	 private String srchKyword;
+	/**검색어 키워드*/
+	private String srchKyword;
 
-	 /*검색어 이름*/
-	 private String srchMbrNm;
+	/*검색어 이름*/
+	private String srchMbrNm;
 
-	 /*검색어 아이디*/
-	 private String srchKywordID;
+	/*검색어 아이디*/
+	private String srchKywordID;
 
-	 /*검색어 이메일*/
-	 private String srchKywordEmail;
+	/*검색어 이메일*/
+	private String srchKywordEmail;
 
-	 /*검색어 휴대폰번호*/
-	 private String srchKywordMb;
+	/*검색어 휴대폰번호*/
+	private String srchKywordMb;
 
-	 /*회원고유번호*/
+	/*회원고유번호*/
 	private String srchMbrInnb;
 
-	 /**정렬 방식*/
-	 private String sortDv;
+	/**검색조건 비교 방식*/
+	private String srchDv;
+
+	/**정렬 방식*/
+	private String sortDv;
 
 	/**쇼핑몰코드*/
-	 private String sopmalCd;
+	private String sopmalCd;
 
-	 /*회원 구분 코드*/
+	/*회원 구분 코드*/
 	private String srchMbrDvCd;
 
 	/*요청 페이지 구분 mngr인지 integ인지*/
@@ -193,4 +196,7 @@ public class BOMbrSrchVO extends AbstractVO {
 	/*회원구분코드*/
 	private String mbrDvCd;
 
+	/*마케팅 동의 팝업 읽기모드 여부*/
+	private String readonlyAt;
+
 }

src/main/java/com/wb/domainserver/domain/gcone/ntcn/mssage/vo/BOMssageVO.java

@@ -156,4 +156,11 @@ public class BOMssageVO extends AbstractVO {
     /** 메세지 취소 구분코드 */
     private String cancelDvCd;
 
+    /** 셋팅용 파라미터 tab구분
+     * send : 메시지수동바송
+     * search : 메시지 발송내역*/
+    private String reqTab;
+
+    /** 셋팅용 파라미터 받는사람 휴대전화번호*/
+    private String mbtlnb;
 }

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/dlivy/mapper/BODlivyMapper.java

@@ -161,6 +161,14 @@ public interface BODlivyMapper {
 	public List<BODlivyVO> selectBOOrdrDlvyDtlsInqireGroupOrdr(BODlivyVO boDlivyVO);
 
 
+	/**
+	 * 주문 배송 추적 조회 : 송장번호 조회
+	 * @param boDlivyVO
+	 * @return
+	 */
+	public String selectBOOrdrInvcnb(BODlivyVO boDlivyVO);
+
+
 	/**
 	 * 출고 상태 '상품 준비' or '배송중' 되돌리기 / 출고 상태 변경 단건
 	 * @param dlivyVO

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

@@ -1,59 +1,40 @@
 package com.wb.domainserver.domain.gcone.ordr.dlivy.service;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.wb.domainserver.domain.admin.store.sopmal.vo.BOShopSetupVO;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.wb.domainserver.domain.gcone.common.service.BOCommonService;
 import com.wb.domainserver.domain.gcone.goods.purchs.mapper.BOPurchsMapper;
 import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOOrderLogVO;
 import com.wb.domainserver.domain.gcone.mbr.mlg.service.BOMlgService;
 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.atmcrcpmny.vo.BOAtmcRcpmnyCnfirmVO;
+import com.wb.domainserver.domain.gcone.ordr.dlivy.mapper.BODlivyMapper;
 import com.wb.domainserver.domain.gcone.ordr.dlivy.vo.*;
 import com.wb.domainserver.domain.gcone.ordr.ordr.mapper.BOOrdrMapper;
 import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrService;
-import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrLogVO;
 import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrShippingVO;
 import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrVO;
 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.service.BORtngudrefndService;
 import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.exception.code.ErrorCode;
+import com.wb.domainserver.util.dataaccess.DataMap;
 import com.wb.domainserver.util.string.StringUtil;
 import io.micrometer.common.util.StringUtils;
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Marshaller;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.wb.domainserver.domain.gcone.ordr.dlivy.mapper.BODlivyMapper;
-import com.wb.domainserver.util.dataaccess.DataMap;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
+import org.springframework.web.client.RestTemplate;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -83,6 +64,9 @@ public class BODlivyService {
 	@Autowired
 	BORtngudrefndService boRtngudrefndService;
 
+	@Autowired
+	private BOCommonService boCommonService;
+
 
 	/* ####################################
 	    출고 리스트 서비스 시작
@@ -494,6 +478,167 @@ public class BODlivyService {
 		return contents;
 	}
 
+	/**
+	 * ACI Key 발급 API
+	 * @param
+	 * @return List<DataMap>
+	 */
+	public DataMap selectBOAciKey() throws WnbtRestException {
+		String apiKey = boCommonService.selectAciApiKey();
+		DataMap message = new DataMap();
+
+		try {
+			HttpHeaders headers = new HttpHeaders();
+			headers.setContentType(MediaType.APPLICATION_JSON);
+			headers.set("USERID", "UNIHAN");
+			headers.set("APIKEY", apiKey);
+
+			Map<String, Object> body = new HashMap<>();
+
+			HttpEntity<String> apiRequest =
+					new HttpEntity<>("{}", headers);
+
+			RestTemplate restTemplate = new RestTemplate();
+			ResponseEntity<String> response = restTemplate.exchange(
+					"https://acieshop.com/api/kr/token/",
+					HttpMethod.POST,
+					apiRequest,
+					String.class
+			);
+
+			ObjectMapper objectMapper = new ObjectMapper();
+			JsonNode jsonNode = objectMapper.readTree(response.getBody());
+
+			message.put("status", jsonNode.get("Status").asText());
+			message.put("aciKey", jsonNode.get("ACIKey").asText());
+			message.put("errMsg", jsonNode.get("ErrMsg").asText());
+		}catch (WnbtRestException wre){
+			log.error(wre.getMessage());
+			throw wre;
+		}catch (RuntimeException re){
+			log.error(re.getMessage());
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
+		}catch (Exception e) {
+			log.error(e.getMessage(), e);
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
+		}
+
+		return message;
+	}
+
+	/**
+	 * 화물 추적 - 운송장 조회 API
+	 * @param boDlivyVO
+	 * @return List<DataMap>
+	 */
+	public DataMap updateBOAciDelivery(BODlivyVO boDlivyVO) throws WnbtRestException {
+		DataMap aciMap = selectBOAciKey();
+		String aciKey = String.valueOf(aciMap.get("aciKey"));
+		DataMap message = new DataMap();
+
+		try {
+			HttpHeaders headers = new HttpHeaders();
+			headers.setContentType(MediaType.APPLICATION_JSON);
+			headers.set("USERID", "UNIHAN");
+			headers.set("ACIKey", aciKey);
+
+			Map<String, Object> body = new HashMap<>();
+			body.put("BLNO", List.of(mapper.selectBOOrdrInvcnb(boDlivyVO)));
+
+			HttpEntity<Map<String, Object>> apiRequest =
+					new HttpEntity<>(body, headers);
+
+			RestTemplate restTemplate = new RestTemplate();
+			ResponseEntity<String> response = restTemplate.exchange(
+					"https://acieshop.com/api/kr/pod/v1.5/",
+					HttpMethod.POST,
+					apiRequest,
+					String.class
+			);
+
+			ObjectMapper objectMapper = new ObjectMapper();
+			JsonNode jsonNode = objectMapper.readTree(response.getBody());
+
+			message.put("status", jsonNode.get("Status").asText());
+			JsonNode podInfoNode = jsonNode.get("PODInfo");
+			if(!podInfoNode.isNull()) {
+				List<DataMap> podInfoList = new ArrayList<>();
+				for(JsonNode podInfoItem : podInfoNode) {
+					DataMap PODInfo = new DataMap();
+					PODInfo.put("blno", podInfoItem.get("BLNO").asText());
+					PODInfo.put("dateLocalwhin", podInfoItem.get("DATE_LOCALWHIN").asText());
+					PODInfo.put("dateLocaldeparture", podInfoItem.get("DATE_LOCALDEPARTURE").asText());
+					PODInfo.put("dateIcnarrival", podInfoItem.get("DATE_ICNARRIVAL").asText());
+					PODInfo.put("dateCustomes", podInfoItem.get("DATE_CUSTOMES").asText());
+					PODInfo.put("dateDelivery", podInfoItem.get("DATE_DELIVERY").asText());
+					PODInfo.put("recipient", podInfoItem.get("RECIPIENT").asText());
+					PODInfo.put("wta", podInfoItem.get("WTA").asText());
+					PODInfo.put("wtdan", podInfoItem.get("WTDAN").asText());
+
+					List<DataMap> volumeList = new ArrayList<>();
+					for(JsonNode volumeItem : podInfoItem.get("VOLUME")) {
+						DataMap volume = new DataMap();
+						volume.put("width", volumeItem.get("WIDTH").asText());
+						volume.put("length", volumeItem.get("LENGTH").asText());
+						volume.put("height", volumeItem.get("HEIGHT").asText());
+
+						volumeList.add(volume);
+					}
+					PODInfo.put("volume", volumeList);
+
+					List<List> customsList = new ArrayList<>();
+					for(JsonNode customsItem : podInfoItem.get("CUSTOMS")) {
+						List<DataMap> customDetail = new ArrayList<>();
+						for(JsonNode customItem : customsItem) {
+							DataMap Custom = new DataMap();
+							Custom.put("dateEvent", customItem.get("DATE_EVENT").asText());
+							Custom.put("traceStatus", customItem.get("TRACE_STATUS").asText());
+
+							customDetail.add(Custom);
+						}
+						customsList.add(customDetail);
+					}
+					PODInfo.put("customs", customsList);
+
+					List<DataMap> localPodList = new ArrayList<>();
+					for(JsonNode localPodItem : podInfoItem.get("LOCAL_POD")) {
+						DataMap localPod = new DataMap();
+						localPod.put("traceStatus", localPodItem.get("TRACE_STATUS").asText());
+						localPod.put("dateEvent", localPodItem.get("DATE_EVENT").asText());
+						localPod.put("position", localPodItem.get("POSITION").asText());
+
+						localPodList.add(localPod);
+					}
+					PODInfo.put("localPod", localPodList);
+
+					podInfoList.add(PODInfo);
+				}
+				message.put("podInfo", podInfoList);
+			} else {
+				message.put("errMsg", jsonNode.get("ErrMsg").asText());
+			}
+		}catch (WnbtRestException wre){
+			log.error(wre.getMessage());
+			throw wre;
+		}catch (RuntimeException re){
+			log.error(re.getMessage());
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
+		}catch (Exception e) {
+			log.error(e.getMessage(), e);
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
+		}
+
+		return message;
+	}
+
+	/**
+	 * 송장번호 조회
+	 * @param boDlivyVO
+	 * @return List<DataMap>
+	 */
+	public String selectBOOrdrInvcnb(BODlivyVO boDlivyVO) throws WnbtRestException {
+		return mapper.selectBOOrdrInvcnb(boDlivyVO);
+	}
 
 
 	/**

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

@@ -9,6 +9,7 @@ import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOGoodsVO;
 import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOOrderItemOptnVO;
 import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOOrderSetleVO;
 import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOOrderVO;
+import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
 import com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrAppnVO;
 import com.wb.domainserver.domain.gcone.ordr.ordr.vo.*;
 
@@ -335,6 +336,8 @@ public interface BOOrdrMapper {
      */
     public List<DataMap> selectOrderShippingList(BOOrdrShippingVO ordrShippingVO);
 
+    public List<DataMap> selectOrderShippingListGrp(BOOrdrShippingVO ordrShippingVO);
+
     /**
      * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 상품 목록 조회
      * @param paramMap
@@ -349,6 +352,13 @@ public interface BOOrdrMapper {
      */
     public List<DataMap> selectRefundShippingGoodsList(DataMap paramMap);
 
+    /**
+     * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정 > 배송지정보 일치여부 확인
+     * @param ordrShippingVO
+     * @return Integer
+     */
+    public Integer selectDlvylcAreaCdInfo(BOOrdrShippingVO ordrShippingVO);
+
     /**
      * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정
      * @param ordrShippingVO
@@ -487,6 +497,40 @@ public interface BOOrdrMapper {
        관리자 > 주문 > 주문관리 > 다운로드항목설정 종료
        #################################### */
 
+	/* ####################################
+	   관리자 > 주문 > 주문관리 > 발주서 관리 시작
+	   #################################### */
+	/**
+	 * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 발주서 건수
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public Integer selectExcelListPurchOrderTotCnt(BOOrdrSrchVO ordrSrchVO);
+
+	/**
+	 * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 발주서 목록 조회
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public List<DataMap> selectExcelListPurchOrder(BOOrdrSrchVO ordrSrchVO);
+
+	/**
+	 * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 발주서 엑셀다운로드
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public List<DataMap> selectExcelPoListDwld(BOOrdrSrchVO ordrSrchVO);
+
+	/**
+	 * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 엑셀 다운로드 일시 업데이트
+	 * @param ordrSrchVO
+	 * @return List<LinkedHashMap>
+	 */
+	public Integer updateExcelDownDt(BOOrdrSrchVO ordrSrchVO);
+	/* ####################################
+	   관리자 > 주문 > 주문관리 > 발주서 관리 종료
+	   #################################### */
+
     /* ####################################
        사용자 > 마이페이지 > MY쇼핑 > 개인결제 시작
        #################################### */
@@ -662,6 +706,8 @@ public interface BOOrdrMapper {
      */
     public DataMap selectBOSpbkGiftMultiDlvyAt(BOSpbkVO spbkVO);
 
+    public BigDecimal selectBuyRate(DataMap param);
+
     /**
      * 사용자 > 상품 > 장바구니 > 장바구니 상품 삭제
      * @param goodsVO
@@ -767,6 +813,8 @@ public interface BOOrdrMapper {
     */
     public String selectBODefaultAdressAtInqire(DataMap vo);
 
+    public String selectBODefaultAdressAtInqire2(DataMap vo);
+
 
     /**
      * 주문 상품 옵션별 정보와 배송그룹 정보
@@ -980,6 +1028,44 @@ public interface BOOrdrMapper {
      * @return List<DataMap>
      */
     public List<DataMap> selectMbrSubsvcOrdrList(BOOrdrDlvyVO ordrDlvyVO);
+
+
+    /**
+     * 사용자 > 주문완료 > 구독서비스 주문 목록 조회
+     * @param ordrDlvyVO
+     * @return List<DataMap>
+     */
+    public List<DataMap> selectOrdrSubsvcDtllList(BOOrdrDlvyVO ordrDlvyVO);
+
+
+    /**
+     * 사용자 > 구독서비스 결제 > 구독서비스 주문 상품 목록 조회
+     * @param subsvcVO
+     * @return List<BOSubsvcVO>
+     */
+    public List<BOSubsvcVO> selectSubsvcGoodsList(BOSubsvcVO subsvcVO);
+
+    /**
+     * 최종 한화금액이 결제금액보다 많은지 체크하여 환불금액(원화) update
+     * @param refundVO
+     */
+    public void updateBOWonRefundAmt(BOOrdrRefundVO refundVO);
+
+    /**
+     * 결제취소 시 구독서비스 환불금액 조회
+     * 계산식 : 전체결제금액 - 전체배송비 - 발송및취소된(35~85)상품금액
+     * @param refundVO
+     */
+    public Integer selectSubsvcRefundAmt(BOOrdrRefundVO refundVO);
+
+
+
+    /**
+     * 키움결제 GC_ORDER_PG_API_LOG 결과 조회
+     * @param payVO
+     * @return List<DataMap>
+     */
+    public DataMap selectKiwoomPgApiLog(BOPayVO payVO);
 }
 
 

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

@@ -191,7 +191,11 @@ public class BOOrdrLogService {
                 pgResult = false;
             } else {
 
-                if ("kcp".equals(payVO.getPgCmpnyNm())) {
+                if("kiwoom".equals(payVO.getPgCmpnyNm())) {
+                    resCd = "0000";
+                    message = "결제 승인 성공";
+                    //결제실패에 대한 응답은 없음
+                } else if ("kcp".equals(payVO.getPgCmpnyNm())) {
                     resCd = StringUtil.isNullToString(resultMap.get("res_cd"));
                     message = StringUtil.isNullToString(resultMap.get("res_msg"));
 
@@ -227,7 +231,7 @@ public class BOOrdrLogService {
             String logDtlCn = "";
             String operNm = "";
             String dvCd = payVO.getDvCd();
-            String setleTyCd = payVO.getSetleTyCd();
+            //String setleTyCd = payVO.getSetleTyCd();
             if ("02".equals(dvCd)) { // 관리자 주문
                 String mbrNm = "";
                 if (payVO.getMbrNm() != null) {
@@ -311,7 +315,7 @@ public class BOOrdrLogService {
 
    	/**
    	 * 주문 로그 단순 등록
-   	 * @param pgApiLogVO
+   	 * @param logVO
    	 */
    	@Transactional(propagation = Propagation.REQUIRES_NEW)
    	public void insertBOOrderLogRegist(BOOrderLogVO logVO, boolean result, String message) {
@@ -336,7 +340,7 @@ public class BOOrdrLogService {
 
    	/**
    	 * 주문 종기능 로그 등록
-   	 * @param pgApiLogVO
+   	 * @param bellVO
    	 */
    	@Transactional(propagation = Propagation.REQUIRES_NEW)
    	public void insertBOOrderBellLogRegist(BOOrderLogVO bellVO) {

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

@@ -29,59 +29,66 @@ public class BODwldItmVO extends AbstractVO {
     private String[] selItems;
 
     public enum items {
-        item01("export_group_innb", "출고그룹"),
-        item02("ordr_innb_with_export_group_innb", "주문번호+출고그룹"),
-        item03("ordr_innb", "주문번호"),
-        item04("smrt_shopng_ordrnb", "npay주문번호"),
-        item05("ordr_rcept_dt", "주문일"),
-        item06("ordrr_nm", "주문자명"),
-        item07("mbr_id", "주문자아이디"),
-        item08("ordrr_mbtlnb", "주문자휴대폰"),
-        item09("ordrr_email", "주문자이메일"),
-        item10("order_memo", "사용자메모"),
-        item11("lgstc_adm_memo", "물류담당자메모"),
-        item12("inflow_cours_url", "주문경로"),
-        item13("dlivy_dt", "출고일"),
-        item14("dlvy_mth_nm", "받는방법"),
-        item15("hdrycpn_nm", "택배사"),
-        item16("invcnb", "운송장번호"),
-        item17("dlvylc_adres_info", "받는정보"),
-        item18("recpnt_nm", "수령인"),
-        item19("recpnt_mbtlnb", "수령인휴대폰"),
-        item20("dlvylc_zip", "우편번호"),
-        item21("dlvylc_rnm_adres", "전체주소(도로명)"),
-        item22("dlvy_amt", "배송비"),
-        item23("ordr_goods_innb", "상품고유번호"),
-        item24("npay_goods_ordrnb", "npay상품주문번호"),
-        item25("goods_nm", "상품명"),
-        item26("invntry_qy", "현재고"),
-        item27("prchspric", "매입가"),
-        item28("cnsmrpric", "정가"),
-        item29("dscntpric", "할인가"),
-        item30("pric_by_ordr_qy", "할인가x수량"),
-        item31("taxt_trget_at", "과세여부"),
-        item32("input_optn", "추가입력옵션"),
-        item33("ordr_qy", "주문수량"),
-        item34("refnd_qy", "취소수량"),
-        item35("bfr_sndng_qy", "보낸수량"),
-        item36("aftr_sndng_qy", "보낼수량"),
-        item37("ordr_sttus_nm", "주문상품상태"),
-        item38("goods_dscnt_amt", "상품쿠폰할인"),
-        item39("event_dscnt_amt", "이벤트할인"),
-        item40("mlt_dscnt_amt", "복수구매할인"),
-        item41("dlvy_dscnt_amt", "배송비쿠폰"),
-        item42("mlg_dscnt_amt", "마일리지사용"),
-        item43("spbk_dscnt_amt", "장바구니할인쿠폰"),
-        item44("enuri_dscnt_amt", "에누리"),
-        item45("setle_amt", "결제금액"),
-        item46("setle_dt", "결제일"),
-        item47("setle_mth_nm", "결제방법"),
-        item48("snggds_accml_mlg_amt", "지급마일리지"),
-        item49("dlvylc_group_nb", "배송그룹번호"),
-        item50("dlvy_amt_setle_mth_nm", "배송비결제방식"),
-        item51("ordr_ty_nm", "주문유형"),
-        item52("optn_cd_1", "상품코드"),
-        item53("dlvy_mssage_cn", "배송메시지");
+        exportGroupInnb("export_group_innb", "출고그룹"),
+        ordrInnbWithExportGroupInnb("ordr_innb_with_export_group_innb", "주문번호+출고그룹"),
+        ordrInnb("ordr_innb", "주문번호"),
+        smrtShopngOrdrnb("smrt_shopng_ordrnb", "npay주문번호"),
+        ordrRceptDt("ordr_rcept_dt", "주문일"),
+        ordrrNm("ordrr_nm", "주문자명"),
+        mbrId("mbr_id", "주문자아이디"),
+        ordrrMbtlnb("ordrr_mbtlnb", "주문자휴대폰"),
+        ordrrEmail("ordrr_email", "주문자이메일"),
+        orderMemo("order_memo", "사용자메모"),
+        lgstcAdmMemo("lgstc_adm_memo", "물류담당자메모"),
+        inflowCoursUrl("inflow_cours_url", "주문경로"),
+        dlivyDt("dlivy_dt", "출고일"),
+        dlvyMthNm("dlvy_mth_nm", "받는방법"),
+        hdrycpnNm("hdrycpn_nm", "택배사"),
+        invcnb("invcnb", "운송장번호"),
+        dlvylcAdresInfo("dlvylc_adres_info", "받는정보"),
+        recpntNm("recpnt_nm", "수령인"),
+        recpntMbtlnb("recpnt_mbtlnb", "수령인휴대폰"),
+        dlvylcZip("dlvylc_zip", "우편번호"),
+        dlvylcRnmAdres("dlvylc_rnm_adres", "전체주소(도로명)"),
+        dlvyAmt("dlvy_amt", "배송비"),
+        ordrGoodsInnb("ordr_goods_innb", "상품고유번호"),
+        npayGoodsOrdrnb("npay_goods_ordrnb", "npay상품주문번호"),
+        goodsNm("goods_nm", "상품명"),
+        goodsNmEn("goods_nm_en", "상품명(영문)"),
+        invntryQy("invntry_qy", "현재고"),
+        prchspric("prchspric", "매입가"),
+        cnsmrpric("cnsmrpric", "정가"),
+        dscntpric("dscntpric", "할인가"),
+        pricByOrdrQy("pric_by_ordr_qy", "할인가x수량"),
+        taxtTrgetAt("taxt_trget_at", "과세여부"),
+        inputOptn("input_optn", "추가입력옵션"),
+        ordrQy("ordr_qy", "주문수량"),
+        refndQy("refnd_qy", "취소수량"),
+        bfrSndngQy("bfr_sndng_qy", "보낸수량"),
+        aftrSndngQy("aftr_sndng_qy", "보낼수량"),
+        ordrSttusNm("ordr_sttus_nm", "주문상품상태"),
+        goodsDscntAmt("goods_dscnt_amt", "상품쿠폰할인"),
+        eventDscntAmt("event_dscnt_amt", "이벤트할인"),
+        mltDscntAmt("mlt_dscnt_amt", "복수구매할인"),
+        dlvyDscntAmt("dlvy_dscnt_amt", "배송비쿠폰"),
+        mlgDscntAmt("mlg_dscnt_amt", "마일리지사용"),
+        spbkDscntAmt("spbk_dscnt_amt", "장바구니할인쿠폰"),
+        enuriDscntAmt("enuri_dscnt_amt", "에누리"),
+        setleAmt("setle_amt", "결제금액"),
+        setleDt("setle_dt", "결제일"),
+        setleMthNm("setle_mth_nm", "결제방법"),
+        snggdsAccmlMlgAmt("snggds_accml_mlg_amt", "지급마일리지"),
+        dlvylcGroupNb("dlvylc_group_nb", "배송그룹번호"),
+        dlvyAmtSetleMthNm("dlvy_amt_setle_mth_nm", "배송비결제방식"),
+        ordrTyNm("ordr_ty_nm", "주문유형"),
+        optnCd_1("optn_cd_1", "상품코드"),
+        hscode("hscode", "HS Code"),
+        realWt("realWt", "실무게"),
+        volWt("volWt", "부피무게"),
+        packageCnt("packageCnt", "포장개수"),
+        dlvyMssageCn("dlvy_mssage_cn", "배송메시지"),
+        shippingSttusNm("shipping_sttus_nm", "출고상태"),
+        subsvcAt("subsvc_at", "주문구분");
 
         private final String key;
         private final String value;

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

@@ -36,6 +36,8 @@ public class BOOrdrDlvyVO extends AbstractVO {
 
     private String sysDvCd; // 시스템 구분 코드
 
+    private String subsvcAt; // 구독서비스 여부
+
     /** 현재 주문 상태 */
     private String currOrdrSttusCd;
 

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

@@ -46,10 +46,14 @@ public class BOOrdrRefundVO extends AbstractVO {
 
     private BigDecimal refundAmt; // 환불금액
 
+    private BigDecimal wonRefundAmt; // 환불금액(원화)
+
     private BigDecimal refundAccmlmnyAmt; // 환불적립금액
 
     private BigDecimal refundDlvyAmt; // 환불배송비총금액
 
+    private BigDecimal wonRefundDlvyAmt; // 환불배송비총금액(원화)
+
     private BigDecimal mlgAccmlmnyAmt; // 적립금보정금액
 
     private String mlgAccmlmnyValidDt; // 적립금유효기간
@@ -90,6 +94,8 @@ public class BOOrdrRefundVO extends AbstractVO {
 
     private BigDecimal returnDlvyAmt; // 반품배송비금액
 
+    private BigDecimal wonReturnDlvyAmt; // 반품배송비금액(원화)
+
     private String returnDlvyTrgetCd; // 반품배송비수령대상코드
 
     private String returnDlvyRspnsblCd; // 반품배송비지불책임코드

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

@@ -40,6 +40,12 @@ public class BOOrdrShippingVO extends AbstractVO {
     /** 받는자휴대폰번호 */
     private String recpntMbtlnb;
 
+    /** 개인통관부호 */
+    private String cstmclerCd;
+
+    /** 배송지역코드 */
+    private String dlvylcAreaCd;
+
     /** 배송지우편번호 */
     private String dlvylcZip;
 

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

@@ -4,6 +4,10 @@ import com.wb.domainserver.domain.comm.vo.AbstractVO;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.List;
+import java.util.Map;
+
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BOOrdrSrchVO extends AbstractVO{
@@ -82,7 +86,15 @@ public class BOOrdrSrchVO extends AbstractVO{
 
     private String[] srchOrdrInnbs; // 주문번호 배열
 
+    private String[] srchOrdrDlvyInnbs; // 배송번호 배열
+
+    private List<Map<String, String>> srchInnbPairs; // 발주서 주키 배열
+
     private String srchDatePeriod; // 날짜구간코드
+
+    private String[] dlvylcAreaCds; // 배송지역코드
+
+    private String excelInclude; // 엑셀 다운여부
     /*
     ####################################
         전체 주문 조회 검색 추가 조건 종료
@@ -105,4 +117,7 @@ public class BOOrdrSrchVO extends AbstractVO{
 
     private String excelCoulms; // 엑셀다운로드 조회 컬럼
     private String ordrInnb; // 주문고유번호
+
+    /**주문구분*/
+    private String srchSubsvcAt;
 }

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

@@ -151,6 +151,12 @@ public class BOOrdrVO extends AbstractVO {
     /** 장바구니 고유번호 배열 */
     private String[] cartInnbs;
 
+    /** 구독서비스 주문여부 */
+    private String subsvcAt;
+
+    /** 구독서비스 고유번호 */
+    private String subsvcInnb;
+
     /** 주문배송 고유번호 */
     private String ordrDlvyInnb;
 

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

@@ -32,6 +32,7 @@ import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder;
 import org.bouncycastle.operator.InputDecryptorProvider;
 import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
 import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
 import org.json.simple.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -103,7 +104,8 @@ public class BOPayService{
 			put("ordrInnb", OrderInnb);
 		}};
 
-        return mapper.selectRlSetleAmt(paramMap);
+//        return mapper.selectRlSetleAmt(paramMap);
+		return mapper.selectWonRlSetleAmt(paramMap);
 	}
 
 	/* ============================================================================== */
@@ -298,7 +300,7 @@ public class BOPayService{
 
 	/**
      * KCP 결제
-     * @param BOPayVO
+     * @param payVO
      */
 	public Map<String, Object> insertKcpPay(BOPayVO payVO) throws Exception {
 
@@ -357,7 +359,7 @@ public class BOPayService{
 
 	/**
      * KCP 수기결제
-     * @param BOPayVO
+     * @param payVO
      */
     public Map<String, Object> insertKcpPayKeyin(BOPayVO payVO) throws Exception {
 
@@ -430,7 +432,7 @@ public class BOPayService{
 
     /**
      * KCP 결제 취소
-     * @param BOPayVO
+     * @param payVO
      */
 	public Map<String, Object> cancelKcpPay(BOPayVO payVO) throws Exception {
 		Map<String, Object> resParam = new HashMap<>();
@@ -637,7 +639,7 @@ public class BOPayService{
 
 	/**
 	 * KCP 에스크로 상태변경 : 배송정보전송
-	 * @param BOPayVO
+	 * @param payVO
 	 */
 	public Map<String, Object> updateEscwKcpPay(BOPayVO payVO) throws Exception {
 
@@ -756,7 +758,7 @@ public class BOPayService{
 
 	/**
      * KCP 현금영수증 발급
-     * @param BOPayVO
+     * @param payVO
      */
 	public Map<String, Object> insertKcpCashReceipt(BOPayVO payVO) throws Exception {
 
@@ -817,7 +819,7 @@ public class BOPayService{
 
 	/**
      * KCP 현금영수증 취소
-     * @param BOPayVO
+     * @param payVO
      */
 	public Map<String, Object> cancelKcpCashReceipt(BOPayVO payVO) throws Exception {
 
@@ -867,7 +869,7 @@ public class BOPayService{
 
 	/**
      * KCP 현금영수증 조회
-     * @param BOPayVO
+     * @param payVO
      */
 	public Map<String, Object> selectKcpCashReceipt(BOPayVO payVO) throws Exception {
 
@@ -910,7 +912,7 @@ public class BOPayService{
 
 	/**
      * 토스 현금영수증 발급
-     * @param BOPayVO
+     * @param payVO
      */
 	public Map<String, Object> insertTossCashReceipt(BOPayVO payVO) throws Exception {
 
@@ -950,7 +952,7 @@ public class BOPayService{
 
     /**
      * 토스 현금영수증 취소
-     * @param BOPayVO
+     * @param payVO
      */
     public Map<String, Object> cancelTossCashReceipt(BOPayVO payVO) throws Exception {
 
@@ -981,7 +983,7 @@ public class BOPayService{
     /**
      * 토스 결제
 	 * 일반결제(toss), 토스페이(tossPay), 브랜드페이(brandPay) 같이 들어옴
-     * @param BOPayVO
+     * @param payVO
      */
     public Map<String, Object> insertTossPay(BOPayVO payVO) throws Exception {
 
@@ -1018,7 +1020,7 @@ public class BOPayService{
 
     /**
      * 토스 수기결제
-     * @param BOPayVO
+     * @param payVO
      */
     public Map<String, Object> insertTossPayKeyin(BOPayVO payVO) throws Exception {
 
@@ -1057,7 +1059,7 @@ public class BOPayService{
 
     /**
      * 토스 결제취소
-     * @param BOPayVO
+     * @param payVO
      */
     public Map<String, Object> cancelTossPay(BOPayVO payVO) throws Exception {
 
@@ -1074,17 +1076,6 @@ public class BOPayService{
 			obj.put("refundReceiveAccount", refundReceiveAccount);
 		}
 
-		/* 취소 호출 시 setModGubun을 하기로 함
-		String memorSetleAt = StringUtil.isNullToString(payVO.getMemorSetleAt());
-		if("Y".equals(memorSetleAt)){
-			payVO.setModGubun("keyIn");
-		}else if("G".equals(memorSetleAt)){  //이부분에 대한 처리 필요
-			payVO.setModGubun("brandPay");
-		}else{
-			payVO.setModGubun("toss");
-		}
-		// easyPay 추가되어야 함
-		*/
 		payVO.setType("cancel");
 
     	URL url = new URL("https://api.tosspayments.com/v1/payments/" + payVO.getPaymentKey() + "/cancel");
@@ -1275,7 +1266,7 @@ public class BOPayService{
 
 	/**
 	 * 토스 에스크로 상태변경 : 배송정보전송
-	 * @param BOPayVO
+	 * @param payVO
 	 */
 	public Map<String, Object> updateEscwTossPay(BOPayVO payVO) throws Exception {
 		//관련 키값 DB 조회
@@ -1331,7 +1322,6 @@ public class BOPayService{
 		rcvname = payVO.getRcvName();           // 실수령인명
 
 		boolean resp = false;  //응답결과
-//		mertkey = resultMap.get("tossPublicKey").toString(); //토스페이먼츠에서 발급한 상점키로 변경해 주시기 바랍니다.  //TODO : 확인필요
 		mertkey = payVO.getMertkey(); // 머트키(퍼블릭키)
 //		mertkey = "9fd0de8489b4dc4af0dc40459958cd70"; //토스페이먼츠에서 발급한 상점키로 변경해 주시기 바랍니다.
 
@@ -1467,12 +1457,292 @@ public class BOPayService{
 	}
 
 
+	/* ============================================================================== */
+    /* =   여기서 부터 Kiwoom
+    /* = -------------------------------------------------------------------------- = */
+
+	/**
+	 * Kiwoom 결제
+	 * @param payVO
+	 */
+	public Map<String, Object> insertKiwoomPay(BOPayVO payVO) throws Exception {
+
+		//관련 키값 DB 조회
+		/*DataMap resultMap = selectPayLink(payVO.getSopmalCd());
+		String reSetleAmt = StringUtil.isNullToString(selectRlSetleAmt(payVO.getSopmalCd(),payVO.getOrderId()));
+		reSetleAmt = reSetleAmt.isEmpty()? "10" : reSetleAmt;  //0원은 정상거래로 인정되어서 10원으로 지정함*/
+
+		log.info("insertKiwoomPay step1 ");
+
+		String cpId  = f_get_parm( payVO.getCpId());
+		String payMethod = f_get_parm( payVO.getPayMethod());
+		String orderNo = f_get_parm( payVO.getOrderId());
+		String type = f_get_parm( payVO.getType());
+		String amount = f_get_parm( payVO.getAmount());
+
+		JSONObject jsonObj = new JSONObject();
+		jsonObj.put("CPID", cpId);
+		jsonObj.put("PAYMETHOD", payMethod);
+		jsonObj.put("ORDERNO", orderNo);
+		jsonObj.put("TYPE", type);
+		jsonObj.put("AMOUNT", amount);
+
+		log.info("insertKiwoomPay step2 ::: {}", jsonObj);
 
 
+		//결제등록 요청시 실결제값(good_mny)
+		/*String payType = getPayMethod(payVO.getPayMethod());
+		jsonReq.put("ordr_mony", reSetleAmt);         // ** 결제금액 유효성 검증 **
+		jsonReq.put("pay_type", payType);             // ** 결제수단 유효성 검증 **
+		jsonReq.put("ordr_no", payVO.getOrderId());   // ** 주문번호검증 **
+		*/
+
+		String kiwoom_ENC = "";
+		try {
+			String targetURL = "";
+			if(cpId.equals("CTS18056")) {
+				targetURL = "https://apitest.kiwoompay.co.kr/pay/hash";    //개발서버
+			}else{
+				targetURL = "https://api.kiwoompay.co.kr/pay/hash";    //운영서버
+			}
+			log.info("insertKiwoomPay targetURL :::{} ",targetURL);
+			URL goUrl = new URL(targetURL);
+
+			HttpURLConnection con = (HttpURLConnection) goUrl.openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("Content-Type", "application/json");
+			con.setUseCaches(false);
+			con.setDoOutput(true);
+			con.setDoInput(true);
+
+			OutputStream os = con.getOutputStream();
+			os.write((jsonObj.toString()).getBytes("euc-kr"));
+			os.flush();
+			os.close();
+
+			int responseCode = con.getResponseCode();
+
+			if (responseCode == 200) {
+				BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+				String inputLine;
+				StringBuffer response1 = new StringBuffer();
+
+				while ((inputLine = in.readLine()) != null) {
+					response1.append(inputLine);
+				}
+				in.close();
+
+				JSONObject jObj = (JSONObject) JSONValue.parse(response1.toString());
+				kiwoom_ENC = (String) jObj.get("KIWOOM_ENC");
+
+				log.info("insertKiwoomPay step3 ::: {}", jObj);
+			}
+			con.disconnect();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		JSONObject resultObj = new JSONObject();
+		resultObj.put("KIWOOM_ENC", kiwoom_ENC);
+
+		log.info("insertKiwoomPay step4 ::: {}", resultObj.get("KIWOOM_ENC"));
+
+		return new HashMap<>() {{
+			put("response",  resultObj.toString());
+		}};
+	}
 
 
+	/**
+	 * 키움 결제취소
+	 * @param payVO
+	 */
+	public Map<String, Object> cancelKiwoomPay(BOPayVO payVO) throws Exception {
 
+		log.debug("cancelKiwoomPay step1 payVO :::> {}", payVO);
 
+		//관련 키값 DB 조회
+		DataMap resultMap = selectPayLink(payVO.getSopmalCd());
+
+		log.debug("cancelKiwoomPay step2 resultMap :::> {}", resultMap);
+
+		//요청코드
+		String authKey			= resultMap.get("kcpSecretKey").toString();
+		String cpId				= resultMap.get("kcpMid").toString();
+//		개발서버 네이버페이 CPID 관련 적용 취소
+		if ("naverpay".equals(payVO.getModGubun())) {
+			authKey			    = resultMap.get("bpaySecretKey").toString();
+			cpId				= resultMap.get("bpayMid").toString();
+		}
+
+		String amount			= payVO.getCancelAmount();   //취소금액
+		String trxId			= payVO.getTno();  //거래번호
+		String cancelReason		= payVO.getCancelReason();  //취소사유
+		String payMethod		= payVO.getPayMethod();  //취소결제수단
+		String cancelReq		= "Y";  //취소URL 요청여부
+		//String TAXFREEAMT		= nullCheck(request.getParameter("TAXFREEAMT"));  //비과세 취소금액
+
+		//1차 요청코드
+		JSONObject obj = new JSONObject();
+		obj.put("cancelReason", cancelReason);  //취소사유
+		obj.put("cancelAmount", amount);  //취소금액 (금액이 없으면 전체취소)
+
+		JSONObject jsonObj = new JSONObject();
+		jsonObj.put("CPID", cpId);
+		jsonObj.put("PAYMETHOD", payMethod);
+		jsonObj.put("AMOUNT",amount);
+		jsonObj.put("CANCELREQ",cancelReq);
+		jsonObj.put("TRXID",trxId);
+		jsonObj.put("CANCELREASON",cancelReason);
+		//jsonObj.put("TAXFREEAMT",TAXFREEAMT);
+
+		log.debug("cancelKiwoomPay step3 JSONObject ::: {}", jsonObj.toString());
+
+		//로그 저장 셋팅
+		JSONObject finalJObj = new JSONObject();
+		DataMap pgApiLogReqVO = new DataMap();
+		pgApiLogReqVO.put("reqParam", jsonObj.toString());
+		pgApiLogReqVO.put("ordrInnb", StringUtil.isNullToString(payVO.getOrderId()));
+		pgApiLogReqVO.put("sopmalCd", StringUtil.isNullToString(payVO.getSopmalCd()));
+		pgApiLogReqVO.put("pgCmpnyNm", StringUtil.isNullToString(payVO.getPgCmpnyNm()));
+		pgApiLogReqVO.put("mbrInnb", StringUtil.isNullToString(payVO.getMbrInnb()));
+
+		log.debug("cancelKiwoomPay step4 pgApiLogReqVO ::: {}", pgApiLogReqVO);
+
+		// ====== step 1. 취소URL 요청 ======
+		try{
+
+			//결제 API URL
+			String targetURL = "";
+			if(cpId.equals("CTS18056")) {
+				targetURL = "https://apitest.kiwoompay.co.kr/pay/ready";    //개발서버
+			}else{
+				targetURL = "https://api.kiwoompay.co.kr/pay/ready";    //운영서버
+			}
+			log.info("cancelKiwoomPay targetURL :::{} ",targetURL);
+			URL goUrl = new URL(targetURL);
+
+			HttpURLConnection con = (HttpURLConnection) goUrl.openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("Content-Type", "application/json");
+			con.setRequestProperty("Authorization", authKey);
+			con.setUseCaches(false);
+			con.setDoOutput(true);
+			con.setDoInput(true);
+
+			OutputStream os = con.getOutputStream();
+			BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os));
+
+			writer.write("");
+			os.write((jsonObj.toString()).getBytes("UTF-8"));
+			writer.flush();
+			writer.close();
+			os.close();
+			con.connect();
+
+			//호출 결과 값
+			int responseCode = con.getResponseCode();
+			String responseMsg = con.getResponseMessage();
+
+			log.debug("cancelKiwoom STEP1 승인전 responseCode ====={}",responseCode);
+			log.debug("cancelKiwoom STEP1 승인전 responseMsg ====={}",responseMsg);
+
+			String token = "";
+			String returnUrl = "";
+
+			//정상 수신 했을경우 (응답코드:200)
+			if(responseCode == 200){
+				BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+				String inputLine = null;
+				StringBuffer response1 = new StringBuffer();
+
+				while((inputLine = in.readLine()) != null){
+					response1.append(inputLine);
+				}
+
+				in.close();
+
+				//응답 데이터 처리
+				String responseBody = response1.toString();
+				JSONObject jObj = (JSONObject)JSONValue.parse(responseBody);
+				token = jObj.get("TOKEN").toString();
+				returnUrl = jObj.get("RETURNURL").toString();
+
+				log.debug("cancelKiwoom STEP1 승인 responseBody ====={}", responseBody);
+				log.debug("cancelKiwoom STEP1 승인 TOKEN200 ====={}",token);
+				log.debug("cancelKiwoom STEP1 승인 URL200 ====={}",returnUrl);
+			}
+
+			con.disconnect();
+
+			log.debug("cancelKiwoom STEP1 승인 TOKEN ====={}",token);
+			log.debug("cancelKiwoom STEP1 승인 URL ====={}",returnUrl);
+
+			// ====== step 2. 취소 승인 요청 ======
+
+			targetURL = returnUrl;
+			goUrl = new URL(targetURL);
+
+			con = (HttpURLConnection) goUrl.openConnection();
+			con.setRequestMethod("POST");
+			con.setRequestProperty("Content-Type", "application/json");
+			con.setRequestProperty("Authorization", authKey);
+			con.setRequestProperty("TOKEN", token);//TOKEN
+			con.setUseCaches(false);
+			con.setDoOutput(true);
+			con.setDoInput(true);
+			os = con.getOutputStream();
+			writer = new BufferedWriter(new OutputStreamWriter(os));
+
+			writer.write("");
+			os.write((jsonObj.toString()).getBytes("EUC-KR"));
+			writer.flush();
+			writer.close();
+			os.close();
+			con.connect();
+
+			//호출 결과 값
+			responseCode = con.getResponseCode();
+			responseMsg = con.getResponseMessage();
+
+			//정상 수신 했을경우 (응답코드:200)
+			if(responseCode == 200){
+				BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8"));
+				String inputLine = null;
+				StringBuffer response1 = new StringBuffer();
+
+				while((inputLine = in.readLine()) != null){
+					response1.append(inputLine);
+				}
+
+				in.close();
+
+				//응답 데이터 처리
+				String responseBody = response1.toString();
+				finalJObj = (JSONObject)JSONValue.parse(responseBody);
+			}
+
+			con.disconnect();
+
+			log.debug("Kiwoom 결제취소 jObj::: {}", finalJObj.toString());
+
+			pgApiLogReqVO.put("resParam", finalJObj.toString());
+
+		}catch(Exception e){
+			e.printStackTrace();
+		} finally {
+
+			log.debug("cancelKiwoomPay finally pgApiLogReqVO ::: {}", pgApiLogReqVO);
+
+			ordrLogService.insertSetleOrderPgLog(payVO, pgApiLogReqVO);
+			ordrLogService.insertBOPgApiLogReqRegist(pgApiLogReqVO);
+		}
+
+		Map<String, Object> result = new HashMap<>();
+		result.put("response", finalJObj.toString());
+		return result;
+
+	}
 
 }
 

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

@@ -292,6 +292,9 @@ public class BOPayVO extends AbstractVO {
     /** 테스트 여부 - 테스트용 */
     private String testAt;
 
+    /** 키움 - 상점ID */
+    private String cpId;
+
 
     // cookie
     /** 에이전트 ID */

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

@@ -248,7 +248,7 @@ public interface BORtngudrefndMapper {
 	 * @param boRtngudrefndVO
 	 * @return
 	 */
-	public Integer selectBOORderRefundAmtSumInqire(BORtngudrefndVO boRtngudrefndVO);
+	public DataMap selectBOORderRefundAmtSumInqire(BORtngudrefndVO boRtngudrefndVO);
 
 
 	/**

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

@@ -1,52 +1,45 @@
 package com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.service;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 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.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.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.BOOrdrService;
-import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrDlvyVO;
 import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrRefundVO;
+import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrVO;
 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.vo.BOOrderReItemVO;
 import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORefundSetleVO;
+import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORtngudrefndSrchVO;
+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.promtn.coupon.service.BOCouponService;
 import com.wb.domainserver.domain.gcone.promtn.coupon.vo.BODwldCouponVO;
 import com.wb.domainserver.domain.gcone.setup.site.mapper.BOSiteMapper;
-import com.wb.domainserver.domain.gcone.setup.site.vo.BOSetupContentsItemVO;
 import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.util.dataaccess.DataMap;
 import com.wb.domainserver.util.string.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
-import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.mapper.BORtngudrefndMapper;
-import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORtngudrefndSrchVO;
-import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORtngudrefndVO;
-import com.wb.domainserver.util.dataaccess.DataMap;
-
-import lombok.extern.slf4j.Slf4j;
-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 org.springframework.web.bind.support.WebExchangeBindException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
 *
@@ -86,6 +79,9 @@ public class BORtngudrefndService {
 	@Autowired
 	private BOOrderService orderService;
 
+	@Autowired
+	private BOSubsvcService subsvcService;
+
 	@Autowired
 	private BORtngudrefndMapper mapper;
 
@@ -249,7 +245,6 @@ public class BORtngudrefndService {
 
 
 		try {
-
 			if (boRtngudrefndVO.getRefundProcsSttusCd() != null) {
 
 				if (boRtngudrefndVO.getReturnCstmrTelnb() != null) {
@@ -278,28 +273,38 @@ public class BORtngudrefndService {
 					}
 				}
 
+				/*한화금액이 결제금액보다 많은지 체크하여 환불금액(원화) update를 위한 파라미터 셋팅*/
+				BOOrdrRefundVO refundVO = new BOOrdrRefundVO();
+				refundVO.setSopmalCd(boRtngudrefndVO.getSopmalCd());
+				refundVO.setOrdrInnb(new BigInteger(boRtngudrefndVO.getOrdrInnb()));
+				refundVO.setOrderRefundInnb(boRtngudrefndVO.getOrderRefundInnb());
 
 				if ( "01".equals(boRtngudrefndVO.getRefundTyCd()) ) { // 결제 취소
-					if ("01".equals(boRtngudrefndVO.getRefundProcsSttusCd())) {
+					if ("01".equals(boRtngudrefndVO.getRefundProcsSttusCd())) {		// 환불신청
 						// TODO : 신청일때 로직
 						mapper.updateBOOrderReSttusUpdt(boRtngudrefndVO); // 반품/환불 상태값 수정
+						/* 한화금액이 결제금액보다 많은지 체크하여 환불금액(원화) update */
+						ordrMapper.updateBOWonRefundAmt(refundVO);
 
-					} else if ("02".equals(boRtngudrefndVO.getRefundProcsSttusCd())) {
+					} else if ("02".equals(boRtngudrefndVO.getRefundProcsSttusCd())) {		//환불진행중
 
-						if ("01".equals(boRtngudrefndVO.getOldRefundProcsSttusCd())) {
+						if ("01".equals(boRtngudrefndVO.getOldRefundProcsSttusCd())) {		//이전 환불진행상태 = 환불신청
 							orderRefundSttusUpdtPorcs(boRtngudrefndVO); // 주문에 환불건 관련 상태 및 수량 업데이트
 						}
 
-						if ( "02".equals(boRtngudrefndVO.getRefundMthCd()) ) {
+						if ( "02".equals(boRtngudrefndVO.getRefundMthCd()) ) {				//환불방법 = 무통장계좌이체
 
 							mapper.updateBOOrderReSttusUpdt(boRtngudrefndVO); // 반품/환불 상태값 수정
+							/* 한화금액이 결제금액보다 많은지 체크하여 환불금액(원화) update */
+							ordrMapper.updateBOWonRefundAmt(refundVO);
+
 						} else {
 							// message = updateBORefundProcsProcess(boRtngudrefndVO); // 완료시에만 환불 처리
 						}
 
-					} else if ("03".equals(boRtngudrefndVO.getRefundProcsSttusCd())) {
+					} else if ("03".equals(boRtngudrefndVO.getRefundProcsSttusCd())) {		//환불완료
 
-						if ("01".equals(boRtngudrefndVO.getOldRefundProcsSttusCd())) { // 신청에서 완료처리시
+						if ("01".equals(boRtngudrefndVO.getOldRefundProcsSttusCd())) { // 이전 환불진행상태 = 환불신청 => 신청에서 완료처리시
 							orderRefundSttusUpdtPorcs(boRtngudrefndVO); // 주문에 환불건 관련 상태 및 수량 업데이트
 						}
 
@@ -313,6 +318,8 @@ public class BORtngudrefndService {
 						log.debug("상태 업데이트 파라미터 확인 : {}", boRtngudrefndVO);
 
 						mapper.updateBOOrderReSttusUpdt(boRtngudrefndVO); // 반품/환불 상태값 수정
+						/* 한화금액이 결제금액보다 많은지 체크하여 환불금액(원화) update */
+						ordrMapper.updateBOWonRefundAmt(refundVO);
 
 					} else if ( "02".equals(boRtngudrefndVO.getRefundProcsSttusCd()) && "02".equals(boRtngudrefndVO.getReturnProcsSttusCd()) ) { // 상품 받은거 확인하고 돈을 입금하지않았을 경우
 
@@ -321,6 +328,8 @@ public class BORtngudrefndService {
 						}
 
 						mapper.updateBOOrderReSttusUpdt(boRtngudrefndVO); // 반품/환불 상태값 수정
+						/* 한화금액이 결제금액보다 많은지 체크하여 환불금액(원화) update */
+						ordrMapper.updateBOWonRefundAmt(refundVO);
 
 					} else if ( "03".equals(boRtngudrefndVO.getRefundProcsSttusCd()) && "02".equals(boRtngudrefndVO.getReturnProcsSttusCd()) ) { // 상품 받은거 확인하고
 
@@ -466,21 +475,35 @@ public class BORtngudrefndService {
 		Long lordrInnb = Long.valueOf(ordrInnb);
 		BigInteger intOrdrInnb = BigInteger.valueOf(lordrInnb);
 		String sopmalCd = refundVO.getSopmalCd();
-		Integer refundAmt = 0;
+		Integer refundAmt = 0;		//현재 상품환불금액
+		Integer wonRefundAmt = 0;	//현재 상품환불금액(원화)
+
 		if (!CollectionUtils.isEmpty(orderReItemVOList)) {
 			refundAmt = orderReItemVOList.stream()
 					    .mapToInt(BOOrderReItemVO::getGoodsRefundAmt)
 					    .sum();
 		} else {
-			refundAmt = Integer.parseInt(refundVO.getRefundAmt()); // 현재 환불 금액
+			refundAmt = Integer.parseInt(refundVO.getRefundAmt()); // 현재 상품환불금액
+		}
+		wonRefundAmt = Integer.parseInt(refundVO.getWonRefundAmt());	//현재 상품환불금액(원화)
+
+		DataMap beforeRefund = mapper.selectBOORderRefundAmtSumInqire(refundVO);
+		Integer orderRefundAmtSum = 0;		// 해당주문의 이전 총환불금액
+		Integer wonOrderRefundAmtSum = 0;	// 해당주문의 이전 총환불금액(원화)
+		if(!ObjectUtils.isEmpty(beforeRefund)) {
+			orderRefundAmtSum = ((BigDecimal) beforeRefund.get("orderRefundAmtSum")).intValue(); // 해당주문의 이전 총환불금액
+			wonOrderRefundAmtSum = ((BigDecimal)beforeRefund.get("wonOrderRefundAmtSum")).intValue(); // 해당주문의 이전 총환불금액(원화)
 		}
-		Integer orderRefundAmtSum = mapper.selectBOORderRefundAmtSumInqire(refundVO); // 해당 주문의 총 환불금액
 
 		Integer dlvyAmtRefundAmt = 0; // 최종 배송비 처리 금액 ( 환불 배송비, 반품 배송비 조건에 따라 변동 )
+		Integer wonDlvyAmtRefundAmt = 0; // 최종 배송비 처리 금액 ( 환불 배송비, 반품 배송비 조건에 따라 변동 )
 		Integer refundDlvyAmt = 0; // 환불 배송비 금액
+		Integer wonRefundDlvyAmt = 0; // 환불 배송비 금액
 
 		Integer finalRefundAmt = 0;
+		Integer finalWonRefundAmt = 0;
 		finalRefundAmt = refundAmt;
+		finalWonRefundAmt = wonRefundAmt;
 
 		try {
 
@@ -506,16 +529,19 @@ public class BORtngudrefndService {
 */
 
 				refundDlvyAmt = Integer.parseInt(refundVO.getRefundDlvyAmt());
+				wonRefundDlvyAmt = Integer.parseInt(refundVO.getWonRefundDlvyAmt());
 				log.debug("여기 아래부터 배송비랑 환불금액 산정하는데 그전에 refundVO 데이터 확인 : {}", refundVO);
 				if ("01".equals(refundVO.getRefundTyCd())) {
 
 					refundAmt += refundDlvyAmt; // 환불 배송비 포함 반품
+					wonRefundAmt += wonRefundDlvyAmt;
 
 					refundVO.setDlvyAmtRefundAmt("0");
 
 				} else if ("02".equals(refundVO.getRefundTyCd())) {
 
 					dlvyAmtRefundAmt = Integer.parseInt(refundVO.getReturnDlvyAmt());
+					wonDlvyAmtRefundAmt = Integer.parseInt(refundVO.getWonReturnDlvyAmt());
 
 					// 배송비 책임
 					if ("01".equals(refundVO.getReturnDlvyRspnsblCd())) { // 구매자 책임
@@ -530,12 +556,14 @@ public class BORtngudrefndService {
 						if ("02".equals(refundVO.getReturnDlvyPymntTyCd()) && refundVO.getReturnDlvyAmt() != null) { // 환불금액에서 차감
 							// refundAmt -= dlvyAmtRefundAmt;
 							refundAmt = refundAmt - dlvyAmtRefundAmt > 0 ? refundAmt - dlvyAmtRefundAmt : 0;
+							wonRefundAmt = wonRefundAmt - wonDlvyAmtRefundAmt > 0 ? wonRefundAmt - wonDlvyAmtRefundAmt : 0;
 						}
 
 						refundVO.setDlvyAmtRefundAmt(StringUtil.isNullToString(dlvyAmtRefundAmt));
 
 					} else if ("02".equals(refundVO.getReturnDlvyRspnsblCd())) { // 판매자
 						refundAmt += refundDlvyAmt; // 환불 배송비 포함 반품
+						wonRefundAmt += wonRefundDlvyAmt;
 
 						refundVO.setDlvyAmtRefundAmt("0");
 					}
@@ -568,13 +596,23 @@ public class BORtngudrefndService {
 
 							log.info("setle : {}", setle);
 							Integer setleAmt = setle.getSetleAmt(); // 결제금액
+							Integer wonSetleAmt = setle.getWonSetleAmt(); // 결제금액(원화)
+
 							Integer remMnyAmt = setleAmt - orderRefundAmtSum;
-							log.info("이번 환불 결제건에서 환불할 금액 확인 remMnyAmt : {}", remMnyAmt);
-							log.info("이번 환불 결제건에서 환불할 금액 확인 refundAmt : {}", refundAmt);
-							log.info("이번 환불 결제건에서 환불할 금액 확인 orderRefundAmtSum : {}", orderRefundAmtSum);
+							Integer wonRemMnyAmt = wonSetleAmt - wonOrderRefundAmtSum;
+
+							log.info("이번 환불 결제건에서 환불할 금액 확인 remMnyAmt : {}, {}", remMnyAmt, wonRemMnyAmt);
+							log.info("이번 환불 결제건에서 환불할 금액 확인 refundAmt : {}, {}", refundAmt, wonRefundAmt);
+							log.info("이번 환불 결제건에서 환불할 금액 확인 orderRefundAmtSum : {}, {}", orderRefundAmtSum, wonOrderRefundAmtSum);
+
 							Integer cancelAmt = 0; // 취소금액
+							Integer wonCancelAmt = 0; // 취소금액(원화)
+
+							// 환불금액, 결제금액 - (이전환불금액 - 환불금액)
 							cancelAmt = Math.min(refundAmt, setleAmt - (orderRefundAmtSum - refundAmt));
-							log.info("이번 환불 결제건에서 환불할 금액 확인 cancelAmt : {}", cancelAmt);
+							wonCancelAmt = Math.min(wonRefundAmt, wonSetleAmt - (wonOrderRefundAmtSum - wonRefundAmt));
+
+							log.info("이번 환불 결제건에서 환불할 금액 확인 cancelAmt : {}, {}", cancelAmt, wonCancelAmt);
 							Integer receiptCancelAmt = cancelAmt; // 현금영수증 취소금액
 							log.info("이번 환불 결제건에서 환불할 현금영수증 GC 머니 추가 전 금액 확인 receiptCancelAmt : {}", receiptCancelAmt);
 
@@ -734,6 +772,7 @@ public class BORtngudrefndService {
 							}
 							/************************** KCP 환불 코드 세팅 END *************************/
 
+							// 02:무통장계좌이체, 08:마일리지, 13:수동
 							if ("02".equals(setle.getSetleTyCd()) || "08".equals(setle.getSetleTyCd()) || "13".equals(setle.getSetleTyCd())) {
 
 								if ("02".equals(setle.getSetleTyCd())) { // 무통장입금
@@ -788,9 +827,7 @@ public class BORtngudrefndService {
 
 								// TODO :
 
-							} else if ("08".equals(setle.getSetleTyCd())) { // 마일리지
-								// 마일리지 사용취소로 처리
-							} else if ("09".equals(setle.getSetleTyCd())) {
+							}  else if ("09".equals(setle.getSetleTyCd())) {
 								// 포스 환불은 포스기계쪽에서 처리됌 GCONE 에서는 데이터 처리만 진행
 							} else if ("11".equals(setle.getSetleTyCd())) { // TODO : 복합 결제 취소 로직 확인 필요
 
@@ -802,8 +839,8 @@ public class BORtngudrefndService {
 
 							} else { // 일반결제
 
-								// 토스페이
-								if ("tosspay".equals(setle.getPgCmpnyNm()) || "gcpay".equals(setle.getPgCmpnyNm()) || "toss".equals(setle.getPgCmpnyNm()) || "naverpay".equals(setle.getPgCmpnyNm()) || "kakaopay".equals(setle.getPgCmpnyNm())) {
+								// 토스페이  || "naverpay".equals(setle.getPgCmpnyNm()) >> 네이버페이는 토스에서 분리해서 키움으로 이동
+								if ("tosspay".equals(setle.getPgCmpnyNm()) || "gcpay".equals(setle.getPgCmpnyNm()) || "toss".equals(setle.getPgCmpnyNm())  || "kakaopay".equals(setle.getPgCmpnyNm())) {
 									log.debug("toss 취소 진입");
 									BOPayVO payVO = new BOPayVO();
 									payVO.setOrderId(ordrInnb); // 주문 고유번호
@@ -812,9 +849,9 @@ public class BORtngudrefndService {
 									payVO.setCancelReason(refundVO.getRefundResnCn()); // 취소사유
 
 									if ("01".equals(refundVO.getRefundScopeCd())) {
-										payVO.setCancelAmount(String.valueOf(cancelAmt)); // 취소금액 ( 금액이 없으면 전체취소 )
+										payVO.setCancelAmount(String.valueOf(wonCancelAmt)); // 취소금액 ( 금액이 없으면 전체취소 )
 									} else if ("02".equals(refundVO.getRefundScopeCd())) {
-										payVO.setCancelAmount(String.valueOf(cancelAmt)); // 취소금액 ( 금액이 없으면 전체취소 )
+										payVO.setCancelAmount(String.valueOf(wonCancelAmt)); // 취소금액 ( 금액이 없으면 전체취소 )
 									}
 
 									payVO.setBank(refundVO.getRefundAcntBnnkCd()); // 환불 은행코드
@@ -841,10 +878,12 @@ public class BORtngudrefndService {
 									payVO.setMId(setle.getSetleMid()); // 결제 MID(상점키)
 
 									payVO.setPaymentKey(setle.getDelngNb()); // 거래번호
+
 									log.info("토스 취소 파라미터 확인 : {}", payVO);
 									setleCancelResultMessage = payService.cancelTossPay(payVO);
 									log.info("결제 취소 API 결과 확인 : {}", setleCancelResultMessage);
 									log.info("결제 취소 API 결과 확인 : {}", setleCancelResultMessage.get("response"));
+
 									String jsonString = (String) setleCancelResultMessage.get("response");
 									ObjectMapper objectMapper = new ObjectMapper();
 									responseMap = objectMapper.readValue(jsonString, Map.class);
@@ -984,7 +1023,7 @@ public class BORtngudrefndService {
 									payVO.setSetleTyCd(setle.getSetleTyCd()); // 결제 유형 코드
 
 									payVO.setCancelReason(refundVO.getRefundResnCn()); // 취소사유
-									payVO.setCancelAmount(String.valueOf(cancelAmt)); // 취소금액 ( 금액이 없으면 전체취소 )
+									payVO.setCancelAmount(String.valueOf(wonCancelAmt)); // 취소금액 ( 금액이 없으면 전체취소 )
 
 									payVO.setBank(refundVO.getRefundAcntBnnkCd()); // 계좌 입금 후 취소시 환불은행코드?
 									payVO.setAccountNumber(refundVO.getRefundAcntnb()); // 환불 계좌번호
@@ -992,8 +1031,8 @@ public class BORtngudrefndService {
 
 									payVO.setTno(setle.getDelngNb()); // 거래번호
 									payVO.setModType(refundModeType); // 전체 취소, 부분 취소
-									payVO.setModMny(String.valueOf(cancelAmt)); // 부분취소 요청 금액
-									payVO.setRemMny(String.valueOf(remMnyAmt)); // 부분취소 가능 금액
+									payVO.setModMny(String.valueOf(wonCancelAmt)); // 부분취소 요청 금액
+									payVO.setRemMny(String.valueOf(wonRemMnyAmt)); // 부분취소 가능 금액
 
 									payVO.setSubModType(sub_mod_type); // 전체 취소, 부분 취소
 
@@ -1060,6 +1099,58 @@ public class BORtngudrefndService {
 
 									}
 
+								   // kiwoom
+								}  else if ("kiwoom".equals(setle.getPgCmpnyNm()) || "naverpay".equals(setle.getPgCmpnyNm())) {
+									log.debug("kiwoom 취소 진입");
+
+									BOPayVO payVO = new BOPayVO();
+									payVO.setOrderId(ordrInnb); // 주문 고유번호
+									payVO.setSopmalCd(sopmalCd); // 쇼핑몰 코드
+
+									payVO.setMId(setle.getSetleMid()); // 결제 MID(상점키)
+									payVO.setSetleTyCd(setle.getSetleTyCd()); // 결제 유형 코드
+									payVO.setCancelReason(refundVO.getRefundResnCn()); // 취소사유
+									payVO.setTno(setle.getDelngNb()); // 거래번호
+
+									//부분 취소 처리 경우 승인금액보다 취소요청금액이 적으면 부분 취소 처리
+									payVO.setCancelAmount(String.valueOf(wonCancelAmt)); // 취소금액
+
+									if ("Y".equals(setle.getMemorSetleAt())) {
+										payVO.setMemorSetleAt("Y");
+									}
+
+//									개발서버 네이버페이 CPID 구분 적용 취소
+									payVO.setModGubun(setle.getPgCmpnyNm());  //결제키 구분용
+									if ("kiwoom".equals(setle.getPgCmpnyNm())) {
+										payVO.setPayMethod("CARD");
+									} else if ("naverpay".equals(setle.getPgCmpnyNm())) {
+										payVO.setPayMethod("NAVERPAY");
+									}
+
+									log.info("kiwoom api 전달 파라미터 확인 : {}", payVO);
+									setleCancelResultMessage = payService.cancelKiwoomPay(payVO);
+									log.info("결제 취소 API 결과 확인 : {}", setleCancelResultMessage);
+									log.info("결제 취소 API 결과 확인 response : {}", setleCancelResultMessage.get("response"));
+
+									String jsonString = (String) setleCancelResultMessage.get("response");
+									ObjectMapper objectMapper = new ObjectMapper();
+									responseMap = objectMapper.readValue(jsonString, Map.class);
+									log.debug("리스펀스 결과 : {}", responseMap);
+									log.info("리스펀스 결과 값 : {}", responseMap.get("RESULTCODE"));
+
+									if ("0000".equals(responseMap.get("RESULTCODE"))) {
+										// 0000 : 취소성공
+										log.debug("0000");
+										message.put("setleStatus", responseMap.get("RESULTCODE"));
+										message.put("setleMessage", responseMap.get("ERRORMESSAGE"));
+									} else {
+										log.debug("1111");
+										message.put("setleStatus", responseMap.get("RESULTCODE"));
+										message.put("setleMessage", responseMap.get("ERRORMESSAGE"));
+										logDtlCn = "잘못된 요청입니다. 관리자에게 문의하세요.";
+										throw new WnbtRestException("잘못된 요청입니다. 관리자에게 문의하세요.");
+									}
+
 								}
 
 							}
@@ -1202,6 +1293,7 @@ public class BORtngudrefndService {
 
 				// ########################################### 최종 반품/환불 상태변경 ###########################################
 				boRtngudrefndVO.setRefundAmt(String.valueOf(finalRefundAmt));
+				boRtngudrefndVO.setWonRefundAmt(String.valueOf(finalWonRefundAmt));
 				boRtngudrefndVO.setDlvyAmtRefundAmt(refundVO.getDlvyAmtRefundAmt());
 				boRtngudrefndVO.setRefundProcsSttusCd("03");
 				log.debug("환불 상태값이랑 정보 수정하기 전 boRtngudrefndVO :: {}", boRtngudrefndVO);
@@ -1286,7 +1378,21 @@ public class BORtngudrefndService {
 		if ("0".equals(message.get("status"))) {
 
 			// ########################################### 상품 재고  ###########################################
-			boGoodsService.updateRefundUsefulInvntryQy(refundVO);
+			BOOrdrVO ordrVO = new BOOrdrVO();
+			ordrVO.setOrdrInnb(refundVO.getOrdrInnb());
+			ordrVO.setSopmalCd(refundVO.getSopmalCd());
+
+			DataMap ordrDtl = ordrMapper.selectOrdrDtl(ordrVO);
+			boolean subsvcAt = "Y".equals(ordrDtl.get("subsvcAt"));
+			// 구독서비스 여부(subsvcAt)에 따라 재고 처리 로직을 분기
+			if(subsvcAt) {
+				// 구독서비스
+				ordrVO.setSubsvcInnb(ordrDtl.get("subsvcInnb").toString());
+				subsvcService.updateSubsvcRefundUsefulInvntryQy(ordrVO);
+			} else {
+				// 일반 주문
+				boGoodsService.updateRefundUsefulInvntryQy(refundVO);
+			}
 
 
 			// ########################################### 쿠폰 복원 ###########################################
@@ -1441,7 +1547,21 @@ public class BORtngudrefndService {
 
 
 			// ########################################### 상품 재고  ###########################################
-			boGoodsService.updateCancelOrderUsefulInvntryQy(ordrVO, ordrVO.getOrdrInnb());
+			BOOrdrVO boOrdrVO = new BOOrdrVO();
+			boOrdrVO.setOrdrInnb(ordrVO.getOrdrInnb());
+			boOrdrVO.setSopmalCd(ordrVO.getSopmalCd());
+
+			DataMap ordrDtl = ordrMapper.selectOrdrDtl(boOrdrVO);
+			boolean subsvcAt = "Y".equals(ordrDtl.get("subsvcAt"));
+			// 구독서비스 여부(subsvcAt)에 따라 재고 처리 로직을 분기
+			if(subsvcAt) {
+				// 구독서비스
+				boOrdrVO.setSubsvcInnb(ordrDtl.get("subsvcInnb").toString());
+				subsvcService.updateSubsvcCancelOrderUsefulInvntryQy(boOrdrVO);
+			} else {
+				// 일반 주문
+				boGoodsService.updateCancelOrderUsefulInvntryQy(ordrVO, ordrVO.getOrdrInnb());
+			}
 
 			resotreResult.put("restoreResult", "0");
 		} catch (Exception e) {

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

@@ -23,6 +23,8 @@ public class BORefundSetleVO extends AbstractVO {
 
 	private Integer setleAmt;
 
+	private Integer wonSetleAmt;
+
 	private String pgCmpnyNm;
 
 	private String pgInnb;

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

@@ -15,7 +15,7 @@ public class BORtngudrefndVO extends AbstractVO{
 	private String ordrDlvyInnb;
 
 	private String[] ordrDlvyInnbArr;
-	//쇼핑몰코드
+	/**쇼핑몰코드*/
 	private String sopmalCd;
 	//TODO:: 추후 SESSION에서 처리 사용자,관리자 구분
 	private String usrDv;
@@ -25,69 +25,71 @@ public class BORtngudrefndVO extends AbstractVO{
 	private String orderReInnb;
 	private String refundCd; // 환불 코드 번호
 	private String orderRefundInnb;
-	/*주문고유번호*/
+	/**주문고유번호*/
 	private String ordrInnb;
-	/*환불신청일시*/
+	/**환불신청일시*/
 	private String refundReqstDt;
-	/*환불완료일시*/
+	/**환불완료일시*/
 	private String refundComptDt;
-	/*신청(request), 처리중(ing), 완료(complete)*/
+	/**신청(request), 처리중(ing), 완료(complete)*/
 	private String refundProcsSttusCd;
-	/*신청(request), 처리중(ing), 완료(complete) 이전 상태 */
+	/**신청(request), 처리중(ing), 완료(complete) 이전 상태 */
 	private String oldRefundProcsSttusCd;
-	/*결제취소(cancel_payment),반품환불(return),배송비환불(shipping_price)*/
+	/**결제취소(cancel_payment),반품환불(return),배송비환불(shipping_price)*/
 	private String refundTyCd;
-	/*전체취소(full), 부분취소(partial)*/
+	/**전체취소(full), 부분취소(partial)*/
 	private String refundScopeCd;
-	/*환불사유내용*/
+	/**환불사유내용*/
 	private String refundResnCn;
-	/*계좌이체(account), 무통장(bank), 신용카드(card), 수동(manual), ?(payco_coupon), 포스기기(pos)*/
+	/**계좌이체(account), 무통장(bank), 신용카드(card), 수동(manual), ?(payco_coupon), 포스기기(pos)*/
 	private String refundMthCd;
 	/** 환불계좌은행코드 */
 	private String refundAcntBnnkCd; // 환불계좌은행코드
-	/*환불계좌은행명*/
+	/**환불계좌은행명*/
 	private String refundAcntBnnkNm;
-	/*환불계좌예금주명*/
+	/**환불계좌예금주명*/
 	private String refundAcntDpstrNm;
-	/*환불계좌번호*/
+	/**환불계좌번호*/
 	private String refundAcntnb;
-	/*환불금액*/
+	/**환불금액*/
 	private String refundAmt;
-	/*환불적립금액*/
+	/**환불금액(원화)*/
+	private String wonRefundAmt;
+	/**환불적립금액*/
 	private Integer refundAccmlmnyAmt;
-	/*배송비환불총금액*/
+	/**배송비환불총금액*/
 	private Integer dlvyAmtTotRefundAmt;
-	/*쿠폰할인보정금액*/
+	/**쿠폰할인보정금액*/
 	private Integer coupDscntRevisnAmt;
-	/*적립금보정금액*/
+	/**적립금보정금액*/
 	private Integer accmlmnyRevisnAmt;
-	/*에누리보정금액*/
+	/**에누리보정금액*/
 	private Integer enuriRevisnAmt;
-	/*적립금유효일자*/
+	/**적립금유효일자*/
 	private String accmlmnyValidDe;
-	/*다운로드쿠폰 고유번호*/
+	/**다운로드쿠폰 고유번호*/
 	private String dwldCouponInnb;
-	/*상태메모내용*/
+	/**상태메모내용*/
 	private String sttusMemoCn;
-	/*관리자메모내용*/
+	/**관리자메모내용*/
 	private String mngrMemoCn;
-	/*관리자 고유번호*/
+	/**관리자 고유번호*/
 	private String mngrInnb;
-	/*스마트쇼핑환불신청일시*/
+	/**스마트쇼핑환불신청일시*/
 	private String smrtShopngRefndReqstDt;
-	/*스마트쇼핑환불완료일시*/
+	/**스마트쇼핑환불완료일시*/
 	private String smrtShopngRefndComptDt;
-	/*cancel_done, refund_request*/
+	/**cancel_done, refund_request*/
 	private String smrtShopngRefndProcsSttusCd;
-	/*스마트쇼핑클레임발생금액*/
+	/**스마트쇼핑클레임발생금액*/
 	private Integer smrtShopngClaimOccrrncAmt;
-	/*스마트쇼핑초도배송비금액*/
+	/**스마트쇼핑초도배송비금액*/
 	private Integer smrtShopngFrsttmeDlvyAmtAmt;
-	/*반품환불보류상품번호내용*/
+	/**반품환불보류상품번호내용*/
 	private String returnRefndDferGoodsNbCn;
-	/*사용여부*/
+	/**사용여부*/
 	private String useAt;
-	/*처리대상자 구분*/
+	/**처리대상자 구분*/
 	private String procsTargetDv;
 	private String returnCd; // 반품 코드
 	/**신청(request), 완료(complete), 철회(retraction)*/
@@ -108,6 +110,8 @@ public class BORtngudrefndVO extends AbstractVO{
 	private String returnCstmrMbtlnb;
 	/** 반품배송비금액 */
 	private String returnDlvyAmt;
+	/** 반품배송비금액(원화) */
+	private String wonReturnDlvyAmt;
 	/** company,provider */
 	private String returnDlvyAmtRecptTrgetCd;
 	/**구매자(buyer), 판매자(seller)*/
@@ -144,10 +148,14 @@ public class BORtngudrefndVO extends AbstractVO{
 	private String smrtShopngReturnProcsSttusCd;
 	/** 배송비환불금액 */
 	private String dlvyAmtRefundAmt;
+	/** 배송비환불금액(원화) */
+	private String wonDlvyAmtRefundAmt;
 	/** 지번 or 도로명 주소  */
 	private String lnbOrRnmAdres;
 	/** 환불배송비총금액 */
 	private String refundDlvyAmt;
+	/** 환불배송비총금액(원화) */
+	private String wonRefundDlvyAmt;
 	/** 반품 환불 상품 옵션 리스트 */
 	private List<BOOrderReItemVO> orderReItemVOList;
 	/**상세 내용*/
@@ -167,11 +175,11 @@ public class BORtngudrefndVO extends AbstractVO{
 	public String endDt;
 	//날짜 검색 구분
 	private String srchDtDv;
-	//** 반품처리상태 */
+	/** 반품처리상태 */
 	private String[] srchReturnProcsStuusCd;
-	//** 환불처리상태 */
+	/** 환불처리상태 */
 	private String[] srchRefundProcsSttusCd;
-	//** 회수방법(반품) */
+	/** 회수방법(반품) */
 	private String srchReturnMthCd;
 	/**검색시작일*/
 	public String srchStartDate;
@@ -189,9 +197,9 @@ public class BORtngudrefndVO extends AbstractVO{
 	private String mbtlnb;
 	/** 회원타입코드 */
 	private String mbrTyCd;
-	/*시크릿 키*/
+	/**시크릿 키*/
 	private String secretKey;
-	/*회원 사이트정보 갱신용*/
+	/**회원 사이트정보 갱신용*/
 	private String siteMbrInnb;
 	private String siteMbrDvCd;
 
@@ -200,7 +208,7 @@ public class BORtngudrefndVO extends AbstractVO{
 	/** 실 환불 GC 머니 금액  */
 	private String prosbleCancelCashAmt;
 
-	//** 반품처리상태 */
+	/** 반품처리상태 */
 	private String[] returnProcsStuusCd;
 
 	private String serverDv;

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

@@ -43,4 +43,15 @@ public interface BOSubsvcOrdrMapper {
     /** 구독서비스 상품준비 관리 상품매칭 - 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

@@ -166,4 +166,82 @@ public class BOSubsvcOrdrService {
         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

@@ -67,4 +67,12 @@ private static final long serialVersionUID = 1L;
 	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/promtn/purchs/service/BOPurchsEvtService.java

@@ -291,7 +291,7 @@ public class BOPurchsEvtService {
 			if ("01".equals(purchsEvtVO.getEvtDv())) {
 
 				if (purchsEvtVO.getDeleteBnefList() != null) {
-					log.debug(" 삭제 리스트 확인 purchsEvtVO . get deleteList : {}", purchsEvtVO.getDeleteBnefList());
+					log.debug(" 삭제 리스트 확인 purchsEvtVO . get deleteList : {}", (Object) purchsEvtVO.getDeleteBnefList());
 					for (String deleteBnefInnb : purchsEvtVO.getDeleteBnefList()) {
 						log.debug("deleteBnefInnb : {}", deleteBnefInnb);
 						purchsEvtVO.setDeleteBnefInnb(Integer.parseInt(deleteBnefInnb));
@@ -309,24 +309,10 @@ public class BOPurchsEvtService {
 					}
 				}
 
-				// 사은품 이벤트
+			// 사은품 이벤트
 			} else if ("02".equals(purchsEvtVO.getEvtDv())) {
-
-
-/*
-				if (!StringUtils.isEmpty(Arrays.toString(purchsEvtVO.getDeleteGiftList()))) {
-					log.debug(" 삭제 리스트 확인 purchsEvtVO . get getDeleteGiftList : {}", purchsEvtVO.getDeleteGiftList());
-					for (String deleteGiftInnb : purchsEvtVO.getDeleteGiftList()) {
-						log.debug("deleteGiftInnb : {}", deleteGiftInnb);
-						purchsEvtVO.setDeleteGiftInnb(Integer.parseInt(deleteGiftInnb));
-						mapper.deleteBOPurchsEvtGiftDel(purchsEvtVO);
-					}
-				}
-*/
-
-
 				if (!StringUtils.isEmpty(Arrays.toString(purchsEvtVO.getDeleteBnefList()))) {
-					log.debug(" 삭제 리스트 확인 purchsEvtVO . get deleteList : {}", purchsEvtVO.getDeleteBnefList());
+					log.debug(" 삭제 리스트 확인 purchsEvtVO . get deleteList : {}", (Object) purchsEvtVO.getDeleteBnefList());
 					for (String deleteBnefInnb : purchsEvtVO.getDeleteBnefList()) {
 						log.debug("deleteBnefInnb : {}", deleteBnefInnb);
 						purchsEvtVO.setDeleteBnefInnb(Integer.parseInt(deleteBnefInnb));
@@ -334,7 +320,6 @@ public class BOPurchsEvtService {
 					}
 				}
 
-
 				if (purchsEvtVO.getDiscountBnefVOList() != null && !purchsEvtVO.getDiscountBnefVOList().isEmpty()) {
 					log.debug("사은품 혜택 진입");
 					for (BOPurchsEvtDiscountBnefVO tempVO : purchsEvtVO.getDiscountBnefVOList()) {

src/main/java/com/wb/domainserver/domain/gcone/setup/cost/mapper/BOCostMapper.java

@@ -0,0 +1,34 @@
+package com.wb.domainserver.domain.gcone.setup.cost.mapper;
+
+import com.wb.domainserver.domain.gcone.setup.cost.vo.BOCostVO;
+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 BOCostMapper {
+
+	/**
+	 * 원가 설정 목록 조회
+	 * @param vo
+	 * @return
+	 */
+	public List<DataMap> selectBOCostPriceList(BOCostVO vo);
+
+	/**
+	 * 원가 설정 삭제
+	 * @param vo
+	 * @return
+	 */
+	public int deleteBOCostPrice(BOCostVO vo);
+
+	/**
+	 * 원가 설정 추가
+	 * @param dm
+	 * @return
+	 */
+	public int insertBOCostPrice(DataMap dm);
+}

src/main/java/com/wb/domainserver/domain/gcone/setup/cost/service/BOCostService.java

@@ -0,0 +1,94 @@
+package com.wb.domainserver.domain.gcone.setup.cost.service;
+
+import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
+import com.wb.domainserver.domain.gcone.setup.cost.mapper.BOCostMapper;
+import com.wb.domainserver.domain.gcone.setup.cost.vo.BOCostVO;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.exception.code.ErrorCode;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import com.wb.domainserver.util.string.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 원가 설정 BO Serivce
+ *
+ * @author 이대환
+ * @version 1.0
+ * @see <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-05-29 이대환 최초 생성
+ *
+ * </pre>
+ * @since 2026-05-29
+ */
+@Slf4j
+@Service
+public class BOCostService {
+	@Autowired
+	private BOMaComncdService bOMaComncdService;
+	@Autowired
+	private BOCostMapper mapper;
+
+	/**
+	 * 원가 설정 목록 조회
+	 * @param vo
+	 * @return List<DataMap>
+	 */
+	public List<DataMap> selectBOCostPriceList(BOCostVO vo) {
+		List<DataMap> costList = new ArrayList<>();
+		costList = mapper.selectBOCostPriceList(vo);
+
+		return costList;
+	}
+
+	/**
+	 * 원가 설정 수정
+	 * @param vo
+	 */
+	@Transactional
+	public DataMap updateBOCostPriceSetup(BOCostVO vo) {
+		DataMap message = new DataMap();
+
+		try {
+			mapper.deleteBOCostPrice(vo);
+
+			DataMap paramMap = new DataMap();
+			paramMap.put("regusr", vo.getRegusr());
+
+			int[] ctInnbArr = vo.getCtInnbArr();
+			if (!ObjectUtils.isEmpty(ctInnbArr)) {
+				for (int i = 0; i < ctInnbArr.length; i++) {
+					paramMap.put("stdrDe", vo.getStdrDeArr()[i]);
+					paramMap.put("usdRate", vo.getUsdRateArr()[i]);
+					paramMap.put("jpDlvyCt", vo.getJpDlvyCtArr()[i]);
+					paramMap.put("intlDlvyAmt", vo.getIntlDlvyAmtArr()[i]);
+					paramMap.put("pltfomFee", vo.getPltfomFeeArr()[i]);
+					paramMap.put("expctTax", vo.getExpctTaxArr()[i]);
+					paramMap.put("cstmsFee", vo.getCstmsFeeArr()[i]);
+					paramMap.put("krDlvyCt", vo.getKrDlvyCtArr()[i]);
+
+					mapper.insertBOCostPrice(paramMap);
+				}
+			}
+
+			message.put("result", "success");
+		} catch (WnbtRestException wre) {
+			throw new WnbtRestException(wre.getMessage());
+		} catch (Exception e) {
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
+		}
+
+		return message;
+	}
+}

src/main/java/com/wb/domainserver/domain/gcone/setup/cost/vo/BOCostVO.java

@@ -0,0 +1,39 @@
+package com.wb.domainserver.domain.gcone.setup.cost.vo;
+
+import com.wb.domainserver.domain.comm.vo.AbstractVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class BOCostVO extends AbstractVO {
+
+	/** 원가 고유번호 */
+	private int[] ctInnbArr;
+
+	/** 기준일자 */
+	private String[] stdrDeArr;
+
+	/** USD 환율 (1,000 円) */
+	private BigDecimal[] usdRateArr;
+
+	/** 일본 내 물류비 */
+	private int[] jpDlvyCtArr;
+
+	/** 운임비용(JP) */
+	private int[] intlDlvyAmtArr;
+
+	/** 플랫폼 수수료율 */
+	private BigDecimal[] pltfomFeeArr;
+
+	/** 예상세율 */
+	private BigDecimal[] expctTaxArr;
+
+	/** 통관수수료 */
+	private int[] cstmsFeeArr;
+
+	/** 운임비용(KR) */
+	private int[] krDlvyCtArr;
+}

src/main/java/com/wb/domainserver/domain/gcone/setup/exchngrt/service/BOExchngrtService.java

@@ -0,0 +1,56 @@
+package com.wb.domainserver.domain.gcone.setup.exchngrt.service;
+
+import com.wb.domainserver.domain.admin.store.sopmal.mapper.BOMaSopmalMapper;
+import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
+import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.exception.code.ErrorCode;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 환율 설정 BO Serivce
+ *
+ * @author 이대환
+ * @version 1.0
+ * @see <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ * </pre>
+ * @since 2026-04-27
+ */
+@Slf4j
+@Service
+public class BOExchngrtService {
+	@Autowired
+	private BOMaComncdService bOMaComncdService;
+	@Autowired
+	private BOMaSopmalMapper mapper;
+
+	/**
+	 * 환율 설정 수정
+	 * @param boMaSopmalVO
+	 */
+	@Transactional
+	public DataMap updateBOExchngrtSetup(BOMaSopmalVO boMaSopmalVO) {
+		DataMap message = new DataMap();
+
+		try {
+			mapper.updateBOExchngrtSetup(boMaSopmalVO);
+			message.put("result", "success");
+		} catch (WnbtRestException wre) {
+			throw new WnbtRestException(wre.getMessage());
+		} catch (Exception e) {
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
+		}
+
+		return message;
+	}
+}

src/main/java/com/wb/domainserver/domain/gcone/setup/exchngrt/vo/BOExchngrtVO.java

@@ -0,0 +1,32 @@
+package com.wb.domainserver.domain.gcone.setup.exchngrt.vo;
+
+import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
+import com.wb.domainserver.domain.comm.vo.AbstractVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class BOExchngrtVO extends AbstractVO {
+
+	/** 쇼핑몰 코드 */
+	private String sopmalCd;
+
+	/** 1엔 환율(살때) */
+	private String buyRate;
+
+	/** 1엔 환율(팔때) */
+	private String sellRate;
+
+	/** BOMaSopmalVO로 변환 */
+	public BOMaSopmalVO setBOMaSopmalVO() {
+		BOMaSopmalVO boMaSopmalVO = new BOMaSopmalVO();
+		boMaSopmalVO.setSopmalCd(this.getSopmalCd());
+		boMaSopmalVO.setBuyRate(this.getBuyRate());
+		boMaSopmalVO.setSellRate(this.getSellRate());
+		boMaSopmalVO.setRegusr(this.getRegusr());
+		boMaSopmalVO.setUpdusr(this.getUpdusr());
+
+		return boMaSopmalVO;
+	}
+}

src/main/java/com/wb/domainserver/domain/gcone/setup/family/service/BOFamilyService.java

@@ -0,0 +1,76 @@
+package com.wb.domainserver.domain.gcone.setup.family.service;
+
+import com.wb.domainserver.domain.admin.store.sopmal.mapper.BOMaSopmalMapper;
+import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
+import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.exception.code.ErrorCode;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import com.wb.domainserver.util.string.StringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * 패밀리사이트 설정 BO Serivce
+ *
+ * @author 이대환
+ * @version 1.0
+ * @see <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ * </pre>
+ * @since 2026-04-27
+ */
+@Slf4j
+@Service
+public class BOFamilyService {
+	@Autowired
+	private BOMaComncdService bOMaComncdService;
+	@Autowired
+	private BOMaSopmalMapper mapper;
+
+	/**
+	 * 패밀리사이트 설정 수정
+	 * @param boMaSopmalVO
+	 */
+	@Transactional
+	public DataMap updateBOFamilySetup(BOMaSopmalVO boMaSopmalVO) {
+		DataMap message = new DataMap();
+
+		try {
+			mapper.deteteBOShopFamilySite(boMaSopmalVO);
+
+			DataMap paramMap = new DataMap();
+			paramMap.put("sopmalCd", boMaSopmalVO.getSopmalCd());
+			paramMap.put("regusr", boMaSopmalVO.getRegusr());
+
+			if (!ObjectUtils.isEmpty(boMaSopmalVO.getFamilySiteNmArr())) {
+				String[] siteNm = boMaSopmalVO.getFamilySiteNmArr();
+				String[] siteUrl = boMaSopmalVO.getFamilySiteUrlArr();
+
+				for (int i = 0; i < siteNm.length; i++) {
+					if (!StringUtil.isEmpty(siteNm[i])) {
+						paramMap.put("familySiteNm", siteNm[i]);
+						paramMap.put("familySiteUrl", siteUrl[i]);
+						mapper.insertBOShopFamilySite(paramMap);
+					}
+				}
+			}
+
+			message.put("result", "success");
+		} catch (WnbtRestException wre) {
+			throw new WnbtRestException(wre.getMessage());
+		} catch (Exception e) {
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
+		}
+
+		return message;
+	}
+}

src/main/java/com/wb/domainserver/domain/gcone/setup/family/vo/BOFamilyVO.java

@@ -0,0 +1,32 @@
+package com.wb.domainserver.domain.gcone.setup.family.vo;
+
+import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
+import com.wb.domainserver.domain.comm.vo.AbstractVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class BOFamilyVO extends AbstractVO {
+
+	/** 쇼핑몰 코드 */
+	private String sopmalCd;
+
+	/** 패밀리사이트명 */
+	private String[] familySiteNmArr;
+
+	/** 패밀리사이트URL */
+	private String[] familySiteUrlArr;
+
+	/** BOMaSopmalVO로 변환 */
+	public BOMaSopmalVO setBOMaSopmalVO() {
+		BOMaSopmalVO boMaSopmalVO = new BOMaSopmalVO();
+		boMaSopmalVO.setSopmalCd(this.getSopmalCd());
+		boMaSopmalVO.setFamilySiteNmArr(this.getFamilySiteNmArr());
+		boMaSopmalVO.setFamilySiteUrlArr(this.getFamilySiteUrlArr());
+		boMaSopmalVO.setRegusr(this.getRegusr());
+		boMaSopmalVO.setUpdusr(this.getUpdusr());
+
+		return boMaSopmalVO;
+	}
+}

src/main/java/com/wb/domainserver/domain/gcone/setup/guidance/service/BOGuidanceService.java

@@ -0,0 +1,56 @@
+package com.wb.domainserver.domain.gcone.setup.guidance.service;
+
+import com.wb.domainserver.domain.admin.store.sopmal.mapper.BOMaSopmalMapper;
+import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
+import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
+import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.exception.code.ErrorCode;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 안내문구 설정 BO Serivce
+ *
+ * @author 이대환
+ * @version 1.0
+ * @see <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ * </pre>
+ * @since 2026-04-27
+ */
+@Slf4j
+@Service
+public class BOGuidanceService {
+	@Autowired
+	private BOMaComncdService bOMaComncdService;
+	@Autowired
+	private BOMaSopmalMapper mapper;
+
+	/**
+	 * 안내문구 설정 수정
+	 * @param boMaSopmalVO
+	 */
+	@Transactional
+	public DataMap updateBOGuidanceSetup(BOMaSopmalVO boMaSopmalVO) {
+		DataMap message = new DataMap();
+
+		try {
+			mapper.updateBOGuidanceSetup(boMaSopmalVO);
+			message.put("result", "success");
+		} catch (WnbtRestException wre) {
+			throw new WnbtRestException(wre.getMessage());
+		} catch (Exception e) {
+			throw new WnbtRestException(ErrorCode.INTERNAL_SERVER_ERROR);
+		}
+
+		return message;
+	}
+}

src/main/java/com/wb/domainserver/domain/gcone/setup/guidance/vo/BOGuidanceVO.java

@@ -0,0 +1,44 @@
+package com.wb.domainserver.domain.gcone.setup.guidance.vo;
+
+import com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO;
+import com.wb.domainserver.domain.comm.vo.AbstractVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class BOGuidanceVO extends AbstractVO {
+
+	/** 쇼핑몰 코드 */
+	private String sopmalCd;
+
+	/** 회원가입 안내 타이틀 */
+	private String joinGuidanceSj;
+
+	/** 회원가입 안내문구 */
+	private String joinGuidanceWords;
+
+	/** 회원가입 주요혜택 */
+	private String joinBnef;
+
+	/** 회원가입 주요문구 */
+	private String joinComptWords;
+
+	/** 구독서비스 안내문구 */
+	private String subsvcGuidanceWords;
+
+	/** BOMaSopmalVO로 변환 */
+	public BOMaSopmalVO setBOMaSopmalVO() {
+		BOMaSopmalVO boMaSopmalVO = new BOMaSopmalVO();
+		boMaSopmalVO.setSopmalCd(this.getSopmalCd());
+		boMaSopmalVO.setJoinGuidanceSj(this.getJoinGuidanceSj());
+		boMaSopmalVO.setJoinGuidanceWords(this.getJoinGuidanceWords());
+		boMaSopmalVO.setJoinBnef(this.getJoinBnef());
+		boMaSopmalVO.setJoinComptWords(this.getJoinComptWords());
+		boMaSopmalVO.setSubsvcGuidanceWords(this.getSubsvcGuidanceWords());
+		boMaSopmalVO.setRegusr(this.getRegusr());
+		boMaSopmalVO.setUpdusr(this.getUpdusr());
+
+		return boMaSopmalVO;
+	}
+}

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,31 +24,52 @@ import lombok.Data;
 * </pre>
  */
 @Data
+@EqualsAndHashCode(callSuper=true)
 public class BOSetupOrdrVO extends AbstractVO {
 	/** 쇼핑몰 코드 */
 	private String sopmalCd;
-	/**마일리지 지급 사용여부*/
-	private String mlgPymntAt;
-	/**마일리지 지급 구분코드*/
-	private String mlgPymntDvCd;
-	/**마일리지 지급 비율*/
-	private String mlgPymntRt;
-	/**마일리지 최대 지급 금액*/
-	private String mlgMxmmPymntAmt;
-	/**마일리지 최대 지급 금액 사용여부*/
-	private String mlgMxmmPymntAmtAt;
-	/**마일리지 유효기간*/
-	private String mlgValidPd;
-	/**마일리지 유효기간 사용여부*/
-	private String mlgValidPdAt;
-	/**여러곳배송여부*/
+
+//	여러 곳 배송
+	/** 여러곳배송여부 */
 	private String multiDlvyAt;
-	/**정기배송여부*/
+	/** 정기배송여부 */
 	private String fdrmDlvyAt;
-	/**선물하기여부*/
+
+//	선물하기
+	/** 선물하기여부 */
 	private String giftDlvyAt;
-	/**선물하기자동취소기간*/
+	/** 선물하기자동취소기간 */
 	private String giftDlvyAtmcCanclPd;
-	/*충전형마일리지 사용여부*/
+
+//	GC 머니
+	/** 충전형마일리지 사용여부 */
 	private String cashAt;
+
+//	마일리지 지급
+	/** 마일리지 지급 사용여부 */
+	private String mlgPymntAt;
+	/** 마일리지 지급 구분코드 */
+	private String mlgPymntDvCd;
+	/** 마일리지 지급 비율 */
+	private String mlgPymntRt;
+	/** 마일리지 최대 지급 금액 */
+	private String mlgMxmmPymntAmt;
+	/** 마일리지 최대 지급 금액 사용여부 */
+	private String mlgMxmmPymntAmtAt;
+	/** 마일리지 유효기간 */
+	private String mlgValidPd;
+	/** 마일리지 유효기간 사용여부 */
+	private String mlgValidPdAt;
+
+//	마일리지 사용 조건
+	/** 마일리지 보유 사용 금액 */
+	private String mlgHoldUseAmt;
+	/** 마일리지 결제금액 사용 금액 */
+	private String mlgSetleAmtUseAmt;
+	/** 마일리지 최소 사용 금액 */
+	private String mlgMummUseAmt;
+	/** 마일리지 최대 사용 구분(MLG_MXMM_USE_DV) */
+	private String mlgMxmmUseDv;
+	/** 마일리지 최대 사용 금액 */
+	private String mlgMxmmUseAmt;
 }

src/main/java/com/wb/domainserver/domain/mngr/goods/badge/controller/GoodsBadgeController.java

@@ -0,0 +1,54 @@
+package com.wb.domainserver.domain.mngr.goods.badge.controller;
+
+import com.wb.domainserver.domain.gcone.goods.badge.service.BOGoodsBadgeService;
+import com.wb.domainserver.domain.gcone.goods.badge.vo.BOGoodsBadgeVO;
+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.dataaccess.DataMap;
+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.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/mngr/goods/badge")
+public class GoodsBadgeController {
+
+	@Autowired
+	private BOGoodsBadgeService service;
+
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping("/selectGoodsBadgeSetup")
+	public String selectGoodsBadgeSetup(BOGoodsBadgeVO vo, ModelMap model,
+			@CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		vo.setSopmalCd(authSopmalCd);
+		DataMap content = new DataMap();
+		content.put("badgeList", service.selectBOGoodsBadgeList(vo));
+		model.addAttribute("resultMap", content);
+		return "mngr/goods/badge/GoodsBadgeSetupU";
+	}
+
+	@Policy(AuthPolicy.RESTRICTED)
+	@PostMapping(value = "/updateGoodsBadgeSetup", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> updateGoodsBadgeSetup(BOGoodsBadgeVO vo,
+			@CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		vo.setSopmalCd(authSopmalCd);
+		if ("01".equals(user.getSysDvCd())) {
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+		vo.setRegusr(user.getUserInnb());
+		vo.setUpdusr(user.getUserInnb());
+
+		DataMap message = service.updateBOGoodsBadgeSetup(vo);
+		return ResponseEntity.ok(WnbtResponse.builder().resBody(new WnbtResponseBody(message)).build());
+	}
+}

src/main/java/com/wb/domainserver/domain/mngr/goods/goodsmngr/controller/GoodsmngrController.java

@@ -479,10 +479,8 @@ public class GoodsmngrController {
 		List<?> cgo134List = bOMaComncdService.selectBOCommcdDetailList(maComncdVO);
 		content.put("goodsDftinfoInvntryPolicyList", cgo134List);
 
-		// 상품아이콘
-		maComncdVO = new BOMaComncdVO();
-		maComncdVO.setGroupCd("GOODS_ICON");
-		List<?> iconList = bOMaComncdService.selectBOCommcdDetailList(maComncdVO);
+		// 상품 배지
+		List<DataMap> iconList = service.selectBOGoodsBadgeList(vo);
 		content.put("iconList", iconList);
 
 		// 실시간수량배너구분코드
@@ -664,10 +662,7 @@ public class GoodsmngrController {
 
 		content.put("goodsDftinfoInvntryPolicyList", cgo134List); // 재고에 따른 판매
 
-		maComncdVO = new BOMaComncdVO();
-		maComncdVO.setGroupCd("GOODS_ICON");
-
-		List<?> iconList = bOMaComncdService.selectBOCommcdDetailList(maComncdVO);
+		List<DataMap> iconList = service.selectBOGoodsBadgeList(vo);
 
 		//브랜드 목록조회
 
@@ -1466,10 +1461,7 @@ public class GoodsmngrController {
 
 		content.put("goodsDftinfoInvntryPolicyList", cgo134List); // 재고에 따른 판매
 
-		maComncdVO = new BOMaComncdVO();
-		maComncdVO.setGroupCd("GOODS_ICON");
-
-		List<?> iconList = bOMaComncdService.selectBOCommcdDetailList(maComncdVO);
+		List<DataMap> iconList = service.selectBOGoodsBadgeList(vo);
 
 		//브랜드 목록조회
 

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

@@ -197,11 +197,12 @@ public class MngrLoginController {
 			log.debug("리프레쉬 토큰이 없는 경우 realm  :: {}", realm);
 
             //엑세스토큰 삭제
-            CookieUtils.deleteCookie("ACT","/"+realm, request, response);
-            CookieUtils.deleteCookie("token_expire","/"+realm, request, response);
+            CookieUtils.deleteCookie("ACT","/", request, response);
+            CookieUtils.deleteCookie("RFT","/" + realm + "/tokens/refresh", request, response);
+            CookieUtils.deleteCookie("token_expire","/", request, response);
 
             response.sendRedirect("/"+realm);
-
+            return;
         }
 
         //리프레쉬 토큰 있을 경우(존재한다는 자체가 refresh토큰이 만료된 상태가 아님)

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

@@ -76,16 +76,26 @@ public class MngrMainController {
 //	public String selectMngrMainInqire(@CookieValue(value = "authSopmalCd") String authSopmalCd, ModelMap model, HttpServletRequest request) {
 	public String selectMngrMainInqire(String authSopmalCd, ModelMap model, HttpServletRequest request, HttpServletResponse response ) {
 		BOBbsVO vo = new BOBbsVO();
-		vo.setSopmalCd(authSopmalCd);
 
 		// 작성자 정보 할당
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 		if("01".equals(user.getSysDvCd())){
 			vo.setSopmalCd(user.getSopmalCd());
 		}
-		// 쇼핑몰코드
 		vo.setRegusr(user.getUserInnb()); // 등록자
 		vo.setUpdusr(user.getUserInnb()); // 수정자
+		// 쇼핑몰코드
+		if(StringUtil.isEmpty(authSopmalCd)) {
+			if(request.getCookies()!=null) {
+				for(Cookie cookie : request.getCookies()){
+					if("authSopmalCd".equals(cookie.getName())){
+						authSopmalCd = cookie.getValue();
+						break;
+					}
+				}
+			}
+		}
+		vo.setSopmalCd(authSopmalCd);
 
 		DataMap resultMap = new DataMap();
 		resultMap = bbsService.selectBOBbscttDshboardInqireForm(vo);

src/main/java/com/wb/domainserver/domain/mngr/mbr/controller/MngrMbrController.java

@@ -677,6 +677,8 @@ public class MngrMbrController {
 		content.put("sex", sex);
 		content.put("grad", grad);
 
+		log.debug("BOMbrSrchVO : {}", vo);
+
 		model.addAttribute("resultMap", content);
 //		responseHandler.handleResponse(
 //				sendToResrc.ofPost(RESRC.GCONEBO,"/gcone/mbr/mbr/selectBOMarketingTrgetSrchPopupForm", vo),

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

@@ -116,8 +116,8 @@ public class EmailController {
 	 */
 	@Policy(AuthPolicy.RESTRICTED)
 	@RequestMapping(value="/selectEmailPassivSndngManage")
-	public String selectEmailPassivSndngManage(){
-
+	public String selectEmailPassivSndngManage(ModelMap model, BOMaEmailSrchVO bOMaEmailSrchVO){
+		model.addAttribute("emailSrchVO", bOMaEmailSrchVO);
 		return "mngr/ntcn/email/EmailPassivSndngManage";
 	}
 

src/main/java/com/wb/domainserver/domain/mngr/ntcn/mssage/controller/MssageController.java

@@ -122,10 +122,11 @@ public class MssageController {
 	 */
 	@Policy(AuthPolicy.RESTRICTED)
 	@RequestMapping(value="/selectMssagePassivSndngManage")
-	public String selectMessagePassivSndngManage(MssageVO vo, ModelMap model,
+	public String selectMessagePassivSndngManage(BOMssageVO vo, ModelMap model,
 												 @CookieValue(value = "authSopmalCd") String authSopmalCd){
 
 		vo.setSopmalCd(authSopmalCd);
+		model.addAttribute("mssageVO", vo);
 
 		return "mngr/ntcn/mssage/MssagePassivSndngManage";
 	}
@@ -149,6 +150,7 @@ public class MssageController {
 		}
 
 		DataMap content = new DataMap();
+		content.put("mssageVO", vo);
 		content.put("shopInfoMap", service.selectBOShopInfoInqire(vo));
 		content.put("sopmalCd", user.getSopmalCd());
 
@@ -178,6 +180,7 @@ public class MssageController {
 			vo.setSopmalCd(user.getSopmalCd());
 		}
 		DataMap content = new DataMap();
+		content.put("mssageVO", vo);
 		content.put("shopInfoMap", service.selectBOShopInfoInqire(vo));
 		content.put("sopmalCd", user.getSopmalCd());
 
@@ -188,7 +191,7 @@ public class MssageController {
 //				"resultMap"
 //		);
 
-		return "mngr/ntcn/mssage/MssageSndngPopupC";
+				return "mngr/ntcn/mssage/MssageSndngPopupC";
 	}
 
 

src/main/java/com/wb/domainserver/domain/mngr/ordr/dlivy/controller/DlivyController.java

@@ -38,6 +38,7 @@ 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 org.springframework.web.bind.annotation.RequestMethod;
 
@@ -607,6 +608,24 @@ public class DlivyController {
 //		);
 	}
 
+	/**
+	 * 배치 > 출고 상태 변경 ( 배송중, 배송완료 )
+	 * @param boDlivyVO
+	 * @return String
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/updateDlivySttusGetbackBatchUpdt", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> updateDlivySttusGetbackBatchUpdt(@RequestBody BODlivyVO boDlivyVO) {
+		Map<String, Object> message = new HashMap<>();
+		message = service.updateBODlivySttusGetbackUpdt(boDlivyVO);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+	}
+
 
 	/**
 	 * 다운로드 항목 조회

src/main/java/com/wb/domainserver/domain/mngr/ordr/ordrmngr/controller/OrdrmngrController.java

@@ -45,9 +45,12 @@ 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 org.springframework.web.bind.annotation.RequestMethod;
 
 import java.io.IOException;
 import java.math.BigInteger;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 /**
@@ -622,6 +625,8 @@ public class OrdrmngrController {
         }
     }
 
+
+
     /**
      * 주문내역서 팝업 화면 이동
      * @param model
@@ -1056,6 +1061,14 @@ public class OrdrmngrController {
             throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
         }
 
+        String cstmclerCd = ordrShippingVO.getCstmclerCd();
+        String cstmclerCdReg = "^P\\d{12}$";
+        if (cstmclerCd == null || cstmclerCd.trim().isEmpty()) {
+            throw new WnbtRestException("개인통관번호은(는) 필수 입력값입니다.");
+        }else if (!cstmclerCd.matches(cstmclerCdReg)) {
+            throw new WnbtRestException("개인통관번호는 P로 시작하는 13자리 부호만 입력할 수 있습니다.");
+        }
+
         AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
         ordrShippingVO.setUpdusr(user.getUserInnb());
 
@@ -1682,6 +1695,239 @@ public class OrdrmngrController {
        다운로드항목설정 종료
        #################################### */
 
+	/* ####################################
+	   발주서 관리 시작
+	   #################################### */
+	/**
+	 * 발주서 관리 화면 이동
+	 * @param ordrSrchVO
+	 * @return String
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value="/selectExcelPoListInqireRForm")
+	public String selectExcelPoListInqireForm(ModelMap model, BOOrdrSrchVO ordrSrchVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		ordrSrchVO.setSopmalCd(authSopmalCd);
+		model.addAttribute("sopmalCd", ordrSrchVO.getSopmalCd());
+		model.addAttribute("ordrSrchVO", ordrSrchVO);
+
+		// 공통코드 호출
+		BOMaComncdVO bOMaComncdVO	= new BOMaComncdVO();
+		bOMaComncdVO.setGroupCd("NATION_CD"); // 국가코드(NATION_CD)
+		model.addAttribute("nationCdList", bOMaComncdService.selectBOCommcdDetailList(bOMaComncdVO));
+
+		return "mngr/ordr/ordrmngr/PurchOrdrListInqireRForm";
+	}
+
+	/**
+	 * 발주서 목록 조회
+	 * @param ordrSrchVO
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value= "/selectExcelPoListInqire" , method = RequestMethod.POST)
+	public String selectExcelPoListInqire(ModelMap model, BOOrdrSrchVO ordrSrchVO, @CookieValue(value = "authSopmalCd") String authSopmalCd){
+		Map<String, Object> content = new HashMap<>();
+		String secretKey = commonService.selectSecretkey();
+		ordrSrchVO.setSecretKey(secretKey);
+		ordrSrchVO.setSopmalCd(authSopmalCd);
+		ordrSrchVO.setSrchOrdrSttusCd("35");
+
+		//페이징 처리를 위한 pagination 객체 생성
+		PaginationInfo paginationInfo = new PaginationInfo();
+		paginationInfo.setCurrentPageNo(ordrSrchVO.getPageIndex());
+		paginationInfo.setRecordCountPerPage(ordrSrchVO.getPageUnit());
+		paginationInfo.setPageSize(paginationProperties.getPageSize());
+		ordrSrchVO.setPaginationInfo(paginationInfo);
+
+		//페이징 처리를 위한 값 설정
+		ordrSrchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+		ordrSrchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+		ordrSrchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+		//회원 목록 조회 결과 및 페이징정보 넣기
+		content.put("paginationInfo", ordrSrchVO.getPaginationInfo());
+		content.put("resultList", service.selectExcelPoList(ordrSrchVO));
+
+		model.addAttribute("resultMap", content);
+		model.addAttribute("ordrSrchVO", ordrSrchVO);
+
+		return "mngr/ordr/ordrmngr/PurchOrdrListInqireR";
+	}
+
+	/**
+	 * 주문내역서 팝업 화면 이동
+	 * @param model
+	 * @param ordrSrchVO
+	 * @return OrdrDtstmnDwldPopupR.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value="/selectPurchOrdrDtstmnDwldPopupForm")
+	public String selectPurchOrdrDtstmnDwldPopupForm(ModelMap model, BOOrdrSrchVO ordrSrchVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) throws Exception {
+        Map<String, Object> content = new HashMap<>();
+        BOOrdrVO ordrVO = new BOOrdrVO();
+        ordrVO.setOrdrInnbs(ordrSrchVO.getSrchOrdrInnbs());
+		ordrVO.setSopmalCd(authSopmalCd);
+
+		content.put("ordrDtstmnDwldList", service.selectOrdrDtstmnDwld(ordrVO));
+		model.addAttribute("data", content);
+		model.addAttribute("ordrSrchVO", ordrSrchVO);
+
+		return "mngr/ordr/ordrmngr/PurchOrdrDtstmnDwldPopupR";
+	}
+
+	/**
+	 * 발주서 엑셀다운로드
+	 * @param response
+	 * @param ordrSrchVO
+	 * @return ResponseEntity<WnbtResponse>
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectExcelPoDwldListInqire")
+	public void selectPurchOrderExcelList(HttpServletResponse response, BOOrdrSrchVO ordrSrchVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		String secretKey = commonService.selectSecretkey();
+		ordrSrchVO.setSecretKey(secretKey);
+		ordrSrchVO.setSopmalCd(authSopmalCd);
+		ordrSrchVO.setSrchOrdrSttusCd("35");
+
+		//엑셀 항목별 제목에 출력될 내용 설정
+		LinkedHashMap<String, String> headerMap	= new LinkedHashMap<String, String>();
+		List<String> headerValues = List.of(
+				"날짜",
+				"업체코드",
+				"업체명",
+				"업체TEL",
+				"업체주소",
+				"특별통관업체명",
+				"특별통관번호",
+				"주문번호",
+				"용도구분",
+				"수취인",
+				"수취인TEL",
+				"수취인HP",
+				"개인통관고유부호",
+				"우편번호",
+				"주소",
+				"나머지주소",
+				"메모",
+				"고객 구입사이트",
+				"무게",
+				"포장개수",
+				"HS CODE",
+				"상거래유형",
+				"내용물",
+				"Unit Value",
+				"상품개수",
+				"Value",
+				"Brand",
+				"사전식품신고 종류",
+				"제조국",
+				"제조회사명",
+				"중문상품명",
+				"Shipper 구입사이트",
+				"판매중개업체명",
+				"판매중개업체 등록부호",
+				"구매(배송)대행업체명",
+				"구매(배송)대행업체 등록부호",
+				"해외판매자명",
+				"해외판매자 등록부호",
+				"사이트 주문번호"
+		);
+		for (int i = 0; i < headerValues.size(); i++) {
+			headerMap.put(String.format("item%02d", i + 1), headerValues.get(i));
+		}
+
+		String[] ordrInnbs = ordrSrchVO.getSrchOrdrInnbs();
+		String[] ordrDlvyInnbs = ordrSrchVO.getSrchOrdrDlvyInnbs();
+		List<Map<String, String>> srchInnbPairs = new ArrayList<>();
+		if (ordrInnbs != null && ordrDlvyInnbs != null) {
+			for (int i = 0; i < ordrInnbs.length; i++) {
+				Map<String, String> pair = new HashMap<>();
+				pair.put("srchOrdrInnb", ordrInnbs[i]);
+				pair.put("srchOrdrDlvyInnb", ordrDlvyInnbs[i]);
+
+				srchInnbPairs.add(pair);
+			}
+		}
+		ordrSrchVO.setSrchInnbPairs(srchInnbPairs);
+
+		//엑셀 항목에 출력될 내용 설정
+		List<DataMap> resultList = service.selectExcelPoListDwld(ordrSrchVO);
+		List<Map<String, Object>> excelList = new ArrayList<>();
+		if (resultList != null) {
+			for (int i = 0; i < resultList.size(); i++) {
+				HashMap<String, Object> dataMap = new HashMap<>();
+//				int cellInt = 1; // 셀 타입 = 숫자
+				List<Object> dataValues = Arrays.asList(
+						resultList.get(i).get("ordrRceptDt"),
+						resultList.get(i).get("entrpsCd"),
+						resultList.get(i).get("entrpsNm"),
+						resultList.get(i).get("entrpsTel"),
+						resultList.get(i).get("entrpsAdres"),
+						resultList.get(i).get("spclCstmclerEntrps"),
+						resultList.get(i).get("spclCstmclerCd"),
+						resultList.get(i).get("ordrInnb"),
+						resultList.get(i).get("purpsDv"),
+						resultList.get(i).get("recpntNm"),
+						resultList.get(i).get("recpntMbtlnb"),
+						resultList.get(i).get("recpntHp"),
+						resultList.get(i).get("cstmclerCd"),
+						resultList.get(i).get("dlvylcZip"),
+						resultList.get(i).get("dlvylcRnmLnbAdres"),
+						resultList.get(i).get("dlvylcAdresDtl"),
+						resultList.get(i).get("dlvyMssageCn"),
+						resultList.get(i).get("cstmrPurchsSite"),
+						resultList.get(i).get("realWt"),
+						resultList.get(i).get("packageCnt"),
+						resultList.get(i).get("hscode"),
+						resultList.get(i).get("cmmrcTy"),
+						resultList.get(i).get("cn"),
+						resultList.get(i).get("unitValue"),
+						resultList.get(i).get("ordrQy"),
+						resultList.get(i).get("value"),
+						resultList.get(i).get("brand"),
+						resultList.get(i).get("preFoodDcl"),
+						resultList.get(i).get("provdNation"),
+						resultList.get(i).get("provdCmpnyNm"),
+						resultList.get(i).get("chnlngGoodsNm"),
+						resultList.get(i).get("shipperPurchsSite"),
+						resultList.get(i).get("sleAgntEntrpsNm"),
+						resultList.get(i).get("sleAgntEntrpsRegistCd"),
+						resultList.get(i).get("purchsDlvyAgencyNm"),
+						resultList.get(i).get("purchsDlvyAgencyRegistCd"),
+						resultList.get(i).get("ovseaSelerNm"),
+						resultList.get(i).get("ovseaSelerRegistCd"),
+						resultList.get(i).get("siteOrdrInnb")
+				);
+
+				for (int j = 0; j < dataValues.size(); j++) {
+					dataMap.put(String.format("item%02d", j + 1), dataValues.get(j));
+				}
+				excelList.add(dataMap);
+			}
+		}
+
+		/******************************************************************/
+		try {
+			//엑셀생성 및 다운로드
+			/*LocalDateTime now = LocalDateTime.now();
+			String excelFileName = "발주서_";
+
+			excelFileName += String.format("%s~%s", ordrSrchVO.getSrchStartDate(), ordrSrchVO.getSrchEndDate()); // 엑셀 다운로드 파일명*/
+
+			String excelFileName = "발주서";
+			String encodedFileName = URLEncoder.encode(excelFileName, StandardCharsets.UTF_8.toString()).replaceAll("\\+", "%20");
+			ExcelDownloadUtil.createExcel(encodedFileName, headerMap, excelList, response);
+
+			service.updateExcelDownDt(ordrSrchVO);
+		} catch (IOException ioe) {
+			log.error("엑셀다운로드 중 오류가 발생하였습니다.", ioe);
+			throw new WnbtRestException("엑셀다운로드 중 오류가 발생하였습니다.");
+		}
+	}
+	/* ####################################
+	   발주서 관리 종료
+	   #################################### */
+
     /* ####################################
        주문조회 팝업 시작
        #################################### */

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

@@ -105,7 +105,7 @@ public class SubsvcOrdrController {
      */
     @Policy(AuthPolicy.RESTRICTED)
     @RequestMapping(value="/selectSubsvcOrdrListForm")
-    public String selectSubsvcListForm(BOSubsvcVO subsvcVO, BOSubsvcOrderVO subsvcOrderVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+    public String selectSubsvcOrdrListForm(BOSubsvcVO subsvcVO, BOSubsvcOrderVO subsvcOrderVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
         subsvcVO.setSopmalCd(authSopmalCd);
         subsvcOrderVO.setSopmalCd(authSopmalCd);
         AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
@@ -133,7 +133,7 @@ public class SubsvcOrdrController {
      */
     @Policy(AuthPolicy.RESTRICTED)
     @RequestMapping(value = "/selectSubsvcOrdrList")
-    public String selectSubsvcList(BOSubsvcOrderVO subsvcOrderVO,ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+    public String selectSubsvcOrdrList(BOSubsvcOrderVO subsvcOrderVO,ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
         subsvcOrderVO.setSopmalCd(authSopmalCd);
         AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
         if("01".equals(user.getSysDvCd())){
@@ -248,4 +248,206 @@ public class SubsvcOrdrController {
         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/promtn/purchs/controller/PurchsEvtController.java

@@ -393,14 +393,6 @@ public class PurchsEvtController {
 					tempVO.setEndAmt(null);
 				}
 
-				if ("01".equals(purchsEvtVO.getDscntBnefDvCd())) {
-					tempVO.setBgnAmt("0");
-					tempVO.setEndAmt("0");
-				} else if ("02".equals(purchsEvtVO.getDscntBnefDvCd())) {
-					tempVO.setBgnCnt("0");
-					tempVO.setEndCnt("0");
-				}
-
 			}
 
 			for (BOPurchsEvtDiscountBnefVO tempVO : purchsEvtVO.getDiscountBnefVOList()) {

src/main/java/com/wb/domainserver/domain/mngr/setup/cost/CostController.java

@@ -0,0 +1,103 @@
+package com.wb.domainserver.domain.mngr.setup.cost;
+
+import com.wb.domainserver.common.msg.GconeMessageSource;
+import com.wb.domainserver.domain.gcone.setup.cost.service.BOCostService;
+import com.wb.domainserver.domain.gcone.setup.cost.vo.BOCostVO;
+import com.wb.domainserver.exception.WnbtRestException;
+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 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 원가 설정 Controller
+ *
+ * @author 이대환
+ * @version 1.0
+ * @see <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-05-29 이대환 최초 생성
+ *
+ * </pre>
+ * @since 2026-05-29
+ */
+@Controller
+@RequestMapping("/mngr/setup/cost")
+@Slf4j
+public class CostController {
+
+	/** WebClient 호출을 위한 wrapper */
+	@Autowired
+	WnbtWebClientResponseHandler responseHandler;
+
+	@Autowired
+	private SendToResrc sendToResrc;
+
+	/** 공통 메시지 처리를 위한 메시지 객체 */
+	@Autowired
+	private GconeMessageSource gconeMessageSource;
+
+	@Autowired
+	private BOCostService service;
+
+	/**
+	 * 원가 설정 페이지 이동
+	 *
+	 * @param vo
+	 * @return CostPriceUpdtU.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/selectCostPriceSetup")
+	public String selectCostPriceSetup(BOCostVO vo, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		DataMap content = new DataMap();
+
+		content.put("costList", service.selectBOCostPriceList(vo));
+
+		model.addAttribute("resultMap", content);
+
+		return "mngr/setup/cost/CostPriceUpdtU";
+	}
+
+
+	/**
+	 * 원가 설정 수정
+	 *
+	 * @param vo
+	 * @return ResponseEntity<WnbtResponse>
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@PostMapping(value = "/updateCostPriceSetup", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> updateCostPriceSetup(@Validated BOCostVO vo, BindingResult bindingResult, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		if (bindingResult.hasErrors()) {
+			throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
+		}
+
+		DataMap message = service.updateBOCostPriceSetup(vo);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+	}
+}

src/main/java/com/wb/domainserver/domain/mngr/setup/exchngrt/ExchngrtController.java

@@ -0,0 +1,116 @@
+package com.wb.domainserver.domain.mngr.setup.exchngrt;
+
+import com.wb.domainserver.common.msg.GconeMessageSource;
+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.setup.exchngrt.service.BOExchngrtService;
+import com.wb.domainserver.domain.gcone.setup.exchngrt.vo.BOExchngrtVO;
+import com.wb.domainserver.exception.WnbtRestException;
+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 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 환율 설정 Controller
+ *
+ * @author 이대환
+ * @version 1.0
+ * @see <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ * </pre>
+ * @since 2026-04-27
+ */
+@Controller
+@RequestMapping("/mngr/setup/exchngrt")
+@Slf4j
+public class ExchngrtController {
+
+	/** WebClient 호출을 위한 wrapper */
+	@Autowired
+	WnbtWebClientResponseHandler responseHandler;
+
+	@Autowired
+	private SendToResrc sendToResrc;
+
+	/** 공통 메시지 처리를 위한 메시지 객체 */
+	@Autowired
+	private GconeMessageSource gconeMessageSource;
+
+	@Autowired
+	private BOExchngrtService service;
+
+	@Autowired
+	private BOMaSopmalService bOMaSopmalService;
+
+	/**
+	 * 환율 설정 페이지 이동
+	 *
+	 * @param boMaSopmalVO
+	 * @return NbkkSetupListR.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/selectExchngrtSetup")
+	public String selectExchngrtSetup(BOMaSopmalVO boMaSopmalVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		DataMap content = new DataMap();
+
+		boMaSopmalVO.setSopmalCd(authSopmalCd);
+		content.put("sopmalDetailList", bOMaSopmalService.selectBOSopmalUpdtForm(boMaSopmalVO));
+
+		model.addAttribute("resultMap", content);
+
+		return "mngr/setup/exchngrt/ExchngrtUpdtU";
+	}
+
+
+	/**
+	 * 환율 설정 수정
+	 *
+	 * @param boExchngrtVO
+	 * @return ResponseEntity<WnbtResponse>
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@PostMapping(value = "/updateExchngrtSetup", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> updateExchngrtSetup(@Validated BOExchngrtVO boExchngrtVO, BindingResult bindingResult, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		//등록자 수정자 set
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		boExchngrtVO.setRegusr(user.getUserInnb());
+		boExchngrtVO.setUpdusr(user.getUserInnb());
+		boExchngrtVO.setSopmalCd(authSopmalCd);
+
+		if (bindingResult.hasErrors()) {
+			throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
+		}
+
+		DataMap message = service.updateBOExchngrtSetup(boExchngrtVO.setBOMaSopmalVO());
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+	}
+
+}

src/main/java/com/wb/domainserver/domain/mngr/setup/family/FamilyController.java

@@ -0,0 +1,115 @@
+package com.wb.domainserver.domain.mngr.setup.family;
+
+import com.wb.domainserver.common.msg.GconeMessageSource;
+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.setup.family.service.BOFamilyService;
+import com.wb.domainserver.domain.gcone.setup.family.vo.BOFamilyVO;
+import com.wb.domainserver.exception.WnbtRestException;
+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 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 패밀리사이트 설정 Controller
+ *
+ * @author 이대환
+ * @version 1.0
+ * @see <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ * </pre>
+ * @since 2026-04-27
+ */
+@Controller
+@RequestMapping("/mngr/setup/family")
+@Slf4j
+public class FamilyController {
+
+	/** WebClient 호출을 위한 wrapper */
+	@Autowired
+	WnbtWebClientResponseHandler responseHandler;
+
+	@Autowired
+	private SendToResrc sendToResrc;
+
+	/** 공통 메시지 처리를 위한 메시지 객체 */
+	@Autowired
+	private GconeMessageSource gconeMessageSource;
+
+	@Autowired
+	private BOFamilyService service;
+
+	@Autowired
+	private BOMaSopmalService bOMaSopmalService;
+
+	/**
+	 * 패밀리사이트 설정 페이지 이동
+	 *
+	 * @param boMaSopmalVO
+	 * @return NbkkSetupListR.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/selectFamilySiteSetup")
+	public String selectFamilySiteSetup(BOMaSopmalVO boMaSopmalVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		DataMap content = new DataMap();
+
+		boMaSopmalVO.setSopmalCd(authSopmalCd);
+		content.put("siteList", bOMaSopmalService.selectBOSopmalUpdtFormSitelList(boMaSopmalVO));
+
+		model.addAttribute("resultMap", content);
+
+		return "mngr/setup/family/FamilySiteUpdtU";
+	}
+
+
+	/**
+	 * 패밀리사이트 설정 수정
+	 *
+	 * @param boFamilyVO
+	 * @return ResponseEntity<WnbtResponse>
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@PostMapping(value = "/updateFamilySiteSetup", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> updateNbkkSetup(@Validated BOFamilyVO boFamilyVO, BindingResult bindingResult, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		//등록자 수정자 set
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		boFamilyVO.setRegusr(user.getUserInnb());
+		boFamilyVO.setUpdusr(user.getUserInnb());
+		boFamilyVO.setSopmalCd(authSopmalCd);
+
+		if (bindingResult.hasErrors()) {
+			throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
+		}
+
+		DataMap message = service.updateBOFamilySetup(boFamilyVO.setBOMaSopmalVO());
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+	}
+}

src/main/java/com/wb/domainserver/domain/mngr/setup/guidance/GuidanceController.java

@@ -0,0 +1,117 @@
+package com.wb.domainserver.domain.mngr.setup.guidance;
+
+import com.wb.domainserver.common.msg.GconeMessageSource;
+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.setup.guidance.service.BOGuidanceService;
+import com.wb.domainserver.domain.gcone.setup.guidance.vo.BOGuidanceVO;
+import com.wb.domainserver.exception.WnbtRestException;
+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 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 안내문구 설정 Controller
+ *
+ * @author 이대환
+ * @version 1.0
+ * @see <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2026-04-27 이대환 최초 생성
+ *
+ * </pre>
+ * @since 2026-04-27
+ */
+@Controller
+@RequestMapping("/mngr/setup/guidance")
+@Slf4j
+public class GuidanceController {
+
+	/** WebClient 호출을 위한 wrapper */
+	@Autowired
+	WnbtWebClientResponseHandler responseHandler;
+
+	@Autowired
+	private SendToResrc sendToResrc;
+
+	/** 공통 메시지 처리를 위한 메시지 객체 */
+	@Autowired
+	private GconeMessageSource gconeMessageSource;
+
+	@Autowired
+	private BOGuidanceService service;
+
+	@Autowired
+	private BOMaSopmalService bOMaSopmalService;
+
+	/**
+	 * 안내문구 설정 페이지 이동
+	 *
+	 * @param boMaSopmalVO
+	 * @return NbkkSetupListR.jsp
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@RequestMapping(value = "/selectGuidanceSetup")
+	public String selectNbkkSetupList(BOMaSopmalVO boMaSopmalVO, ModelMap model, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		DataMap content = new DataMap();
+
+		boMaSopmalVO.setSopmalCd(authSopmalCd);
+		content.put("sopmalDetailList", bOMaSopmalService.selectBOSopmalUpdtForm(boMaSopmalVO));
+
+		model.addAttribute("resultMap", content);
+		model.addAttribute("sopmalCd", authSopmalCd);
+
+		return "mngr/setup/guidance/GuidanceUpdtU";
+	}
+
+
+	/**
+	 * 안내문구 설정 수정
+	 *
+	 * @param boGuidanceVO
+	 * @return ResponseEntity<WnbtResponse>
+	 */
+	@Policy(AuthPolicy.RESTRICTED)
+	@PostMapping(value = "/updateGuidanceSetup", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> updateGuidanceSetup(@Validated BOGuidanceVO boGuidanceVO, BindingResult bindingResult, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		//등록자 수정자 set
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		boGuidanceVO.setRegusr(user.getUserInnb());
+		boGuidanceVO.setUpdusr(user.getUserInnb());
+		boGuidanceVO.setSopmalCd(authSopmalCd);
+
+		if (bindingResult.hasErrors()) {
+			throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
+		}
+
+		DataMap message = service.updateBOGuidanceSetup(boGuidanceVO.setBOMaSopmalVO());
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+	}
+
+}

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

@@ -1,6 +1,8 @@
 package com.wb.domainserver.domain.mngr.setup.ordr.controller;
 
 import com.wb.domainserver.common.msg.GconeMessageSource;
+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.setup.ordrmngr.service.BOOrdrMngrService;
 import com.wb.domainserver.domain.gcone.setup.ordrmngr.vo.BOSetupOrdrVO;
 import com.wb.domainserver.exception.WnbtRestException;
@@ -13,6 +15,7 @@ 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.string.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,6 +66,8 @@ public class SetupOrdrController {
 
 	@Autowired
 	private BOOrdrMngrService service;
+	@Autowired
+	private BOMaSopmalService bOMaSopmalService;
 
 
 	/**
@@ -73,15 +78,14 @@ public class SetupOrdrController {
 	@Policy(AuthPolicy.RESTRICTED)
 	@RequestMapping(value="/selectOrdrSetupList")
 	public String selectOrdrSetupList(ModelMap model, BOSetupOrdrVO boOrdrVO, @CookieValue(value = "authSopmalCd") String authSopmalCd) {
+		DataMap content = new DataMap();
 
 		boOrdrVO.setSopmalCd(authSopmalCd);
+		content.put("ordrSetupList", service.selectBOOrdrSetupList(boOrdrVO));
 
-		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
-		if("01".equals(user.getSysDvCd())){
-			boOrdrVO.setSopmalCd(user.getSopmalCd());
-		}
-
-		Map<String, Object> content = service.selectBOOrdrSetupList(boOrdrVO);
+		BOMaSopmalVO boMaSopmalVO = new BOMaSopmalVO();
+		boMaSopmalVO.setSopmalCd(authSopmalCd);
+		content.put("sopmalDetailList", bOMaSopmalService.selectBOSopmalUpdtForm(boMaSopmalVO));
 
 		model.addAttribute("resultMap", content);
 //		responseHandler.handleResponse(
@@ -154,6 +158,19 @@ public class SetupOrdrController {
 			vo.setMlgMxmmPymntAmt(null);
 		}
 
+		//마일리지 사용 조건 파라미터 정제
+		if(!StringUtil.isEmpty(vo.getMlgHoldUseAmt()))
+			vo.setMlgHoldUseAmt(StringUtil.removeCommaChar(vo.getMlgHoldUseAmt()));
+
+		if(!StringUtil.isEmpty(vo.getMlgSetleAmtUseAmt()))
+			vo.setMlgSetleAmtUseAmt(StringUtil.removeCommaChar(vo.getMlgSetleAmtUseAmt()));
+
+		if(!StringUtil.isEmpty(vo.getMlgMummUseAmt()))
+			vo.setMlgMummUseAmt(StringUtil.removeCommaChar(vo.getMlgMummUseAmt()));
+
+		if(!StringUtil.isEmpty(vo.getMlgMxmmUseAmt()))
+			vo.setMlgMxmmUseAmt(StringUtil.removeCommaChar(vo.getMlgMxmmUseAmt()));
+
 		//등록자 수정자 set
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 		if("01".equals(user.getSysDvCd())){

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;
 
 	/************************************************************
 	  고객센터 목록 폼
@@ -1383,6 +1385,8 @@ public class CscController {
 					url = this.selectSubPageListForm(request, model, bbsctt); //서브페이지
 				} else if ("useGuidance".equals(bbsctt.getReqUrl())) {
 					url = this.selectUseGuidanceForm(request, model, bbsctt); //이용안내
+				} else if ("detail".equals(bbsctt.getReqUrl())) {
+					url = this.selectBbscttDtlInqire(request, model, bbsctt); //기타(상세보기)
 				}
 			} else if ("REGIST".equals(bbsctt.getAuthDv())) { //등록 이동
 				if ("modal".equals(bbsctt.getReqUrl())) {
@@ -1569,9 +1573,24 @@ public class CscController {
 		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
 		DataMap bbsInfo = new DataMap();
 		bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
+
+		// 등록 기능 사용 여부와 별개로 현재 사용자의 등록 권한을 확인한다.
+		BOGnrlbbscttVO registAuthBbsctt = new BOGnrlbbscttVO();
+		registAuthBbsctt.setSopmalCd(user.getSopmalCd());
+		registAuthBbsctt.setBbsId(bbsctt.getBbsId());
+		registAuthBbsctt.setServerDv("sopmal");
+		registAuthBbsctt.setAuthDv("REGIST");
+		if (user.getUserInnb() > 0) {
+			registAuthBbsctt.setRegusr(user.getUserInnb());
+			registAuthBbsctt.setMbrDvCd(user.getMbrDvCd());
+		} else {
+			registAuthBbsctt.setRegusr(0);
+		}
+		DataMap registAuth = service.selectBOBbscttAuth(registAuthBbsctt);
 		DataMap content = new DataMap();
 
 		content.put("bbsInfo", bbsInfo);
+		content.put("registAuthResult", registAuth.get("resultAuth"));
 		content.put("bbsctt", bbsctt);
 		content.put("resultList", resultList);
 		content.put("paginationInfo", bbsctt.getPaginationInfo());
@@ -1681,6 +1700,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
@@ -1736,6 +1762,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.realm.util.UrlExtractor;
 import com.wb.domainserver.response.ApiResponse;
 import com.wb.domainserver.response.WnbtResponse;
 import com.wb.domainserver.response.WnbtResponseBody;
@@ -189,6 +190,23 @@ public class GoodsController {
 		return Util.getDeviceType(request)+"/goods/GoodsSrchRForm";
 	}
 
+	/**
+	 * 사용자 화면 상품 배지 목록 조회
+	 * @return
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value = "/selectGoodsBadgeList", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<List<DataMap>> selectGoodsBadgeList() {
+		BOGoodsVO vo = new BOGoodsVO();
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+
+		if ("01".equals(user.getSysDvCd())) {
+			vo.setSopmalCd(user.getSopmalCd());
+		}
+
+		return ResponseEntity.ok(service.selectBOGoodsBadgeList(vo));
+	}
+
 	/**
 	 * 상품 검색 리스트
 	 * @param vo
@@ -210,6 +228,42 @@ public class GoodsController {
 		return Util.getDeviceType(request)+"/goods/GoodsSrchR";
 	}
 
+	/**
+	 * 검색어 로그 저장
+	 * @param vo
+	 * @return
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value = "/insertSrchwrdLog", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<WnbtResponse> insertSrchwrdLog(HttpServletRequest request, BOGoodsVO vo) {
+		//사용자 정보 추출 및 적용
+		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+		if("01".equals(user.getSysDvCd())){
+			vo.setSopmalCd(user.getSopmalCd());
+			vo.setMbrInnb(String.valueOf(user.getUserInnb()));
+		}
+
+		//요청 URL
+		String url = request.getRequestURI();
+		vo.setConectUrl(url);
+		//host 정보
+		String host =  request.getHeader("X-Original-Host") != null ? request.getHeader("X-Original-Host") : UrlExtractor.getOriginalHost(request);
+		vo.setConectDomn(host);
+
+		DataMap message = service.insertBOSrchwrdLog(vo);
+
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(message))
+						.build()
+		);
+//		return responseHandler.handleResponse(
+//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/goods/goods/selectBOSrchGoodsNm", vo),
+//				ReplyFromResrc::getReply
+//		);
+
+	}
+
 	/**
 	 * 상품명 검색어 조회
 	 * @param vo
@@ -251,6 +305,14 @@ public class GoodsController {
 	public String selectGoodsListForm(HttpServletRequest request,
 									  BOGoodsVO vo,
 									  ModelMap model) {
+		String mobileParentCtgryId = request.getParameter("mobileParentCtgryId");
+		String mobileCurrentCtgryId = request.getParameter("mobileCurrentCtgryId");
+		boolean mobileSubCategorySelected = mobileParentCtgryId != null && !mobileParentCtgryId.isBlank()
+				&& mobileCurrentCtgryId != null && !mobileCurrentCtgryId.isBlank();
+		if (mobileSubCategorySelected) {
+			vo.setCtgryId(mobileParentCtgryId);
+		}
+
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 		if("01".equals(user.getSysDvCd())){
 			vo.setSopmalCd(user.getSopmalCd());
@@ -268,7 +330,7 @@ public class GoodsController {
 		//검색한 카테고리 정보로 vo 세팅
 		if(!CollectionUtils.isEmpty(goodsCategoryList)){
 			vo.setUpperCtgryId(goodsCategoryList.get(0).get("baseCtgryId").toString());
-			vo.setCtgryId(goodsCategoryList.get(0).get("baseCtgryId").toString());
+			vo.setCtgryId(mobileSubCategorySelected ? mobileCurrentCtgryId : goodsCategoryList.get(0).get("baseCtgryId").toString());
 		}else{
 			vo.setUpperCtgryId("0");
 			vo.setCtgryId("0");
@@ -425,6 +487,7 @@ public class GoodsController {
 
 		// 상세 조회
 		DataMap goodsDtl = service.selectBOGoodsDtlInfo(vo);
+		List<DataMap> goodsBadgeList = service.selectBOGoodsBadgeList(vo);
 
 		//상품 옵션 조회
 		DataMap goodsOptList = service.selectBOGoodsOptionList(vo);
@@ -476,6 +539,7 @@ public class GoodsController {
 		//담기
 		Map<String, Object> content = new HashMap<>();
 		content.put("goodsDtl", goodsDtl);
+		content.put("goodsBadgeList", goodsBadgeList);
 		content.put("evtBannerList", evtBannerList);
 		content.put("goodsOptList", goodsOptList);
 		content.put("GoodsRelateInfo", goodsReleateInfo);

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

@@ -198,6 +198,20 @@ public class MainController {
    }
 
 
+    /**
+     * 사이트맵 XML
+     * @return
+     */
+    @Policy(AuthPolicy.PUBLIC)
+    @RequestMapping(value="/sitemap", produces = MediaType.APPLICATION_XML_VALUE)
+    public ResponseEntity<String> selectSitemapXml() {
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        String xml = boMaSopmalService.selectSitemapXml(user.getSopmalCd());
+
+        return ResponseEntity.ok().contentType(MediaType.APPLICATION_XML).body(xml);
+    }
+
+
    /**
     * 비회원 휴대폰번호 확인
     * @return OrdrDtlR.jsp
@@ -1015,4 +1029,14 @@ public class MainController {
         );
 	}
 
+    /**
+     * 연령확인 팝업
+     * @return
+     */
+    @Policy(AuthPolicy.PUBLIC)
+    @RequestMapping(value="/sopmal/main/selectAgeChkPopup", produces = MediaType.APPLICATION_JSON_VALUE)
+    public String selectAgeChkPopup(HttpServletRequest request) {
+        return Util.getDeviceType(request)+"/main/AgeChkPopupR";
+    }
+
 }

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

@@ -48,22 +48,22 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* MyActController Class (back)
-*
-* @author 홍길동
-* @since 2024-02-05
-* @version 1.0
-* @see
-*
-* <pre>
-* == (Modification Information) == 개정이력
-*
-* 수정일 수정자 수정내용
-* ------- -------- ---------------------------
-* 2024-03-05  김혜인 최초 생성
-*
-* </pre>
-*/
+ * MyActController Class (back)
+ *
+ * @author 홍길동
+ * @since 2024-02-05
+ * @version 1.0
+ * @see
+ *
+ * <pre>
+ * == (Modification Information) == 개정이력
+ *
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2024-03-05  김혜인 최초 생성
+ *
+ * </pre>
+ */
 
 @Controller
 @RequestMapping("/sopmal/mpage/act")
@@ -72,7 +72,7 @@ public class MyActController {
 	/** WebClient 호출을 위한 wrapper */
 	@Autowired
 	private WnbtWebClientResponseHandler responseHandler;
-	
+
 	@Autowired
 	private SendToResrc sendToResrc;
 	/** 공통 메시지 처리를 위한 메시지 객체 */
@@ -102,10 +102,10 @@ public class MyActController {
 
 
 	/**
-     * 상품 Q&A 조회
-     * @param bbsctt
-     * @return String
-     */
+	 * 상품 Q&A 조회
+	 * @param bbsctt
+	 * @return String
+	 */
 	@Policy(AuthPolicy.PUBLIC)
 	@RequestMapping(value="/selectGoodsQnaInqire")
 	public String selectGoodsQnaInqire(HttpServletRequest request, ModelMap model, BOGnrlbbscttVO bbsctt, BOMbrVO vo){
@@ -115,35 +115,127 @@ public class MyActController {
 
 		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/MyGoodsQaR";
+
+		return Util.getDeviceType(request)+"/mpage/act/MyGoodsQaR";
 	}
-    /**
-     * 상품 Q&A ajax 조회
-     * @param bbsctt
-     * @return String
-     */
+
+	/**
+	 * 일반문의 조회
+	 * @param bbsctt
+	 * @return String
+	 */
 	@Policy(AuthPolicy.PUBLIC)
-	@RequestMapping(value="/selectGoodsQnaInqireAjax", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<?> selectGoodsQnaInqireAjax(BOGnrlbbscttVO bbsctt){
-		bbsctt.setBbsTyCd("05");
+	@RequestMapping(value="/selectNormalQnaInqire")
+	public String selectNormalQnaInqire(HttpServletRequest request, ModelMap model, BOGnrlbbscttVO bbsctt, BOMbrVO vo){
+		bbsctt.setBbsTyCd("01");
+		bbsctt.setServerDv("sopmal");
+		bbsctt.setReqUrl("mpage");
+
+		DataMap content = selectBOBbscttListInqire(bbsctt);
+		model.addAttribute("resultMap", content);
+
+		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
+		model.addAttribute("mpageResultMap", content2);
+
+		return Util.getDeviceType(request)+"/mpage/act/MyNormalQaR";
+	}
+
+	/**
+	 * 일반문의 수정 폼 이동
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectNormalQnaDtlUpdtForm")
+	public String selectNormalQnaDtlUpdtForm(HttpServletRequest request, ModelMap model,BOGnrlbbscttVO bbsctt, BOMbrVO vo){
+		bbsctt.setServerDv("sopmal");
+		bbsctt.setBbsTyCd("01");
+		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.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);
+		model.addAttribute("bbsctt", bbsctt);
+
+		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
+		model.addAttribute("mpageResultMap", content2);
+
+		return Util.getDeviceType(request)+"/mpage/act/MyNormalQnaDtlUpdtU";
+	}
+
+	/**
+	 * 일반문의 ajax 조회
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectNormalQnaInqireAjax", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<?> selectNormalQnaInqireAjax(BOGnrlbbscttVO bbsctt){
+		bbsctt.setBbsTyCd("01");
+		bbsctt.setServerDv("sopmal");
+		bbsctt.setReqUrl("mpage");
+
+		DataMap content = selectBOBbscttListInqire(bbsctt);
+		return ResponseEntity.ok(
+				WnbtResponse.builder()
+						.resBody(new WnbtResponseBody(content))
+						.build()
+		);
+	}
+
+	/**
+	 * 상품 Q&A ajax 조회
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@RequestMapping(value="/selectGoodsQnaInqireAjax", produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<?> selectGoodsQnaInqireAjax(BOGnrlbbscttVO bbsctt){
+		bbsctt.setBbsTyCd("05");
 		bbsctt.setServerDv("sopmal");
 		bbsctt.setReqUrl("mpage");
-		//게시글 노출 항목 설정값과 게시판 목록 조회
 
 		DataMap content = selectBOBbscttListInqire(bbsctt);
 		return ResponseEntity.ok(
@@ -151,10 +243,6 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
-//				ReplyFromResrc::getReply
-//		);
 	}
 
 	/**
@@ -178,12 +266,8 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOFileInfo",bbsctt),
-//				ReplyFromResrc::getReply
-//		);
 	}
-	
+
 	/**
 	 * 상품 Q&A 수정 폼 이동
 	 * @param bbsctt
@@ -209,28 +293,22 @@ public class MyActController {
 			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);
 
@@ -243,24 +321,14 @@ public class MyActController {
 		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/MyGoodsQnaDtlUpdtU";
 	}
+
 	/**
 	 * 1:1 문의 조회
 	 * @param bbsctt
@@ -275,23 +343,13 @@ public class MyActController {
 
 		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
@@ -303,7 +361,6 @@ public class MyActController {
 		bbsctt.setBbsTyCd("12");
 		bbsctt.setServerDv("sopmal");
 		bbsctt.setReqUrl("mpage");
-		//게시글 노출 항목 설정값과 게시판 목록 조회
 
 		DataMap content = selectBOBbscttListInqire(bbsctt);
 		return ResponseEntity.ok(
@@ -311,10 +368,6 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
-//				ReplyFromResrc::getReply
-//		);
 	}
 
 	/**
@@ -343,28 +396,22 @@ public class MyActController {
 			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);
 
@@ -377,21 +424,10 @@ public class MyActController {
 		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";
 	}
@@ -407,28 +443,17 @@ public class MyActController {
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 		bbsctt.setSopmalCd(user.getSopmalCd());
 
-		/*리뷰 조회 폼*/
 		DataMap rvwBnefInfo = new DataMap();
 		rvwBnefInfo = service.selectBORvwBnefInfo(bbsctt);
 
 		model.addAttribute("mlgAccmlNtc", rvwBnefInfo);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBORvwBnefInfo",bbsctt),
-//				model,
-//				"mlgAccmlNtc"
-//		);
-		
-		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
+
 		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
 		model.addAttribute("mpageResultMap", content2);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
-//				model,
-//				"mpageResultMap"
-//		);
 		model.addAttribute("vo",bbsctt);
 		return Util.getDeviceType(request)+"/mpage/act/MyRvwRForm";
 	}
+
 	/**
 	 * 나의 리뷰 조회 작성 가능한 리뷰
 	 * @param rvwVO
@@ -442,13 +467,9 @@ public class MyActController {
 
 		Map<String, Object> content = selectBOWritPosblRvw(rvwVO);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOWritPosblRvw",rvwVO),
-//				model,
-//				"resultMap"
-//		);
 		return Util.getDeviceType(request)+"/mpage/act/WritngPosblRvwR";
 	}
+
 	/**
 	 * 나의 리뷰 조회 작성 가능한 리뷰 ajax(인피니트스크롤)
 	 * @param rvwVO
@@ -466,10 +487,6 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOWritPosblRvw",rvwVO),
-//				ReplyFromResrc::getReply
-//		);
 	}
 
 	/**
@@ -486,11 +503,6 @@ public class MyActController {
 
 		DataMap content = selectBOMyRvwListInqire(rvwVO);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOMyRvwListInqire",rvwVO),
-//				model,
-//				"resultMap"
-//		);
 		return Util.getDeviceType(request)+"/mpage/act/MyRvwR";
 	}
 
@@ -512,10 +524,6 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOMyRvwListInqire",rvwVO),
-//				ReplyFromResrc::getReply
-//		);
 	}
 
 	/**
@@ -528,15 +536,9 @@ public class MyActController {
 	public String selectRvwWritngPopupForm(HttpServletRequest request, ModelMap model, BOGnrlbbscttVO rvwVO){
 		rvwVO.setRvwBbscttDv("rvw");
 		rvwVO.setServerDv("sopmal");
-		//리뷰 등록 가능 여부 true시 등록폼 호출
 
 		Map<String, Object> content = selectBOBbscttRegistPopupForm(rvwVO);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttRegistPopupForm",rvwVO),
-//				model,
-//				"resultMap"
-//		);
 
 		return Util.getDeviceType(request)+"/mpage/act/RvwWritngPopupC";
 	}
@@ -556,30 +558,24 @@ public class MyActController {
 			bbsctt.setSopmalCd(user.getSopmalCd());
 		}
 
-		// 작성자 정보 추출
-		if (user.getUserInnb() > 0) { //회원 , 관리자
+		if (user.getUserInnb() > 0) {
 			bbsctt.setUpdusr(user.getUserInnb());
-		} else { // 비회원
+		} else {
 			bbsctt.setUpdusr(0);
 		}
 
 		Map<String, Object> content = new HashMap<>();
 
-		/*게시글 삭제*/
 		DataMap bbscttDelResult = service.updateBOBbscttDel(bbsctt);
 		content.put("result", bbscttDelResult);
-		/*삭제 성공 시*/
 		if ("success".equals(bbscttDelResult.get("result"))) {
-			//리뷰 관련 처리
 			if ("06".equals(bbsctt.getBbsTyCd()) || "07".equals(bbsctt.getBbsTyCd())) {
 				if (!CollectionUtils.isEmpty(bbsctt.getDelInfoArr())) {
-					/*해당 정보로 마일리지 금액 조회하기*/
 					List<Object> accmlmnyAmtInfoArr = new ArrayList<>();
 					BOMlgVO mlgVo = new BOMlgVO();
 					for (BODelInfoVO delInfo : bbsctt.getDelInfoArr()) {
 						if ("01".equals(delInfo.getRegusrDvCd())) {
-							if ("03".equals(user.getSysDvCd())) { //관리자 삭제시  마일리지 회수
-								/*공통 파라미터*/
+							if ("03".equals(user.getSysDvCd())) {
 								mlgVo.setMbrInnb(String.valueOf(delInfo.getRegusr()));
 								mlgVo.setMbrDvCd(delInfo.getMbrDvCd());
 								mlgVo.setSopmalCd(bbsctt.getSopmalCd());
@@ -591,8 +587,7 @@ public class MyActController {
 								mlgVo.setRegusr(user.getUserInnb());
 								mlgVo.setUpdusr(user.getUserInnb());
 
-								/*마일리지 수동 회수 여부*/
-								if ("N".equals(bbsctt.getMlgPassivRtrvlAt())) { // 선택 삭제시
+								if ("N".equals(bbsctt.getMlgPassivRtrvlAt())) {
 									DataMap accmlmnyAmtInfo = new DataMap();
 									accmlmnyAmtInfo = mlgService.selectBOMlgByBbscttInnb(mlgVo);
 									if (accmlmnyAmtInfo != null) {
@@ -603,7 +598,7 @@ public class MyActController {
 										mlgVo.setAccmlmnyAmt((BigDecimal) accmlmnyAmtInfo.get("accmlmnyAmt"));
 										mlgService.insertBOMngrMlgDn(mlgVo);
 									}
-								} else { //단독 삭제시*/
+								} else {
 									if (delInfo.getRtrvlMlgAmt() != null) {
 										if (delInfo.getRtrvlMlgAmt().compareTo(BigDecimal.valueOf(0)) > 0) {
 											mlgVo.setAccmlmnyAmt(delInfo.getRtrvlMlgAmt());
@@ -612,7 +607,6 @@ public class MyActController {
 									}
 								}
 							}
-							//회원 관련
 							if (delInfo.getRegusr() != null) {
 								BOGnrlbbscttVO mbrSite = new BOGnrlbbscttVO();
 								mbrSite.setSopmalCd(bbsctt.getSopmalCd());
@@ -627,26 +621,20 @@ public class MyActController {
 							}
 						}
 
-						//상품관련 집계와 회원관련 집계는 관리자혹은 사용자가 모두 삭제 시 처리가 되어야해
-						//상품 관련
 						if (delInfo.getGoodsInnb() != null) {
 							BOGoodsVO goodsVO = new BOGoodsVO();
 							goodsVO.setGoodsInnb(String.valueOf(delInfo.getGoodsInnb()));
 							goodsVO.setSopmalCd(bbsctt.getSopmalCd());
-							/*상품정보 > 상품후기건수 차감*/
 							goodsService.updateRvwRelateSm(goodsVO);
 						}
 					}
 				}
-			} else if ("05".equals(bbsctt.getBbsTyCd())) {//상품qna는 상품문의 집계만
-				//상품 관련
+			} else if ("05".equals(bbsctt.getBbsTyCd())) {
 				if (!CollectionUtils.isEmpty(bbsctt.getGoodsInnbArr())) {
 					for (String goodsInnb : bbsctt.getGoodsInnbArr()) {
 						BOGoodsVO goodsVO = new BOGoodsVO();
 						goodsVO.setGoodsInnb(goodsInnb);
 						goodsVO.setSopmalCd(bbsctt.getSopmalCd());
-
-						/*상품정보 > 상품후기건수 차감*/
 						goodsService.updateGoodsInqryCnt(goodsVO);
 					}
 				}
@@ -658,10 +646,6 @@ public class MyActController {
 						.resBody(new WnbtResponseBody(content))
 						.build()
 		);
-//		return responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/updateBOBbscttDel",bbsctt),
-//				ReplyFromResrc::getReply
-//		);
 	}
 
 	/**
@@ -677,11 +661,6 @@ public class MyActController {
 
 		Map<String, Object> content = selectBOBbscttRegistPopupForm(vo);
 		model.addAttribute("resultMap", content);
-//		responseHandler.handleResponse(
-//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttRegistPopupForm", vo),
-//				model,
-//				"resultMap"
-//		);
 		return Util.getDeviceType(request)+"/mpage/act/RvwEasyRegistC";
 	}
 
@@ -693,7 +672,7 @@ public class MyActController {
 	public DataMap selectBOBbscttListInqire(BOGnrlbbscttVO bbsctt) {
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 
-		if ("01".equals(user.getSysDvCd())) {//사용자 조회 일 경우
+		if ("01".equals(user.getSysDvCd())) {
 			bbsctt.setSopmalCd(user.getSopmalCd());
 		}
 
@@ -710,7 +689,6 @@ public class MyActController {
 				bbsctt.setRegusrDvCd("99");
 			}
 		}
-		// pagination
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(bbsctt.getPageIndex());
 		paginationInfo.setRecordCountPerPage(bbsctt.getPageUnit());
@@ -721,13 +699,10 @@ public class MyActController {
 		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());
@@ -747,13 +722,11 @@ public class MyActController {
 	 *
 	 */
 	public Map<String, Object> selectBOMpageInfoInqire(BOMbrVO vo) {
-		// 사용자 정보 추출 및 적용
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 		vo.setSopmalCd(user.getSopmalCd());
 		vo.setMbrInnb(String.valueOf(user.getUserInnb()));
 		vo.setMbrDvCd(user.getMbrDvCd());
 
-		// 상품 옵션 조회
 		Map<String, Object> message = new HashMap<>();
 		message = boMbrService.selectBOMpageInfoInqire(vo);
 
@@ -778,7 +751,6 @@ public class MyActController {
 		bbsctt.setSopmalCd(user.getSopmalCd());
 		bbsctt.setRegusr(user.getUserInnb());
 		bbsctt.setMbrDvCd(user.getMbrDvCd());
-		// pagination
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(bbsctt.getPageIndex());
 		paginationInfo.setRecordCountPerPage(bbsctt.getPageUnit());
@@ -811,7 +783,6 @@ public class MyActController {
 		if (!"crm".equals(bbsctt.getReqUrl())) {
 			bbsctt.setRegusr(user.getUserInnb());
 		}
-		// pagination
 		PaginationInfo paginationInfo = new PaginationInfo();
 		paginationInfo.setCurrentPageNo(bbsctt.getPageIndex());
 		paginationInfo.setRecordCountPerPage(bbsctt.getPageUnit());
@@ -821,7 +792,7 @@ public class MyActController {
 		bbsctt.setFirstIndex(paginationInfo.getFirstRecordIndex());
 		bbsctt.setLastIndex(paginationInfo.getLastRecordIndex());
 		bbsctt.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
-		// 게시글 목록조회
+
 		Map<String, Object> resultList = new HashMap<String, Object>();
 		resultList = service.selectBOMyRvwListInqire(bbsctt);
 
@@ -837,7 +808,6 @@ public class MyActController {
 	 */
 	public Map<String, Object> selectBOBbscttRegistPopupForm(BOGnrlbbscttVO bbsctt) {
 		Map<String, Object> content = new HashMap<String, Object>();
-		// 작성자 정보 추출
 		AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
 
 		if ("01".equals(user.getSysDvCd())) {
@@ -850,9 +820,9 @@ public class MyActController {
 		if (user.getUserInnb() > 0) {
 			bbsctt.setRegusr(user.getUserInnb());
 			if (!"01".equals(user.getSysDvCd())) {
-				bbsctt.setRegusrDvCd("02"); //관리자
+				bbsctt.setRegusrDvCd("02");
 			} else {
-				bbsctt.setRegusrDvCd("01"); //회원
+				bbsctt.setRegusrDvCd("01");
 				bbsctt.setMbrDvCd(user.getMbrDvCd());
 				DataMap mbr = new DataMap();
 				mbr.put("mbrInnb", String.valueOf(bbsctt.getRegusr()));
@@ -868,31 +838,25 @@ public class MyActController {
 			regusrInfo.setRegusrDvCd(bbsctt.getRegusrDvCd());
 		} else {
 			regusrInfo.setRegusr(0);
-			regusrInfo.setRegusrDvCd("99");//비회원
+			regusrInfo.setRegusrDvCd("99");
 		}
 
-		// 게시판 설정 정보
 		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);
 
-		// 분류
 		List<DataMap> itmList = new ArrayList<>();
 		itmList = service.selectBOBbscttItmInqire(bbsctt);
 
-		//리뷰항목 리스트, 리뷰항목 항목 리스트
 		Map<String, Object> rvwQesitmList = new HashMap<String, Object>();
 		rvwQesitmList = service.selectBOStarItm(bbsctt);
 
-		//추가항목 리스트, 추가항목 항목 리스트
 		Map<String, Object> qesitmList = new HashMap<String, Object>();
 		qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt);
 
-		//사용자 > 리뷰 상품 조회
 		DataMap rvwGoodsInfo = new DataMap();
 		DataMap mlgInfo = new DataMap();
 		if ("sopmal".equals(bbsctt.getServerDv())) {
@@ -904,7 +868,6 @@ public class MyActController {
 
 				List<DataMap> rvwItmList = new ArrayList<>();
 				List<DataMap> starItmList = new ArrayList<>();
-				//사용자 별표 평점 역으로 리스트 set(퍼블리싱으로 인한 역처리)
 				if (rvwQesitmList.get("starItmCnList") != null) {
 					rvwItmList = (List<DataMap>) rvwQesitmList.get("starItmCnList");
 					for (int i = rvwItmList.size() - 1; i >= 0; i--) {
@@ -915,7 +878,6 @@ public class MyActController {
 			}
 		}
 
-		//사용자 > 상품q&a 상품 조회
 		DataMap qnaGoodsInfo = new DataMap();
 		if ("sopmal".equals(bbsctt.getServerDv())) {
 			if ("modal".equals(bbsctt.getReqUrl())) {
@@ -931,4 +893,4 @@ public class MyActController {
 		content.put("rvwQesitmList", rvwQesitmList);
 		return content;
 	}
-}
+}

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

@@ -1067,7 +1067,7 @@ public class MyMbrController {
 	 */
 	@Policy(AuthPolicy.RESTRICTED)
 	@PostMapping(value="/updateDlvylcUpdt", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<WnbtResponse> updateDlvylcUpdt(@Validated DlvylcVO dlvylcVO, BOCrmDlvylcVO crmDlvylcVO, BindingResult bindingResult){
+	public ResponseEntity<WnbtResponse> updateDlvylcUpdt(@Validated DlvylcVO dlvylcVO, BindingResult bindingResult, BOCrmDlvylcVO crmDlvylcVO){
 		//입력값 정합성 점검결과 처리
 		if(bindingResult.hasErrors()) {
 			throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
@@ -1078,7 +1078,19 @@ public class MyMbrController {
 		mbtlnb = mbtlnb.replace("-", "");
 		int mbtlnbLen = mbtlnb.length();
 		if (!(mbtlnbLen >= 8 && mbtlnbLen <= 12)) {
-			throw new WnbtRestException("번호는 8자~12자 입니다.");
+			throw new WnbtRestException("휴대전화번호는 8자 이상 12자 이하만 입력할 수 있습니다.");
+		}
+
+		//개인통관번호 정합성 체크
+		if("KR".equals(crmDlvylcVO.getDlvylcAreaCd())) {
+			String cstmclerCd = crmDlvylcVO.getCstmclerCd();
+			String cstmclerCdReg = "^P\\d{12}$";
+
+			if (cstmclerCd == null || cstmclerCd.trim().isEmpty()) {
+				throw new WnbtRestException("개인통관번호은(는) 필수 입력값입니다.");
+			}else if (!cstmclerCd.matches(cstmclerCdReg)) {
+				throw new WnbtRestException("개인통관번호는 P로 시작하는 13자리 부호만 입력할 수 있습니다.");
+			}
 		}
 
 		//도로명 지번 분기처리 하여 vo에 set함
@@ -1135,7 +1147,7 @@ public class MyMbrController {
 	 */
 	@Policy(AuthPolicy.RESTRICTED)
 	@PostMapping(value="/insertDlvylcRegist", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<WnbtResponse> insertDlvylcRegist(@Validated DlvylcVO dlvylcVO, BOCrmDlvylcVO crmDlvylcVO, BindingResult bindingResult){
+	public ResponseEntity<WnbtResponse> insertDlvylcRegist(@Validated DlvylcVO dlvylcVO, BindingResult bindingResult, BOCrmDlvylcVO crmDlvylcVO){
 		//입력값 정합성 점검결과 처리
 		if(bindingResult.hasErrors()) {
 			throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
@@ -1146,7 +1158,19 @@ public class MyMbrController {
 		mbtlnb = mbtlnb.replace("-","");
 		int mbtlnbLen = mbtlnb.length();
 		if(!(mbtlnbLen >= 8 && mbtlnbLen <= 12)){
-			throw new WnbtRestException("번호는 8자~12자 입니다.");
+			throw new WnbtRestException("휴대전화번호는 8자 이상 12자 이하만 입력할 수 있습니다.");
+		}
+
+		//개인통관번호 정합성 체크
+		if("KR".equals(crmDlvylcVO.getDlvylcAreaCd())) {
+			String cstmclerCd = crmDlvylcVO.getCstmclerCd();
+			String cstmclerCdReg = "^P\\d{12}$";
+
+			if (cstmclerCd == null || cstmclerCd.trim().isEmpty()) {
+				throw new WnbtRestException("개인통관번호은(는) 필수 입력값입니다.");
+			}else if (!cstmclerCd.matches(cstmclerCdReg)) {
+				throw new WnbtRestException("개인통관번호는 P로 시작하는 13자리 부호만 입력할 수 있습니다.");
+			}
 		}
 
 		crmDlvylcVO.setServerDv("sopmal");

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

@@ -17,9 +17,10 @@ public class DlvylcVO extends AbstractVO{
 	 /**회원구분코드*/
 	 private String mbrDvCd;
 	/**	배송지설명내용 */
-	@NotBlank(message = "배송지 설명")
+	@NotBlank(message = "배송지명")
 	private String dlvylcDcCn;
 	/**배송지역코드*/
+	@NotBlank(message = "배송지역코드")
 	private String dlvylcAreaCd;
 	/**	받는사람명	*/
 	@NotBlank(message = "받으시는 분")
@@ -32,7 +33,7 @@ public class DlvylcVO extends AbstractVO{
 	private String telnb;
 	/**	우편번호	*/
 	@NotBlank(message = "우편번호")
-	@Length(min=1, max=7)
+	@Length(min=1, max=7, message="우편번호")
 	private String zip;
 	/**	도로명,지번 구분	*/
 	private String adresDv;

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

@@ -36,6 +36,7 @@ import com.wb.domainserver.domain.sopmal.mpage.ordr.vo.MyOrdrDlvyVO;
 import com.wb.domainserver.domain.sopmal.mpage.ordr.vo.MyOrdrShippingVO;
 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;
@@ -54,6 +55,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Base64Util;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -65,6 +67,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -171,6 +174,26 @@ public class MyOrdrController {
         return Util.getDeviceType(request) + "/mpage/ordr/SubsvcOrdrDlvyListRForm";
     }
 
+    /**
+     * 마이 페이지 > MY쇼핑 > 마이페이지 > 주문/배송 목록 조회
+     * @param ordrDlvyVO
+     * @return ResponseEntity<WnbtResponse>
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectMbrSubsvcOrdrListInqireMapge")
+    public String selectMbrSubsvcOrdrListInqireMapge(ModelMap model, BOOrdrDlvyVO ordrDlvyVO) {
+
+        Map<String, Object> content = selectBOMbrSubsvcOrdrListInqireAjax(ordrDlvyVO);
+        model.addAttribute("data", content);
+//        responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/selectBOMbrOrdrListInqireAjax", ordrDlvyVO),
+//                model,
+//                "data"
+//        );
+
+        return "sopmal/mpage/ordr/SubsvcOrdrDlvyListMpageRList";
+    }
+
     /**
      * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송 > 구독서비스 주문/배송 목록 조회
      * @param ordrDlvyVO
@@ -202,6 +225,54 @@ public class MyOrdrController {
         );
     }
 
+    /**
+     * 마이 페이지 > MY쇼핑 > 구독서비스 주문/배송조회 > 주문/배송 상세 조회 화면 이동
+     * @return OrdrDtlR.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectMbrSubsvcOrdrDtlInqire")
+    public String selectMbrSubsvcOrdrDtlInqire(HttpServletRequest request, ModelMap model, BOOrdrDlvyVO ordrDlvyVO, BOMbrVO vo, BORtngudrefndVO boRtngudrefndVO) throws Exception {
+        boRtngudrefndVO.setServerDv("sopmal");
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if ("01".equals(user.getSysDvCd())) {
+            ordrDlvyVO.setSopmalCd(user.getSopmalCd());
+            boRtngudrefndVO.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);
+        /**환불내역이 있으면 정보조회*/
+        if(message.get("order") != null && ((DataMap)message.get("order")).get("orderReInnb") != null && !"".equals(((DataMap)message.get("order")).get("orderReInnb"))){
+            boRtngudrefndVO.setOrderReInnb((String)((DataMap)message.get("order")).get("orderReInnb"));
+            Map<String, Object> refund = new HashMap<String, Object>();
+            refund.put("result", boRtngudrefndService.selectBORtngudRefndDtlInqire(boRtngudrefndVO));
+            model.addAttribute("resultMap", refund);
+        }
+
+        // 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
+        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쇼핑 > 주문/배송조회 > 주문/배송 목록 조회
@@ -665,17 +736,13 @@ public class MyOrdrController {
             boDlivyVO.setSopmalCd(user.getSopmalCd()); // 쇼핑몰 코드
         }
 
-        Map<String, Object> content = new HashMap<>();
-        content = dlivyService.selectBOOrdrDlvyDtlsInqire(boDlivyVO);
+        BOOrdrDlvyVO ordrDlvyVO = new BOOrdrDlvyVO();
+        ordrDlvyVO.setSopmalCd(boDlivyVO.getSopmalCd());
+        ordrDlvyVO.setOrdrInnb(boDlivyVO.getOrdrInnb());
 
-        model.addAttribute("resultMap", content);
-//        responseHandler.handleResponse(
-//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/dlivy/selectBOOrdrDlvyDtlsInqire", dlivyVO),
-//                model,
-//                "resultMap"
-//        );
+        model.addAttribute("ordrInfo", boOrdrService.selectMbrOrdrDtlInqire(ordrDlvyVO));
+        model.addAttribute("resultMap", dlivyService.updateBOAciDelivery(boDlivyVO));
 
-        // return "sopmal/mpage/ordr/DlvyInqireR";
         return Util.getDeviceType(request) + "/mpage/ordr/DlvyInqireR";
     }
 
@@ -719,7 +786,7 @@ public class MyOrdrController {
 //                model,
 //                "resultMap"
 //        );
-        model.addAttribute("paramVO", boRtngudrefndVO);
+        model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(boRtngudrefndVO));
 
         // 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
         Map<String, Object> content2 = selectBOMpageInfoInqire(vo);

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

@@ -2,6 +2,8 @@ package com.wb.domainserver.domain.sopmal.ordr.controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.wb.domainserver.common.msg.GconeMessageSource;
+import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrLogService;
+import com.wb.domainserver.domain.gcone.ordr.pay.vo.BOPayVO;
 import com.wb.domainserver.domain.sopmal.ordr.vo.OrdrVO;
 import com.wb.domainserver.exception.WnbtRestException;
 import com.wb.domainserver.response.WnbtWebClientResponseHandler;
@@ -9,17 +11,23 @@ import com.wb.domainserver.security.authorization.annotation.AuthPolicy;
 import com.wb.domainserver.security.authorization.annotation.Policy;
 import com.wb.domainserver.util.communicate.RESRC;
 import com.wb.domainserver.util.communicate.SendToResrc;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import com.wb.domainserver.util.string.StringUtil;
 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.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.io.BufferedReader;
+import java.net.URLDecoder;
+import java.util.*;
 
 @Slf4j
 @Controller
@@ -34,6 +42,9 @@ public class OrdrApiController {
     @Autowired
     private GconeMessageSource messageSource;
 
+    @Autowired
+    private BOOrdrLogService ordrLogService;
+
     private Util utilClass;
 
    /* ####################################
@@ -95,4 +106,135 @@ public class OrdrApiController {
         return Integer.parseInt(cleanedCode.toString(), 16);
     }
 
+
+    /* ##################################################
+       사용자 > 결제(키움) > 결제 성공 후 결제값 응답받음
+       ################################################## */
+    /**
+     * 키움 결제 연계처리 - 결과통보페이지
+     * @author 이경숙
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/kiwoomPayWebhook")
+    @ResponseBody
+    public ResponseEntity<String> selectPaymentkiwoomWebhook(HttpServletRequest request) throws Exception {
+
+        // 0. 키움에서 온 값 로그 출력 (결제실패에 대한 응답은 없음)
+        printKiwoomRequest(request);
+
+        // 1. 주문 로그 남김 (GC_ORDER_LOG)
+        BOPayVO payVO = new BOPayVO();
+        DataMap pgApiLogReqVO = new DataMap();
+        String orderNo = StringUtil.isNullToString(request.getParameter("ORDERNO"));
+        String orderNm = StringUtil.isNullToString(request.getParameter("USERNAME"));
+        String resParam = queryStringToJson(request.getQueryString());
+
+        payVO.setPgCmpnyNm("kiwoom");            //pg사명
+        payVO.setDvCd("01");                     //사용자
+        payVO.setOrderId(orderNo);               //주문번호
+        payVO.setSetlerNm(orderNm);              //주문자명
+        pgApiLogReqVO.put("resParam",resParam);  //응답전문
+
+        ordrLogService.insertSetleOrderPgLog(payVO, pgApiLogReqVO);
+
+        // 2. PG API 로그 남김 (GC_ORDER_PG_API_LOG)
+        pgApiLogReqVO.put("reqParam", "");        //요청전문
+		pgApiLogReqVO.put("ordrInnb", orderNo);   //주문번호
+		pgApiLogReqVO.put("sopmalCd", "SK");      //쇼핑몰코드
+		pgApiLogReqVO.put("pgCmpnyNm", "kiwoom"); //pg사명
+		pgApiLogReqVO.put("mbrInnb", "");         //회원번호
+		pgApiLogReqVO.put("resParam", resParam);  //응답전문
+
+        ordrLogService.insertBOPgApiLogReqRegist(pgApiLogReqVO);
+
+        String response = "<html><body><RESULT>SUCCESS</RESULT></body></html>";
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.TEXT_HTML)
+                .body(response);
+    }
+
+
+
+    public static void printKiwoomRequest(HttpServletRequest request) {
+        try {
+            System.out.println("========== [KIWOOM REQUEST START] ==========");
+
+            // 1. 기본 정보
+            System.out.println("URL        : " + request.getRequestURL());
+            System.out.println("METHOD     : " + request.getMethod());
+            System.out.println("QUERY      : " + request.getQueryString());
+            System.out.println("REMOTE IP  : " + request.getRemoteAddr());
+
+            // 2. 파라미터 (가장 중요)
+            System.out.println("---------- PARAM ----------");
+            request.setCharacterEncoding("EUC-KR");
+            request.getParameterMap().forEach((key, values) -> {
+                System.out.println(key + " = " + Arrays.toString(values));
+            });
+
+            // 3. 헤더
+            System.out.println("---------- HEADER ----------");
+            Collections.list(request.getHeaderNames()).forEach(header -> {
+                System.out.println(header + " = " + request.getHeader(header));
+            });
+
+            // 4. Body (JSON 대응)
+            System.out.println("---------- BODY ----------");
+
+            StringBuilder body = new StringBuilder();
+            BufferedReader reader = request.getReader();
+            String line;
+
+            while ((line = reader.readLine()) != null) {
+                body.append(line);
+            }
+
+            System.out.println(body.toString());
+
+            System.out.println("========== [KIWOOM REQUEST END] ==========");
+
+        } catch (Exception e) {
+            System.out.println("❌ REQUEST LOG ERROR");
+            e.printStackTrace();
+        }
+    }
+
+
+    public String queryStringToJson(String queryString) throws Exception {
+        Map<String, String> map = new HashMap<>();
+
+        if (queryString != null && !queryString.isEmpty()) {
+            String[] pairs = queryString.split("&");
+
+            for (String pair : pairs) {
+                String[] keyValue = pair.split("=", 2);
+
+                String key = URLDecoder.decode(keyValue[0], "UTF-8");
+                String value = keyValue.length > 1 ? URLDecoder.decode(keyValue[1], "UTF-8") : "";
+
+                map.put(key, value);
+            }
+        }
+
+        ObjectMapper mapper = new ObjectMapper();
+        return mapper.writeValueAsString(map);
+    }
+
+    public Map<String, String> queryStringToMap(String queryString) throws Exception {
+        Map<String, String> map = new HashMap<>();
+
+        if (queryString != null) {
+            for (String param : queryString.split("&")) {
+                String[] pair = param.split("=", 2);
+
+                String key = URLDecoder.decode(pair[0], "EUC-KR");
+                String value = pair.length > 1 ? URLDecoder.decode(pair[1], "EUC-KR") : "";
+
+                map.put(key, value);
+            }
+        }
+        return map;
+    }
+
 }

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

@@ -3,7 +3,7 @@ package com.wb.domainserver.domain.sopmal.ordr.controller;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jose.shaded.gson.Gson;
-import  com.wb.domainserver.common.msg.GconeMessageSource;
+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.instcSle.mtng.service.BOMaMtngService;
@@ -20,52 +20,46 @@ import com.wb.domainserver.domain.gcone.goods.goods.service.BOGoodsService;
 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.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.dlivy.service.BODlivyService;
 import com.wb.domainserver.domain.gcone.ordr.npay.service.BONpayConfigService;
 import com.wb.domainserver.domain.gcone.ordr.npay.vo.BONpayConfigVO;
-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.service.BOOrdrService;
 import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOCrmDlvylcVO;
 import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrVO;
 import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOSpbkVO;
+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.promtn.coupon.service.BOCouponService;
 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.site.vo.BOSiteVO;
-import  com.wb.domainserver.domain.sample.vo.PrevewVO;
-import  com.wb.domainserver.domain.sopmal.goods.vo.GoodsVO;
-import  com.wb.domainserver.domain.sopmal.ordr.vo.OrdrVO;
-import  com.wb.domainserver.domain.sopmal.ordr.vo.PayVO;
-import  com.wb.domainserver.domain.sopmal.ordr.vo.SpbkVO;
+import com.wb.domainserver.domain.sopmal.ordr.vo.OrdrVO;
 import com.wb.domainserver.exception.WnbtRestException;
 import com.wb.domainserver.exception.code.PurchsValidCode;
-import com.wb.domainserver.response.ApiResponse;
-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.CookieUtils;
-import  com.wb.domainserver.util.communicate.RESRC;
-import  com.wb.domainserver.util.communicate.ReplyFromResrc;
-import  com.wb.domainserver.util.communicate.SendToResrc;
-import  com.wb.domainserver.util.cookie.CookieUtil;
-import  com.wb.domainserver.util.dataaccess.DataMap;
-import  com.wb.domainserver.util.string.StringUtil;
-import  com.wb.domainserver.util.util.Util;
+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.cookie.CookieUtil;
+import com.wb.domainserver.util.dataaccess.DataMap;
+import com.wb.domainserver.util.string.StringUtil;
+import com.wb.domainserver.util.util.Util;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.text.StringEscapeUtils;
 import org.apache.logging.log4j.util.Base64Util;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -74,11 +68,15 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
@@ -136,6 +134,10 @@ public class OrdrController {
     private BOMaMtngService boMaMtngService;
     @Autowired
     private BOPurchsService boPurchsService;
+    @Autowired
+    private BOSubsvcService subsvcService;
+    @Autowired
+    private BOPayService payService;
 
     /* ####################################
        사용자 > 상품 > 구매/결제 > 회원구매하기 시작
@@ -362,6 +364,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();
@@ -398,6 +401,136 @@ public class OrdrController {
 //        );
     }
 
+    /* ####################################
+       사용자 > 구독상품 > 구매/결제 > 회원구매하기 시작
+       #################################### */
+    /**
+     * 사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 > 구독서비스 결제 화면 이동
+     * @return SubsvcPurchsC.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectSubsvcPurchsForm")
+    public String selectSubsvcSetleInqire(HttpServletRequest request, ModelMap model, BOOrdrVO ordrVO) throws Exception {
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+
+        //결재 플랫폼 구분 코드
+        ordrVO.setSetlePltfomTyCd("PC".equals(request.getAttribute("env"))?"03":"04");
+
+        //약관정보 세팅
+        BOStplatVO stplatVO = new BOStplatVO();
+        stplatVO.setPageIndex(1);
+        stplatVO.setPageUnit(paginationProperties.getPageUnit());
+        stplatVO.setNmbrPurchsAt("Y");
+        stplatVO.setSrchSopmalCd(user.getSopmalCd());
+
+        DataMap stplat = selectBOStplatListInqire(stplatVO);
+
+        //주문 상품정보 세팅
+        if ("01".equals(user.getSysDvCd())) {
+            ordrVO.setSopmalCd(user.getSopmalCd());
+        }
+        ordrVO.setMbrInnb(user.getUserInnb());
+        ordrVO.setMbrId(user.getMbrId());
+        ordrVO.setMbrDvCd(user.getMbrDvCd());
+
+        Map<String, Object> content = service.selectSubsvcPurchs(ordrVO);
+
+        model.addAttribute("data", content);
+        model.addAttribute("paramVO", new ObjectMapper().writeValueAsString(ordrVO));
+        model.addAttribute("deviceType", Util.getDeviceType(request));
+        model.addAttribute("stplat", stplat);
+
+        return Util.getDeviceType(request) + "/ordr/SubsvcPurchsC";
+    }
+
+    /**
+     * 사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 > 구독서비스 조회
+     * @param param
+     * @return ResponseEntity<WnbtResponse>
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectOrderSubsvcList", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<WnbtResponse> selectOrderSubsvcOne(@RequestBody HashMap<String, Object> param) {
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        BOSubsvcVO subsvcVO = new BOSubsvcVO();
+
+        if ("01".equals(user.getSysDvCd())) {
+            subsvcVO.setSopmalCd(user.getSopmalCd());
+        }
+        subsvcVO.setMbrInnb((Integer) param.get("mbrInnb"));
+        subsvcVO.setSubsvcInnb(String.valueOf(param.get("subsvcInnb")));
+
+        List<DataMap> content = new ArrayList<>();
+        content.add(subsvcService.selectBOSubsvcDetail(subsvcVO));
+
+        return ResponseEntity.ok(
+                WnbtResponse.builder()
+                        .resBody(new WnbtResponseBody(content))
+                        .build()
+        );
+    }
+
+    /**
+     * 사용자 > 구독상품 > 구매/결제 > 구독서비스 결제 > 결제 예정금액 조회
+     * @param param
+     * @return ResponseEntity<WnbtResponse>
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectSubsvcSetleExpectAmt", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<WnbtResponse> selectSubsvcSetleExpectAmt(HttpServletRequest request, @RequestBody HashMap<String, Object> param) {
+        String sesionId ="";
+        Cookie[] cookies = request.getCookies();
+        if(cookies != null){
+            for(Cookie cookie : cookies ){
+                if(cookie.getName().equals("JSESSIONID")){
+                    sesionId = cookie.getValue();
+                    param.put("sesionId", sesionId);
+                    break;
+                }
+            }
+        }
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        if ("01".equals(user.getSysDvCd())) {
+            param.put("sopmalCd", user.getSopmalCd());
+            param.put("mbrDvCd", user.getMbrDvCd());
+            param.put("mbrInnb", user.getUserInnb());
+        }
+        Map<String, Object> content = new HashMap<>();
+        try {
+            DataMap datamap = new DataMap();
+            param.entrySet().forEach(map -> {
+                datamap.put(map.getKey(), map.getValue());
+            });
+            content = service.selectSubsvcSetleExpectAmt(datamap);
+        } catch (WnbtRestException wre) {
+            log.debug("결제예정금액 ordr wre");
+            log.error(wre.getMessage(), wre);
+            content = new HashMap<>() {{
+                put("status", "1");
+                put("message", wre.getMessage());
+                put("mlgMxmmUseAmt", wre.getCode());
+            }};
+        } catch (Exception e) {
+            log.debug("결제예정금액 ordr e");
+            log.error(e.getMessage(), e);
+
+            content = new HashMap<>() {{
+                put("status", "1");
+                put("message", "예기치 못한 오류가 발생하였습니다.\n관리자에게 문의하시기 바랍니다.");
+            }};
+        }
+
+        return ResponseEntity.ok(
+                WnbtResponse.builder()
+                        .resBody(new WnbtResponseBody(content))
+                        .build()
+        );
+//        return responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/selectBOSetleExpectAmt", param),
+//                ReplyFromResrc::getReply
+//        );
+    }
+
 
     /**
      * 관리자 주문 > 브랜드페이 > 토큰발급
@@ -662,6 +795,22 @@ public class OrdrController {
             paramData.put(map.getKey(), map.getValue());
         });
 
+        LinkedHashMap goodsOne = ((List<LinkedHashMap>) paramData.get("goodsList")).get(0);
+        Boolean subsvcAt = goodsOne.containsKey("subsvcInnb");
+        // 구독서비스에 포함된 상품 목록 세팅
+        if(subsvcAt) {
+            model.addAttribute("subsvcInnb", goodsOne.get("subsvcInnb"));
+
+            BOSubsvcVO subsvcVO = new BOSubsvcVO();
+            subsvcVO.setSopmalCd((String) goodsOne.get("sopmalCd"));
+            subsvcVO.setSubsvcInnb(goodsOne.get("subsvcInnb").toString());
+            subsvcVO.setQy((int) goodsOne.get("qy"));
+            subsvcVO.setMbrInnb((int) goodsOne.get("mbrInnb"));
+
+            paramData.remove("goodsList");
+            paramData.put("goodsList", service.selectSubsvcGoodsList(subsvcVO));
+        }
+
         Map<String, Object> resultMap = insertBOOrder(paramData);
 //        Map<String, Object> resultMap = responseHandler.handleResponseAsMap(
 //                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/insertBOOrder", param)
@@ -691,7 +840,9 @@ public class OrdrController {
            String pgCmpnyNm = setle.getPgCmpnyNm();
            String setleTyCd = setle.getSetleTyCd();
 
-            if ("gcpay".equals(pgCmpnyNm)) {
+            if ("kiwoom".equals(pgCmpnyNm)||"naverpay".equals(pgCmpnyNm)) {
+                url = "sopmal/ordr/OrdrReqstKiwoomPayR";
+            } else if ("gcpay".equals(pgCmpnyNm)) {
                 url = "sopmal/ordr/OrdrReqstGcpayPayR";
             } else if ("kcp".equals(pgCmpnyNm)) {
                 if ("sopmal_m".equals(deviceType)) {
@@ -701,7 +852,7 @@ public class OrdrController {
                 }
             } else if ("toss".equals(pgCmpnyNm)) {
                 url = "sopmal/ordr/OrdrReqstTossPayR";
-            } else if ("tosspay".equals(pgCmpnyNm)||"naverpay".equals(pgCmpnyNm)||"kakaopay".equals(pgCmpnyNm)) {
+            } else if ("tosspay".equals(pgCmpnyNm)||"kakaopay".equals(pgCmpnyNm)) {  //||"naverpay".equals(pgCmpnyNm) 키움으로 이동
                 url = "sopmal/ordr/OrdrReqstTosspayPayR";
             } else if ("02".equals(setleTyCd)||"08".equals(setleTyCd)||"12".equals(setleTyCd)) { // 무통장, 마일리지, 충전형마일리지
                 url = "sopmal/ordr/OrdrReqstPayR";
@@ -921,7 +1072,7 @@ public class OrdrController {
             agentId = CookieUtil.getAgentCookieValue(request.getCookies());
             payVO.setAgentId(agentId);
         }
-        log.debug("=================insertKcpSetle cookies {} ",cookies);
+        log.debug("=================insertKcpSetle cookies {} ",(Object) cookies);
 
         Map<String, String> util = new HashMap<>();
         util = utilClass.getRequestInfo(request);
@@ -942,6 +1093,12 @@ public class OrdrController {
         log.debug("=================insertKcpSetle after ");
 
         model.addAttribute("paramVO", payVO);
+        if ("1".equals(content.get("status"))) { // 에러처리
+            String subsvcInnb = request.getParameter("subsvc_innb");
+            if(subsvcInnb != "") {
+                model.addAttribute("subsvcInnb", subsvcInnb);
+            }
+        }
 
         return "sopmal/ordr/OrdrRspnsKcpPayR";
     }
@@ -1033,19 +1190,6 @@ public class OrdrController {
 
         payVO.setSetlerNm(request.getParameter("buyr_name"));
 
-        //에스크로 정보추가
-        /*payVO.setEscwUsed(request.getParameter("escw_used"));
-        payVO.setPayMod(request.getParameter("pay_mod"));
-        payVO.setRcvrName(request.getParameter("rcvr_name"));
-        payVO.setRcvrTel1(request.getParameter("rcvr_tel1"));
-        payVO.setRcvrTel2(request.getParameter("rcvr_tel2"));
-        payVO.setRcvrZipx(request.getParameter("rcvr_zipx"));
-        payVO.setRcvrAdd1(request.getParameter("rcvr_add1"));
-        payVO.setRcvrAdd2(request.getParameter("rcvr_add2"));
-        payVO.setDeliTerm(request.getParameter("deli_term"));
-        payVO.setBaskCntx(request.getParameter("bask_cntx"));
-        payVO.setGoodInfo(request.getParameter("good_info"));*/
-
         log.debug("payVO => {} ", new Gson().toJson(payVO));
 
         String resCd = request.getParameter("res_cd");
@@ -1243,6 +1387,176 @@ public class OrdrController {
         return "sopmal/ordr/OrdrRspnsTossPayR";
     }
 
+
+    /**
+     * 키움 결제 연계 전 getEnc 값 받아오기
+     * @author 이경숙
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @ResponseBody
+    @RequestMapping(value="/kiwoomPayGetEnc")
+    public Map<String, Object> selectKiwoomGetEnc(HttpServletRequest request) throws Exception {
+
+        BOPayVO payVO = new BOPayVO();
+
+        log.debug("kiwoomPayGetEnc = {}");
+
+        //String eucKrStr = new String(utf8Str.getBytes("UTF-8"), "EUC-KR");
+        //String utf8Str = new String(eucKrStr.getBytes("EUC-KR"), "UTF-8");
+        //request.setCharacterEncoding("EUC-KR");
+
+        payVO.setCpId(request.getParameter("CPID"));
+        payVO.setPayMethod(request.getParameter("PAYMETHOD"));
+        payVO.setOrderId(request.getParameter("ORDERNO"));
+        payVO.setType(request.getParameter("TYPE"));
+        payVO.setAmount(request.getParameter("AMOUNT"));
+
+        Map<String, Object> message;
+        String sopmalCd = payVO.getSopmalCd();
+        try {
+            message = payService.insertKiwoomPay(payVO);
+
+        } catch (Exception e) {
+            message = new HashMap<>() {{
+                put("response", "결제를 실패하였습니다.\n관리자에게 문의하시기 바랍니다.");
+            }};
+        }
+
+
+        log.info("insertKiwoomPay step5 ::: {}", message.get("KIWOOM_ENC"));
+
+        return message;
+    }
+
+
+    /**
+     * 키움 결제 연계처리  - 사전 승인 후 결제요청 페이지 이동
+     * @return PayKiwoomSucsC.jsp
+     * @author 이경숙
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/kiwoomPayPreSuccss")
+    public String confirmKiwoom(HttpServletRequest request, ModelMap model) throws Exception {
+
+        return "sopmal/ordr/OrdrReqstKiwoomPreR";
+    }
+
+    /**
+     * 키움 결제 연계처리  - 결제창 취소버튼 클릭 시 페이지 이동
+     * @return PayKiwoomSucsC.jsp
+     * @author 이경숙
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/kiwoomPayCancelUrl")
+    public String cancelUrlKiwoom(HttpServletRequest request, ModelMap model) throws Exception {
+
+        return "sopmal/ordr/OrdrReqstKiwoomCnclR";
+    }
+
+
+    /**
+     * 사용자 > 상품 > 구매/결제 > 회원구매하기 > 키움 결제 정보 등록
+     * @param model
+     * @param request
+     * @return OrdrRspnsKiwoomPayR.jsp
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/insertKiwoomSetle")
+    public String insertKiwoomSetle(ModelMap model, HttpServletRequest request) {
+
+        log.info("insertKiwoomSetle controller start ::: ");
+
+        BOPayVO payVO = new BOPayVO();
+
+        payVO.setOrderId(request.getParameter("ordrInnb"));
+        payVO.setAmount(request.getParameter("setleAmt"));
+        payVO.setSopmalCd(request.getParameter("sopmalCd"));
+        payVO.setMbrInnb(request.getParameter("mbrInnb"));
+        payVO.setMbrId(request.getParameter("mbrId"));
+        payVO.setSesionId(request.getParameter("sesionId"));
+        payVO.setPgCmpnyNm(request.getParameter("pgCmpnyNm"));
+        payVO.setSetleTyCd(request.getParameter("setleTyCd"));
+
+        String ordrrNm = request.getParameter("ordrrNm");
+        try {
+            payVO.setSetlerNm(new String(Base64.getDecoder().decode(ordrrNm), "UTF-8"));
+        }catch(Exception e){
+            log.debug("throws UnsupportedEncodingException:::::");
+        }
+
+        log.info("insertKiwoomSetle controller payVO 3 ::: {}", payVO);
+
+        String agentId = "";
+        String jSesionId = "";
+        String ipAdres = "";
+
+        // 쿠키를 가져옴
+        Cookie[] cookies = request.getCookies();
+
+        //agentId 쿠키 있을 경우 가져옴
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                if (cookie.getName().equals("JSESSIONID")) {
+                    jSesionId = cookie.getValue();
+                    payVO.setSessionId(jSesionId);
+                }
+            }
+        }
+        //gc_agent_id 가져옴
+        if (CookieUtil.hasAgentCookie(request.getCookies())) {
+            agentId = CookieUtil.getAgentCookieValue(request.getCookies());
+            payVO.setAgentId(agentId);
+        }
+        Map<String, String> util = new HashMap<>();
+        util = utilClass.getRequestInfo(request);
+        ipAdres = util.get("XForwardedFor");
+        payVO.setIpAdres(ipAdres);
+
+        AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
+        payVO.setMbrNm(user.getMbrNm());  //회원명(관리자명)
+        if ("01".equals(user.getSysDvCd())) {
+            payVO.setDvCd("01");
+            payVO.setSopmalCd(user.getSopmalCd());
+            payVO.setMbrDvCd(user.getMbrDvCd());
+        } else {
+            payVO.setDvCd("02");
+        }
+
+        Map<String, Object> content;
+
+        try {
+            content = service.insertKiwoomSetle(payVO);
+
+            log.info("insertKiwoomSetle controller content ::: {}", content);
+
+        } catch (WnbtRestException wre) {
+            log.info("insertKiwoomSetle : 키움 결제 정보 등록 : 실패 WnbtRestException");
+            log.error(wre.getMessage(), wre);
+            content = new HashMap<>() {{
+                put("status", "1");
+                put("message", wre.getMessage());
+            }};
+        } catch (Exception e) {
+            log.info("insertKiwoomSetle : 키움 결제 정보 등록 : 실패");
+            log.error(e.getMessage(), e);
+
+            content = new HashMap<>() {{
+                put("status", "1");
+                put("message", "키움 결제 정보 등록이 실패하였습니다.\n관리자에게 문의하시기 바랍니다.");
+            }};
+        }
+
+        if ("0".equals(content.get("status"))) {
+            commonOrderPostProcess(payVO);
+        }
+
+        model.addAttribute("data", content);
+        model.addAttribute("paramVO", payVO);
+
+        return "sopmal/ordr/OrdrRspnsKiwoomPayR";
+    }
+
+
     /**
      * 사용자 > 상품 > 구매/결제 > 회원구매하기 > 주문완료 화면 이동
      * @return OrdrComptR.jsp
@@ -2612,7 +2926,21 @@ public class OrdrController {
 
             // 2.가용재고수량 수정 ==============================================================
             try {
-                boGoodsService.updateOrdrUsefulInvntryQy(orderVO);
+                BOOrdrVO ordrVO = new BOOrdrVO();
+                ordrVO.setOrdrInnb(orderVO.getOrdrInnb().toString());
+                ordrVO.setSopmalCd(orderVO.getSopmalCd());
+
+                DataMap ordrDtl = (DataMap) service.selectOrdrDtlInqire(ordrVO).get("dtl");
+                boolean subsvcAt = "Y".equals(ordrDtl.get("subsvcAt"));
+                // 구독서비스 여부(subsvcAt)에 따라 재고 처리 로직을 분기
+                if(subsvcAt) {
+                    // 구독서비스
+                    ordrVO.setSubsvcInnb(ordrDtl.get("subsvcInnb").toString());
+                    subsvcService.updateSubsvcOrdrUsefulInvntryQy(ordrVO);
+                } else {
+                    // 일반 주문
+                    boGoodsService.updateOrdrUsefulInvntryQy(orderVO);
+                }
             } catch (Exception e) {
                 logVO.setFailContent("상품 재고수량 업데이트 실패");
                 log.error("{} 상품 재고수량 업데이트 실패!", payVO.getOrderId());
@@ -2980,6 +3308,8 @@ public class OrdrController {
         List<LinkedHashMap> goodsList = (List<LinkedHashMap>) param.get("goodsList"); // 상품정보
         LinkedHashMap enuri = null;
         LinkedHashMap setle = null;
+        // 구독서비스 여부
+        Boolean isSubsvc = goodsList.get(0).containsKey("subsvcInnb");
 
         //회원일 경우에만 enuri정보 존재
         if(user.getUserInnb() > 0){
@@ -3008,6 +3338,7 @@ public class OrdrController {
                 return content;
             }
         } else {
+            // 여러곳배송처럼 처리하더라도 주소는 하나이므로 shipping 체크
             if (CollectionUtils.isEmpty(shipping)) {
                 log.info("배송지 정보를 찾을 수 없습니다.");
                 content.put("result","Y");
@@ -3024,8 +3355,7 @@ public class OrdrController {
             return content;
         }
 
-
-        if (CollectionUtils.isEmpty(enuri)) {
+        if (!isSubsvc && CollectionUtils.isEmpty(enuri)) {
             log.info("할인 또는 결제 정보를 찾을 수 없습니다.");
             content.put("result","Y");
             content.put("message", "할인 또는 결제 정보를 찾을 수 없습니다.");
@@ -3035,7 +3365,7 @@ public class OrdrController {
 
         String sopmalCd = (String) param.get("sopmalCd");
         String ordrTyCd = (String) param.get("ordrTyCd");
-        String mbrInnb = (String) goodsList.get(0).get("mbrInnb");
+        String mbrInnb = String.valueOf(goodsList.get(0).get("mbrInnb"));
         String mbrDvCd = (String) goodsList.get(0).get("mbrDvCd");
         String ordrrMbtlnb = (String) purchsr.get("mbtlnb");
 
@@ -3169,17 +3499,27 @@ public class OrdrController {
             try {
                 //계산결과 총결제금액
                 String resultSetleAmt = "";
+                String resultWonSetleAmt = "";
                 //주문요청 총결제금액
                 //회원/비회원 총결제금액
                 String reqSetleAmt = StringUtil.isNullToString(setle.get("rlSetleAmt"));
+                String reqWonSetleAmt = StringUtil.isNullToString(setle.get("wonRlSetleAmt"));
                 //재계산된 총결제금액관련정보
-                Map<String, Object> resultAmt = service.selectSetleExpectAmt(param);
+                Map<String, Object> resultAmt;
+                if(isSubsvc) {
+                    resultAmt = service.selectSubsvcSetleExpectAmt(param);
+                } else {
+                    resultAmt = service.selectSetleExpectAmt(param);
+                }
 
                 if(resultAmt.containsKey("setleExpectAmt")){
                     LinkedHashMap setleExpectAmt = (LinkedHashMap) resultAmt.get("setleExpectAmt");
                     if(setleExpectAmt.containsKey("setleAmt")){
                         resultSetleAmt = StringUtil.isNullToString(setleExpectAmt.get("setleAmt"));
                     }
+                    if(setleExpectAmt.containsKey("setleAmtKr")){
+                        resultWonSetleAmt = StringUtil.isNullToString(setleExpectAmt.get("setleAmtKr"));
+                    }
 
                     //주문요청의 총결제금액과 계산된 총결제금액이 서로 다를 경우
                     if(!resultSetleAmt.equals(reqSetleAmt)
@@ -3188,6 +3528,13 @@ public class OrdrController {
                         content.put("result", "Y");
                         content.put("message", PurchsValidCode.purchsValidMsg("setleAmt"));
                     }
+                    if(!resultWonSetleAmt.equals(reqWonSetleAmt)
+                            && StringUtils.hasText(reqWonSetleAmt)
+                            && StringUtils.hasText(resultWonSetleAmt)){
+                        content.put("result", "Y");
+                        content.put("message", PurchsValidCode.purchsValidMsg("setleAmt"));
+                    }
+
                 }
             } catch (WnbtRestException wre) {
                 log.error(wre.getMessage());

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

@@ -4,9 +4,7 @@ import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 import com.wb.domainserver.domain.gcone.ordr.pay.service.BOPayService;
 import com.wb.domainserver.domain.gcone.ordr.pay.vo.BOPayVO;
@@ -22,9 +20,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import  com.wb.domainserver.domain.sopmal.ordr.vo.PayVO;
@@ -630,4 +626,173 @@ public class PayController {
         return message;
     }
 
+
+    /* *********************************************
+     * 키움결제
+     ********************************************* */
+
+    /**
+     * 키움 결제 화면
+     * @return PayKiwoomSucsC.jsp
+     * @author 이경숙
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectKiwoomSample")
+    public String selectKiwoonPay(ModelMap model) throws Exception {
+        log.debug("selectKiwoonPay = {}");
+        return "sopmal/ordr/PayKiwoomPayC";
+    }
+
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectKiwoomApiSample")
+    public String selectKiwoonPay2(ModelMap model) throws Exception {
+        log.debug("selectKiwoonPay = {}");
+        return "sopmal/ordr/PayKiwoomPay2C";
+    }
+
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectKiwoomTotalSample")
+    public String selectKiwoonPayTotal(ModelMap model) throws Exception {
+        log.debug("selectKiwoonPay = {}");
+        return "sopmal/ordr/PayKiwoomPayTotalC";
+    }
+
+
+    /**
+     * 키움 결제 연계 전 getEnc 값 받아오기
+     * @return PayKiwoomSucsC.jsp
+     * @author 이경숙
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @ResponseBody
+    @RequestMapping(value="/kiwoomPayGetEnc")
+    public Map<String, Object> selectKiwoomGetEnc(HttpServletRequest request) throws Exception {
+
+        BOPayVO payVO = new BOPayVO();
+
+        log.debug("kiwoomPayGetEnc = {}");
+
+        //String eucKrStr = new String(utf8Str.getBytes("UTF-8"), "EUC-KR");
+        //String utf8Str = new String(eucKrStr.getBytes("EUC-KR"), "UTF-8");
+        //request.setCharacterEncoding("EUC-KR");
+
+        payVO.setCpId(request.getParameter("CPID"));
+        payVO.setPayMethod(request.getParameter("PAYMETHOD"));
+        payVO.setOrderId(request.getParameter("ORDERNO"));
+        payVO.setType(request.getParameter("TYPE"));
+        payVO.setAmount(request.getParameter("AMOUNT"));
+
+        Map<String, Object> message;
+        String sopmalCd = payVO.getSopmalCd();
+        try {
+            message = service.insertKiwoomPay(payVO);
+
+        } catch (Exception e) {
+            message = new HashMap<>() {{
+                put("response", "결제를 실패하였습니다.\n관리자에게 문의하시기 바랍니다.");
+            }};
+        }
+
+
+        log.info("insertKiwoomPay step5 ::: {}", message.get("KIWOOM_ENC"));
+
+        //model.addAttribute("message", message);
+        //return "sopmal/ordr/PayKiwoomSucsC";
+
+        return message;
+    }
+
+
+    /**
+     * 키움 결제 연계처리  - 성공결과페이지
+     * @return PayKiwoomSucsC.jsp
+     * @author 이경숙
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/kiwoomPaySuccss")
+    public String confirmPaymentKiwoom(HttpServletRequest request, ModelMap model) throws Exception {
+
+        System.out.println("성공결과페이지 ::: "+request.getQueryString());
+
+        BOPayVO payVO = new BOPayVO();
+
+        payVO.setCode(request.getParameter("RESULTCODE"));
+        payVO.setOrderId(request.getParameter("ORDERNO"));
+        payVO.setAmount(request.getParameter("AMOUNT"));
+        payVO.setPayMethod(request.getParameter("PAYMETHOD"));
+
+        Map<String, Object> message = new HashMap<>();
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("code", payVO.getCode());
+        jsonObject.put("orderId", payVO.getOrderId());
+        jsonObject.put("amount", payVO.getAmount());
+        jsonObject.put("payMethod", payVO.getPayMethod());
+        message.put("response",jsonObject.toString());
+
+        model.addAttribute("message", message);
+
+        return "sopmal/ordr/PayKiwoomSucsC";
+    }
+
+
+    /**
+     * 키움 결제취소 화면
+     * @return PayKiwoomModC.jsp
+     * @author 이경숙
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/selectKiwoomCancelSample")
+    public String selectKiwoomCancel(ModelMap model) throws Exception {
+        log.debug("selectKiwoomCancel = {}");
+        return "sopmal/ordr/PayKiwoomModC";
+    }
+
+
+    /**
+     * 키움 결제 연계처리  - 결체취소결과페이지
+     * @return PayKiwoomSucsC.jsp
+     * @author 이경숙
+     */
+    @Policy(AuthPolicy.RESTRICTED)
+    @RequestMapping(value="/kiwoomPayCancel")
+    public String confirmCancelKiwoom(HttpServletRequest request, ModelMap model) throws Exception {
+
+        System.out.println("취소데이터 수신 ::: "+request.getQueryString());
+
+        Map<String, Object> setleCancelResultMessage = new HashMap<>();
+        Map<String, Object> responseMap = new HashMap<>();
+
+        BOPayVO payVO = new BOPayVO();
+
+        payVO.setSopmalCd("SK");
+        payVO.setOrderId(request.getParameter("ORDERNO"));
+        payVO.setCancelAmount(request.getParameter("AMOUNT"));
+        payVO.setPayMethod(request.getParameter("PAYMETHOD"));
+        payVO.setTno(request.getParameter("TRXID"));
+        payVO.setCancelReason(request.getParameter("CANCELREASON"));
+        payVO.setSetleTyCd("01");
+        payVO.setPgCmpnyNm("kiwoom");
+
+        log.debug("confirmCancelKiwoom step1 payVO :::> {}", payVO);
+
+        Map<String, Object> message = new HashMap<>();
+
+        setleCancelResultMessage = service.cancelKiwoomPay(payVO);
+
+        String responseStr = (String) setleCancelResultMessage.get("response");
+
+        JSONParser parser = new JSONParser();
+        JSONObject jsonObject = (JSONObject) parser.parse(responseStr);
+        jsonObject.put("orderId", payVO.getOrderId());
+        jsonObject.put("amount", payVO.getAmount());
+        jsonObject.put("payMethod", payVO.getPayMethod());
+        jsonObject.put("code", jsonObject.get("RESULTCODE"));
+        message.put("response",jsonObject.toString());
+
+        model.addAttribute("message", message);
+
+        return "sopmal/ordr/PayKiwoomSucsC";
+    }
+
 }

src/main/java/com/wb/domainserver/domain/sopmal/ordr/vo/OrdrVO.java

@@ -41,9 +41,12 @@ public class OrdrVO extends AbstractVO {
     /** 실패 메세지 */
     private String message;
 
-    /*결제 플랫폼 타입 코드*/
+    /** 결제 플랫폼 타입 코드*/
     private String setlePltfomTyCd;
 
-    /*주문유형*/
+    /** 주문유형*/
     private String ordrTyCd;
+
+    /** 구독서비스 고유번호*/
+    private String subsvcInnb;
 }

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

@@ -371,7 +371,9 @@ public class MngrLoggingInterceptor implements HandlerInterceptor {
                 String cookieValue = agentId + ":" + md5(agentId + ":" + md5(System.currentTimeMillis() + ":" + random.nextInt())).substring(5, 10);
                 Cookie agentIdCookie = new Cookie("agent_id", cookieValue);
                 agentIdCookie.setMaxAge(86400 * 365 * 10); // 10년
-                agentIdCookie.setDomain(domain);
+                if (!request.getServerName().startsWith("loc.")) {
+                    agentIdCookie.setDomain(domain);
+                }
 //                agentIdCookie.setHttpOnly(true);
                 agentIdCookie.setPath("/mngr");
     //            agentIdCookie.setSecure(true);

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

@@ -57,7 +57,7 @@ import java.util.stream.Collectors;
 
 import static org.springframework.beans.factory.config.BeanDefinition.ROLE_INFRASTRUCTURE;
 
-@EnableWebSecurity(debug = true)
+@EnableWebSecurity
 @Configuration
 //@EnableMethodSecurity
 public class ResourceServerConfig {

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

@@ -51,14 +51,17 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
             String accessToken = extractToken(request);
 
 
-            String sysDvCd = RealmContextHolder.getSysDvCdRealm();
             String expireChk = request.getParameter("expire");
             String tokenExpireCookie = CookieUtils.getCookieValue("token_expire", request);
 
             //사용자이면서 ACT가 없는데 tokenExpire는 있을 경우
             //로그인된 사용자지만 엑세스 토큰이 만료되어 다시 재발급 받아야 하는 대상
-            //expire값은 루프 요청 방지
-            if("01".equals(sysDvCd) && !StringUtils.hasText(accessToken) && StringUtils.hasText(tokenExpireCookie) && !"p".equals(expireChk)){
+            //인증 진입점은 만료 쿠키가 남아 있어도 갱신 대상으로 보내지 않는다.
+            //쿠키 삭제가 지연되거나 이전 경로의 쿠키가 남아도 로그인 화면까지는 항상 도달해야 한다.
+            if(!isAuthenticationEndpoint(requestUri, realm)
+                    && !StringUtils.hasText(accessToken)
+                    && StringUtils.hasText(tokenExpireCookie)
+                    && !"p".equals(expireChk)){
                 response.sendRedirect("/"+realm+"/tokens/refresh?redirect_uri=%s&expire=%s".formatted(URLEncoder.encode(UrlExtractor.getOriginalURL(request), StandardCharset.UTF_8), "p"));
                 return;
 
@@ -66,7 +69,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
 
             // accessToken이 있고 refresh Token 요청이 아닌경우
-            if (StringUtils.hasText(accessToken) && !requestUri.contains("/tokens/refresh")) {
+            if (StringUtils.hasText(accessToken) && !isAuthenticationEndpoint(requestUri, realm)) {
                 UserDetails userDetails = customUserDetailService.loadUserByUsername(accessToken);
                 if (userDetails != null) {
                     log.debug("user details: {}", userDetails);
@@ -92,6 +95,15 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     }
 
+    private boolean isAuthenticationEndpoint(String requestUri, String realm) {
+        String realmPath = "/" + realm;
+
+        return requestUri.equals(realmPath)
+                || requestUri.startsWith(realmPath + "/login")
+                || requestUri.equals(realmPath + "/logout")
+                || requestUri.startsWith(realmPath + "/tokens/refresh");
+    }
+
 
 
     private String extractToken(HttpServletRequest request) {

src/main/java/com/wb/domainserver/util/CookieUtils.java

@@ -44,9 +44,12 @@ public abstract class CookieUtils {
         Cookie cookie = new Cookie(name, null);
         cookie.setMaxAge(0);
         cookie.setPath(path);
-        cookie.setDomain(originHost);
+        setCookieDomain(cookie, request, originHost);
         cookie.setHttpOnly(true);
         response.addCookie(cookie);
+
+        // loc 환경에서는 이전에 상위 도메인으로 저장된 쿠키도 함께 삭제한다.
+        deleteLegacyDomainCookie(name, path, request, response, originHost);
     }
 
     public static void createCookie(String name, String value, String path, int maxAge, boolean httpOnly, HttpServletRequest request, HttpServletResponse response) {
@@ -58,10 +61,12 @@ public abstract class CookieUtils {
 
         String originHost = UrlExtractor.getOriginalHost(host);
 
+        deleteLegacyDomainCookie(name, path, request, response, originHost);
+
         Cookie cookie = new Cookie(name, value);
         cookie.setMaxAge(maxAge);
         cookie.setPath(path);
-        cookie.setDomain(originHost);
+        setCookieDomain(cookie, request, originHost);
         cookie.setHttpOnly(httpOnly);
         response.addCookie(cookie);
     }
@@ -77,7 +82,7 @@ public abstract class CookieUtils {
 
            Cookie cookie = new Cookie(name, value);
            cookie.setPath(path);
-           cookie.setDomain(originHost);
+           setCookieDomain(cookie, request, originHost);
            cookie.setHttpOnly(httpOnly);
            response.addCookie(cookie);
        }
@@ -96,4 +101,30 @@ public abstract class CookieUtils {
         return Map.of("ACTPath", ACTPath, "RFTPath", RFTPath);
     }
 
+    private static void setCookieDomain(Cookie cookie, HttpServletRequest request, String domain) {
+        if (!request.getServerName().startsWith("loc.")) {
+            cookie.setDomain(domain);
+        }
+    }
+
+    private static void deleteLegacyDomainCookie(String name, String path, HttpServletRequest request, HttpServletResponse response, String domain) {
+        if (request.getServerName().startsWith("loc.")) {
+            addDomainDeleteCookie(name, path, domain, response);
+
+            int firstDot = domain.indexOf('.');
+            if (firstDot > 0) {
+                addDomainDeleteCookie(name, path, domain.substring(firstDot + 1), response);
+            }
+        }
+    }
+
+    private static void addDomainDeleteCookie(String name, String path, String domain, HttpServletResponse response) {
+        Cookie domainCookie = new Cookie(name, null);
+        domainCookie.setMaxAge(0);
+        domainCookie.setPath(path);
+        domainCookie.setDomain(domain);
+        domainCookie.setHttpOnly(true);
+        response.addCookie(domainCookie);
+    }
+
 }

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

@@ -310,8 +310,13 @@ public class FileStorageService {
 				if(image != null) {
 					thumbnail = image.getScaledInstance(destWidth, destHeight, Image.SCALE_SMOOTH);
 				}
-				BufferedImage convertImage = new BufferedImage(destWidth, destHeight, BufferedImage.TYPE_INT_RGB);
-				convertImage.getGraphics().drawImage(thumbnail, posX, posY, null);
+				BufferedImage convertImage = new BufferedImage(destWidth, destHeight, getImageType(image, file.getOriginalFilename()));
+				Graphics graphics = convertImage.getGraphics();
+				try {
+					graphics.drawImage(thumbnail, posX, posY, null);
+				} finally {
+					graphics.dispose();
+				}
 
 				String ext = FilenameUtils.getExtension(file.getOriginalFilename());
 				ImageIO.write(convertImage, ext, os);
@@ -376,8 +381,13 @@ public class FileStorageService {
 				if(image != null) {
 					thumbnail = image.getScaledInstance(destWidth, destHeight, Image.SCALE_SMOOTH);
 				}
-				BufferedImage convertImage = new BufferedImage(thumbnailWidth, thumbnailHeight, BufferedImage.TYPE_INT_RGB);
-				convertImage.getGraphics().drawImage(thumbnail, posX, posY, null);
+				BufferedImage convertImage = new BufferedImage(thumbnailWidth, thumbnailHeight, getImageType(image, file.getOriginalFilename()));
+				Graphics graphics = convertImage.getGraphics();
+				try {
+					graphics.drawImage(thumbnail, posX, posY, null);
+				} finally {
+					graphics.dispose();
+				}
 
 				ImageIO.write(convertImage, ext, os);
 			}catch (WnbtRestException wre){
@@ -407,6 +417,14 @@ public class FileStorageService {
 		return thumbnail_file;
 	}
 
+	private int getImageType(BufferedImage image, String originalFileName) {
+		String ext = FilenameUtils.getExtension(originalFileName).toLowerCase(Locale.ROOT);
+		boolean supportsAlpha = "png".equals(ext) || "gif".equals(ext);
+		return image != null && image.getColorModel().hasAlpha() && supportsAlpha
+				? BufferedImage.TYPE_INT_ARGB
+				: BufferedImage.TYPE_INT_RGB;
+	}
+
 
 	/**
 	 * combineFilePath 에 지정된 경로에 저장이 됨
@@ -715,4 +733,4 @@ public class FileStorageService {
 		return rtnStr;
 	}
 
-}
+}

src/main/resources/application-dev.yml

@@ -58,7 +58,7 @@ spring:
     gcone:
       hikari:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        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
+        jdbc-url: jdbc:mysql://115.68.231.30:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false
         username: sakeone
         password: dnlfxjtm13@$
         minimumIdle: 1
@@ -66,11 +66,11 @@ spring:
         idleTimeout: 30000    #30초
         maxLifetime: 1800000  #30분
         connectionTimeout: 30000
-        poolName: gconedDevPool
+        poolName: SakeDevPool
     sure:
       hikari:
         driver-class-name: com.mysql.cj.jdbc.Driver
-        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
+        jdbc-url: jdbc:mysql://115.68.231.30:3306/sake?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul&autoReconnect=true&allowMultiQueries=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=yes&verifyServerCertificate=false
         username: sakeone
         password: dnlfxjtm13@$
         minimumIdle: 1
@@ -85,7 +85,7 @@ spring:
     show-sql: true
   servlet:
     multipart:
-      max-file-size: 10MB
+      max-file-size: 15MB
       max-request-size: -1
 
 mybatis:
@@ -111,7 +111,7 @@ sopmalfo:
         rtrn: /data/gcone/rtrnFile
       extensions:
         images: .gif,.jpg,.jpeg,.png
-      cdnurl: http://dev.img.soju1sake1.com
+      cdnurl: https://19d28cf7178139ad.kinxzone.com
 
 
 pagination:
@@ -353,11 +353,11 @@ mngrfo:
     fileupload:
       uploaddirs:
         goods: C:/file/temp
-        doc: /docFile
-        web: /webFile
+        doc: /data/gcone/docFile
+        web: /data/gcone/webFile
       extensions:
         images: .gif,.jpg,.jpeg,.png
-      cdnurl: http://dev.img.soju1sake1.com
+      cdnurl: https://19d28cf7178139ad.kinxzone.com
     subsvc:
       dft-goods-optn-innb: 5
 
@@ -365,9 +365,12 @@ mngrfo:
 secret:
   key: 1df5be2f7e90ae36
 
+aciexpress:
+  apikey: DC94F29AFD5399F54AAE7FAA46045B65
+
 
 host:
-  img: http://dev.img.soju1sake1.com
+  img: https://19d28cf7178139ad.kinxzone.com
 
 naverpay:
   order:
@@ -380,7 +383,7 @@ naverpay:
     real-url: https://pay.naver.com
 
 mail:
-  host: mail.sake1jan.com
+  host: 10.2.1.76
   port: 587
   username: custom@sake1jan.com
   password: mail13@$
@@ -420,7 +423,7 @@ bankda:
 css-cours : css/theme/themeAF.css
 
 #선물하기 URL
-presenturl : dev.svc.soju1sake1.com
+presenturl : devsvc.soju1sake1.com
 
 # 출고 택배사 구분 EXPORT, (택배사 구분코드 HDRYCPN)
 # 송장번호 %INVCNB% 치환
@@ -449,6 +452,6 @@ api:
   DATA_ENCRYPT_AES_KEY: "Z8zKbHyMKn+iwD3O0PLT9g=="
 
 currency-unit:
-  default: 円(엔)
-  JP: 円(엔)
+  default: 円
+  JP: 円
   KR: 원