fix : FAQ 카테고리 버튼 폰트 사이즈 조정 (15px → 14px)

(cherry picked from commit 893a208c82)

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

@@ -9,7 +9,6 @@ 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 +80,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);

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

@@ -437,39 +437,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 +496,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()))

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

@@ -978,9 +978,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 +1055,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())) {/*공지 제외 검색 조건*/

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;
     /** 가용재고수량 */

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

@@ -1837,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(){{
@@ -1925,7 +1927,7 @@ public class BOPurchsService {
                             if (dlvylc.get("dlvyAmt") != null) {
                                 dlvyAmtBydlvylc = dlvyAmtBydlvylc + castAmt(dlvylc, "dlvyAmt");
                             } else {
-                                dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd);
+                                dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
 
                                 if (!CollectionUtils.isEmpty(dlvyAmtMap)) {
                                     dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue();
@@ -1950,7 +1952,7 @@ public class BOPurchsService {
                         if (dlvylcMap.get("dlvyAmt") != null) {
                             dlvyAmtBydlvylc = dlvyAmtBydlvylc + castAmt(dlvylcMap, "dlvyAmt");
                         } else {
-                            dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd);
+                            dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
 
                             if (!CollectionUtils.isEmpty(dlvyAmtMap)) {
                                 dlvyAmtBydlvylc = ((BigDecimal) dlvyAmtMap.get("dlvyAmt")).intValue();
@@ -1961,7 +1963,7 @@ public class BOPurchsService {
                     dlvyAmt = new BigDecimal(dlvyAmtBydlvylc);
                 }
             } else {
-                dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd, prefcd);
+                dlvyAmtMap = getDlvyAmt(goodsList, sopmalCd, defaultAdressAt, dlvylcAreaCd);
 
                 if (!CollectionUtils.isEmpty(dlvyAmtMap)) {
                     dlvyAmt = (BigDecimal) dlvyAmtMap.get("dlvyAmt");
@@ -2107,7 +2109,7 @@ public class BOPurchsService {
      * @param goodsList
      * @return List<DataMap>
      */
-    public DataMap getDlvyAmt(List<LinkedHashMap> goodsList, String sopmalCd, String defaultAdressAt, String dlvylcAreaCd, String prefcd) {
+    public DataMap getDlvyAmt(List<LinkedHashMap> goodsList, String sopmalCd, String defaultAdressAt, String dlvylcAreaCd) {
         DataMap dlvyAmtMap = null;
         log.debug("우편번호 확인 : {}", defaultAdressAt);
         log.debug("getDlvyAmt-goodsList : {}", goodsList);
@@ -2213,7 +2215,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);
                                 }
 //                                else {
@@ -2227,7 +2229,7 @@ public class BOPurchsService {
 //                                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 {
@@ -2296,15 +2298,16 @@ public class BOPurchsService {
 
                             BigDecimal goodsQy = new BigDecimal(0);
 
-                            for (DataMap goodsMap : goodsByDlvyGroupList) {
+                            // 수량 조건
+                            if ("Y".equals(cntCndUseAt) && cntCndAditAmt.compareTo(BigDecimal.ZERO) > 0) {
 
-                                BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량
+                                for (DataMap goodsMap : goodsByDlvyGroupList) {
 
-                                // 수량 조건
-                                if ("Y".equals(cntCndUseAt)) {
+                                    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);
                                         //배송비 합(같은상품 수량당 배송비 책정)
@@ -2328,17 +2331,19 @@ public class BOPurchsService {
                                             }
                                         }
                                     }
-                                } else {
-                                    //수량 조건 없는 경우
-                                    paidDlvyAmt = paidDlvyAmt.add(dlvyAmt); // 유료배송비 합
-                                    // 추가배송비 계산
-                                    if (!StringUtils.isEmpty(dlvyAreaAditAt) && "Y".equals(dlvyAreaAditAt)) {
-                                        if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
-                                            addPaidDlvyAmt = addPaidDlvyAmt.add(areaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
-                                        }
+                                }   //for
+                            } else {
+                                //수량 조건 없는 경우
+                                paidDlvyAmt = paidDlvyAmt.add(dlvyAmt); // 유료배송비 합
+
+                                // 추가배송비 계산
+                                if (!StringUtils.isEmpty(dlvyAreaAditAt) && "Y".equals(dlvyAreaAditAt)) {
+                                    if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
+                                        addPaidDlvyAmt = addPaidDlvyAmt.add(areaAditDlvyAmt); // 유료 배송 도서산간 추가 배송비
                                     }
                                 }
-                            }   //for
+                            }
+
                         } else {
                             dlvyAmt = new BigDecimal(0);
                             dftDlvyAmt = new BigDecimal(0);
@@ -2514,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);
                                 }
                             }
@@ -2523,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);
                                 }
                             }
@@ -2539,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/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/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.*;
 
@@ -237,6 +238,13 @@ public interface BOOrdrMapper {
      * @return List<LinkedHashMap>
      */
     public List<LinkedHashMap> selectExcelListByOrder(BOOrdrSrchVO ordrSrchVO);
+
+    /**
+     * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 > 엑셀다운로드 발주서
+     * @param ordrSrchVO
+     * @return List<LinkedHashMap>
+     */
+    public List<DataMap> selectExcelListPurchOrder(BOOrdrSrchVO ordrSrchVO);
     /* ####################################
        관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문 목록 조회 종료
        #################################### */
@@ -335,6 +343,8 @@ public interface BOOrdrMapper {
      */
     public List<DataMap> selectOrderShippingList(BOOrdrShippingVO ordrShippingVO);
 
+    public List<DataMap> selectOrderShippingListGrp(BOOrdrShippingVO ordrShippingVO);
+
     /**
      * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 상품 목록 조회
      * @param paramMap
@@ -349,6 +359,13 @@ public interface BOOrdrMapper {
      */
     public List<DataMap> selectRefundShippingGoodsList(DataMap paramMap);
 
+    /**
+     * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정 > 배송지정보 일치여부 확인
+     * @param ordrShippingVO
+     * @return Integer
+     */
+    public Integer selectDlvylcAreaCdInfo(BOOrdrShippingVO ordrShippingVO);
+
     /**
      * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정
      * @param ordrShippingVO
@@ -662,6 +679,8 @@ public interface BOOrdrMapper {
      */
     public DataMap selectBOSpbkGiftMultiDlvyAt(BOSpbkVO spbkVO);
 
+    public BigDecimal selectBuyRate(DataMap param);
+
     /**
      * 사용자 > 상품 > 장바구니 > 장바구니 상품 삭제
      * @param goodsVO
@@ -982,6 +1001,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

@@ -81,7 +81,9 @@ public class BODwldItmVO extends AbstractVO {
         item50("dlvy_amt_setle_mth_nm", "배송비결제방식"),
         item51("ordr_ty_nm", "주문유형"),
         item52("optn_cd_1", "상품코드"),
-        item53("dlvy_mssage_cn", "배송메시지");
+        item53("dlvy_mssage_cn", "배송메시지"),
+        item54("shipping_sttus_nm", "출고상태"),
+        item55("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,9 @@ public class BOOrdrShippingVO extends AbstractVO {
     /** 받는자휴대폰번호 */
     private String recpntMbtlnb;
 
+    /** 배송지역코드 */
+    private String dlvylcAreaCd;
+
     /** 배송지우편번호 */
     private String dlvylcZip;
 

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

@@ -105,4 +105,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,291 @@ 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();
+		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,57 @@ 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");
+									}
+
+									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 +1292,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 +1377,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 +1546,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/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/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

@@ -28,28 +28,48 @@ import lombok.EqualsAndHashCode;
 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/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/ordrmngr/controller/OrdrmngrController.java

@@ -48,6 +48,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.io.IOException;
 import java.math.BigInteger;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -622,6 +626,136 @@ public class OrdrmngrController {
         }
     }
 
+    /**
+     * 발주서 엑셀다운로드
+     * @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) {
+        ordrSrchVO.setSopmalCd(authSopmalCd);
+
+        //엑셀 항목별 제목에 출력될 내용 설정
+        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));
+        }
+
+        //엑셀 항목에 출력될 내용 설정
+        List<DataMap> resultList = service.selectExcelListPurchOrder(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 encodedFileName = URLEncoder.encode(excelFileName, StandardCharsets.UTF_8.toString()).replaceAll("\\+", "%20");
+            ExcelDownloadUtil.createExcel(encodedFileName, headerMap, excelList, response);
+        } catch (IOException ioe) {
+            log.error("엑셀다운로드 중 오류가 발생하였습니다.", ioe);
+            throw new WnbtRestException("엑셀다운로드 중 오류가 발생하였습니다.");
+        }
+    }
+
     /**
      * 주문내역서 팝업 화면 이동
      * @param model

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/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/main/controller/MainController.java

@@ -1015,4 +1015,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

@@ -132,6 +132,143 @@ public class MyActController {
 		
 	    return Util.getDeviceType(request)+"/mpage/act/MyGoodsQaR";
 	}
+
+	/**
+	 * 일반문의 조회
+	 * @param bbsctt
+	 * @return String
+	 */
+	@Policy(AuthPolicy.PUBLIC)
+	@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);
+//		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/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에 쇼핑몰코드, 해당 게시판 set
+		bbsVO.setSopmalCd(bbsctt.getSopmalCd());
+		bbsVO.setBbsId(bbsctt.getBbsId());
+		bbsVO.setBbsTyCd(bbsctt.getBbsTyCd());
+		DataMap bbsInfo = new DataMap();
+		bbsInfo = bbsService.selectBOBbsSetupInfo(bbsVO);
+
+		// 게시글 상세 조회
+		Map<String, Object> bbscttInfo = new HashMap<String, Object>();
+		bbscttInfo = service.selectBOBbscttUpdt(bbsctt);
+
+		// 분류 조회
+		List<DataMap> itmList = new ArrayList<>();
+		itmList = service.selectBOBbscttItmInqire(bbsctt);
+
+		//추가 항목 조회, 추가항목 항목 조회
+		Map<String, Object> qesitmList = new HashMap<String, Object>();
+		qesitmList = service.selectBOBbscttRegistPopupForm(bbsctt);
+
+		//리뷰항목 리스트, 리뷰항목 항목 리스트
+		Map<String, Object> rvwQesitmList = new HashMap<String, Object>();
+		rvwQesitmList = service.selectBOStarItm(bbsctt);
+
+		Map<String, Object> content = new HashMap<String, Object>();
+		content.put("bbsInfo", bbsInfo);
+		content.put("bbscttVO", bbsctt);
+		content.put("bbscttInfo", bbscttInfo);
+		content.put("itmList", itmList);
+		content.put("qesitmList", qesitmList);
+		content.put("rvwQesitmList", rvwQesitmList);
+
+		model.addAttribute("resultMap", content);
+//		responseHandler.handleResponse(
+//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttUpdtPopupForm",bbsctt),
+//				model,
+//				"resultMap"
+//		);
+		model.addAttribute("bbsctt", bbsctt);
+
+		// 마이페이지 > 상단 회원 정보 ( 등금, 이름, 마일리지, 쿠폰, 위시리스트, 배송중, 등급산정기준 )
+		Map<String, Object> content2 = selectBOMpageInfoInqire(vo);
+		model.addAttribute("mpageResultMap", content2);
+//		responseHandler.handleResponse(
+//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMpageInfoInqire",bbsctt),
+//				model,
+//				"mpageResultMap"
+//		);
+
+		return Util.getDeviceType(request)+"/mpage/act/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()
+		);
+//		return responseHandler.handleResponse(
+//				sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/bbs/gnrlbbsctt/selectBOBbscttListInqire",bbsctt),
+//				ReplyFromResrc::getReply
+//		);
+	}
+
     /**
      * 상품 Q&A ajax 조회
      * @param bbsctt

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

@@ -171,6 +171,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
@@ -208,10 +228,12 @@ public class MyOrdrController {
      */
     @Policy(AuthPolicy.RESTRICTED)
     @RequestMapping(value="/selectMbrSubsvcOrdrDtlInqire")
-    public String selectMbrSubsvcOrdrDtlInqire(HttpServletRequest request, ModelMap model, BOOrdrDlvyVO ordrDlvyVO, BOMbrVO vo) throws Exception {
+    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);
         /**발급대상구분코드*/
@@ -228,6 +250,13 @@ public class MyOrdrController {
 //        );
         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);
@@ -758,7 +787,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/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/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
 
@@ -367,7 +367,7 @@ secret:
 
 
 host:
-  img: http://dev.img.soju1sake1.com
+  img: https://19d28cf7178139ad.kinxzone.com
 
 naverpay:
   order:
@@ -380,7 +380,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 +420,7 @@ bankda:
 css-cours : css/theme/themeAF.css
 
 #선물하기 URL
-presenturl : dev.svc.soju1sake1.com
+presenturl : devsvc.soju1sake1.com
 
 # 출고 택배사 구분 EXPORT, (택배사 구분코드 HDRYCPN)
 # 송장번호 %INVCNB% 치환
@@ -449,6 +449,6 @@ api:
   DATA_ENCRYPT_AES_KEY: "Z8zKbHyMKn+iwD3O0PLT9g=="
 
 currency-unit:
-  default: 円(엔)
-  JP: 円(엔)
+  default: 円
+  JP: 円
   KR: 원

src/main/resources/application-local.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: https://19b0bde6dcdc15ad.kinxzone.com
+      cdnurl: https://19d28cf7178139ad.kinxzone.com
 
 
 pagination:
@@ -357,8 +357,8 @@ mngrfo:
         web: /data/gcone/webFile
       extensions:
         images: .gif,.jpg,.jpeg,.png
-      cdnurl: https://19b0bde6dcdc15ad.kinxzone.com
-      upurl: https://www.soju1sake1.com
+      cdnurl: https://19d28cf7178139ad.kinxzone.com
+    #      upurl: https://www.soju1sake1.com
     subsvc:
       dft-goods-optn-innb: 5
 
@@ -367,7 +367,7 @@ secret:
 
 
 host:
-  img: https://19b0bde6dcdc15ad.kinxzone.com/
+  img: https://19d28cf7178139ad.kinxzone.com
 
 naverpay:
   order:
@@ -380,7 +380,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 +420,7 @@ bankda:
 css-cours : css/theme/themeAF.css
 
 #선물하기 URL
-presenturl : dev.svc.gcone.co.kr
+presenturl : devsvc.soju1sake1.com
 
 # 출고 택배사 구분 EXPORT, (택배사 구분코드 HDRYCPN)
 # 송장번호 %INVCNB% 치환
@@ -449,6 +449,6 @@ api:
   DATA_ENCRYPT_AES_KEY: "Z8zKbHyMKn+iwD3O0PLT9g=="
 
 currency-unit:
-  default: 円(엔)
-  JP: 円(엔)
+  default: 円
+  JP: 円
   KR: 원

src/main/resources/application-stage.yml

@@ -85,7 +85,7 @@ spring:
     show-sql: true
   servlet:
     multipart:
-      max-file-size: 10MB
+      max-file-size: 15MB
       max-request-size: -1
 
 mybatis:
@@ -359,7 +359,7 @@ mngrfo:
         images: .gif,.jpg,.jpeg,.png
       cdnurl: https://19b0bde6dcdc15ad.kinxzone.com
     subsvc:
-      dft-goods-optn-innb: 5
+      dft-goods-optn-innb: 1
 
 
 secret:
@@ -449,6 +449,6 @@ api:
   DATA_ENCRYPT_AES_KEY: "Z8zKbHyMKn+iwD3O0PLT9g=="
 
 currency-unit:
-  default: 円(엔)
-  JP: 円(엔)
+  default: 円
+  JP: 円
   KR: 원

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

@@ -769,4 +769,122 @@
 		SELECT PURCHS_REVALID_AT FROM GC_SHOP WHERE 1=1 AND SOPMAL_CD = #{sopmalCd}
 	</select>
 
+	<!-- 구독서비스 주문 전 주문정보 재확인 -->
+	<select id="selectBOSubsvcPreOrderValidation" parameterType="com.wb.domainserver.domain.admin.instcSle.mtng.vo.BOPreOrderValidVO" resultType="dataMap">
+		<![CDATA[
+			SELECT
+				CASE
+					WHEN GOODS.SUBSVC_STTUS_CD = '01' THEN 0
+					ELSE 1
+				END AS GOODS_STTUS, -- 상품상태 정상 확인
+				CASE
+					WHEN GOODS.PURCHS_QY_LMTT_DV_CD = '01' OR GOODS.PURCHS_QY_LMTT_DV_CD IS NULL THEN 0
+					ELSE
+						CASE
+							WHEN #{goodsTotalQy} BETWEEN GOODS.MUMM_PURCHS_QY AND GOODS.MXMM_PURCHS_QY THEN 0
+							ELSE 1
+						END
+				END AS PURCHS_QY_LMTT, -- 상품별 최소 최대 구매수량제한여부
+				CASE
+					WHEN GOODS.INVNTRY_POLICY_CD = '02' THEN 0
+					ELSE
+						CASE
+							WHEN (GOODS.INVNTRY_QY - IFNULL(GOODS.USEFUL_INVNTRY_QY, 0)) >= #{qy} THEN 0
+						ELSE 1
+					END
+				END AS INVNTRY, -- 각 옵션별 재고 유무
+				CASE
+					WHEN GOODS.INVNTRY_POLICY_CD = '02' THEN 0
+					ELSE
+						CASE
+							WHEN (IFNULL(GOODS.REST_INVNTRY_QY, 0) - IFNULL(GOODS.AVLINV_LMTT_QY, 0)) >= #{goodsTotalQy} THEN 0
+						ELSE 1
+					END
+				END AS INVNTRY_POLICY, -- 상품별 옵션 수량합산 재고유무
+				CASE
+					WHEN IFNULL(GOODS.SUBSVC_CT, 0) = #{slepric} THEN 0
+					ELSE 1
+				END AS SELPRIC, -- 판매가 변경여부
+				0 AS DSCNT_AT, -- 구간,복수할인 정보 변경 여부
+				0 AS DLVY_GROUP, -- 배송그룹 변경여부
+				0 AS PURCHS_TRGTER_LMTT, -- 구매대상자 제한
+				0 AS COUPON_STTUS, -- 쿠폰 상태 확인
+				0 AS COUPON_USE_AT, -- 쿠폰 회수여부 확인
+				0 AS COUPON_VALIDPD_DT, -- 쿠폰 유효기간 확인
+				0 AS EVT_TRGET_AT, -- 이벤트 진행여부 이벤트 대상일경우 1을 반환함 = 정상 처리 0 이벤트 대상 아닐경우 1
+				0 AS DPLCT_LMTT_COUPON, -- 이벤트 중복제한 쿠폰 존재여부
+				0 AS OPTN_EXPSR_AT -- 상품옵션 노출여부
+			FROM (
+				SELECT
+					GS.SUBSVC_INNB, -- 구독서비스 고유번호
+					GG.GOODS_INNB, -- 상품 고유번호
+					GS.SOPMAL_CD, -- 쇼핑몰코드
+					GS.SUBSVC_CT, -- 구독료
+					GG.DLVY_GROUP_INNB, -- 배송그룹고유번호
+					GG.GOODS_KND_CD, -- 상품구분 01 상품
+					GS.SUBSVC_STTUS_CD, -- 상품상태 01 정상
+					GS.PURCHS_QY_LMTT_DV_CD, -- 구매수량제한여부 02 제한
+					GS.MUMM_PURCHS_QY, -- 최소구매수량
+					GS.MXMM_PURCHS_QY, -- 최대구매수량
+					GS.INVNTRY_POLICY_CD, -- 재고정책 01 재고가 있으면 판매 02 재고없어도 판매
+					GS.AVLINV_LMTT_QY, -- 가용재고제한수량
+					GG.PURCHS_TRGTER_LMTT_DV_CD, -- 구매 대상자 제한 02 제한
+					SUM(IFNULL(GS.INVNTRY_QY, 0)) AS INVNTRY_QY, -- 상품 재고수량 합계
+					SUM(IFNULL(GS.USEFUL_INVNTRY_QY, 0)) AS USEFUL_INVNTRY_QY, -- 상품 사용 재고수량 합계
+					SUM(IFNULL(GS.INVNTRY_QY, 0)) - SUM(IFNULL(GS.USEFUL_INVNTRY_QY, 0)) AS REST_INVNTRY_QY -- 잔여 재고수량 합계
+				FROM GC_SUBSVC GS
+				INNER JOIN GC_GOODS_OPTION GGO
+					 ON GS.SOPMAL_CD = GGO.SOPMAL_CD
+					AND GS.DFT_GOODS_OPTN_INNB = GGO.GOODS_OPTN_INNB
+					AND GS.USE_AT = 'Y'
+					AND GGO.USE_AT = 'Y'
+				INNER JOIN GC_GOODS GG
+					 ON GS.SOPMAL_CD = GG.SOPMAL_CD
+					AND GGO.GOODS_INNB = GG.GOODS_INNB
+					AND GG.USE_AT = 'Y'
+				WHERE 1 = 1
+				  AND GS.SOPMAL_CD = #{sopmalCd}
+				  AND GS.SUBSVC_INNB = #{subsvcInnb}
+				GROUP BY
+					GG.GOODS_INNB
+			) GOODS
+			LEFT JOIN (
+				SELECT
+					GM.MBR_INNB,
+					GM.MBR_DV_CD,
+					GMGM.SOPMAL_CD,
+					GMG.MBR_GRAD_INNB
+				FROM
+					GC_MEMBER GM
+				INNER JOIN GC_MEMBER_GRAD_MAPPING GMGM
+					 ON GM.MBR_INNB = GMGM.MBR_INNB
+					AND GM.MBR_DV_CD = GMGM.MBR_DV_CD
+					AND GM.USE_AT = 'Y'
+				INNER JOIN GC_MEMBER_GRAD GMG
+					 ON GMGM.MBR_GRAD_INNB = GMG.MBR_GRAD_INNB
+					AND GMGM.SOPMAL_CD = GMG.SOPMAL_CD
+					AND GMG.USE_AT = 'Y'
+				WHERE 1 = 1
+				  AND GMGM.SOPMAL_CD = #{sopmalCd}
+				  AND GM.MBR_INNB = #{mbrInnb}
+			) MBR
+			ON MBR.SOPMAL_CD = GOODS.SOPMAL_CD
+			WHERE 1 = 1
+			GROUP BY
+				GOODS_STTUS,
+				PURCHS_QY_LMTT,
+				INVNTRY,
+				INVNTRY_POLICY,
+				SELPRIC,
+				DSCNT_AT,
+				DLVY_GROUP,
+				PURCHS_TRGTER_LMTT,
+				COUPON_STTUS,
+				COUPON_USE_AT,
+				COUPON_VALIDPD_DT,
+				EVT_TRGET_AT,
+				DPLCT_LMTT_COUPON
+		]]>
+	</select>
+
 </mapper>

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

@@ -947,6 +947,37 @@
 				SOPMAL_CD = #{sopmalCd}
 	</update>
 
+	<!-- 쇼핑몰 환율 설정 수정 -->
+	<update id="updateBOExchngrtSetup" parameterType="com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO" >
+		UPDATE
+			GC_SHOP
+		SET BUY_RATE	= #{buyRate},
+			SELL_RATE	= #{sellRate},
+			UPDUSR		= #{updusr},
+			UPDT_DT		= SYSDATE()
+		WHERE
+			1=1
+		AND
+			SOPMAL_CD = #{sopmalCd}
+	</update>
+
+	<!-- 쇼핑몰 안내문구 설정 수정 -->
+	<update id="updateBOGuidanceSetup" parameterType="com.wb.domainserver.domain.admin.store.sopmal.vo.BOMaSopmalVO" >
+		UPDATE
+			GC_SHOP
+		SET JOIN_GUIDANCE_SJ		= #{joinGuidanceSj},
+			JOIN_GUIDANCE_WORDS		= #{joinGuidanceWords},
+			JOIN_BNEF				= #{joinBnef},
+			JOIN_COMPT_WORDS		= #{joinComptWords},
+			SUBSVC_GUIDANCE_WORDS	= #{subsvcGuidanceWords},
+			UPDUSR					= #{updusr},
+			UPDT_DT					= SYSDATE()
+		WHERE
+			1=1
+		AND
+			SOPMAL_CD = #{sopmalCd}
+	</update>
+
  	<!-- 쇼핑몰 사업자 정보 삭제 -->
     <delete id="deteteBOShopCompany" parameterType="com.wb.domainserver.domain.admin.sys.author.vo.BOMaAuthorVO">
 

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

@@ -224,6 +224,7 @@
 		AND (FB.NTC_AT = 'N' OR (FB.NTC_AT = 'Y' AND FB.NTC_PD_SETUP_AT = 'N'))
 		<if test = "@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(serverDv, 'sopmal')">
 			<include refid="selectSopmalNtceWhere"/>
+			AND FB.USE_AT = 'Y'
 		</if>
 		AND FB.SOPMAL_CD = #{sopmalCd}
 		AND FB.BBS_ID = #{bbsId}
@@ -460,6 +461,7 @@
 				</if>
 				<if test = "@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(serverDv, 'sopmal')">
 					<include refid="selectSopmalNtceWhere"/>
+					AND FB.USE_AT = 'Y'
 				</if>
 			    AND FB.DEPTH = 0
 				AND FB.SOPMAL_CD = #{sopmalCd}

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

@@ -503,6 +503,7 @@
             FG.REPRSNT_GOODS_CD,
             FG.BRAND_CD,
             FG.GOODS_NM,
+            FG.GOODS_NM_EN,
             FG.TAX_AT,
             FG.GOODS_STTUS_CD,
             FG.SEL_STPGE_CUSTOM_WORDS_AT,
@@ -1944,6 +1945,8 @@
              ,GROUP_CONCAT(CASE WHEN IFNULL(FGO.OPTN_CD_4, '') = '' THEN ' ' ELSE FGO.OPTN_CD_4 END ORDER BY FGO.OPTN_ORDR ASC SEPARATOR '|') AS OPTN_CD_4  -- 옵션코드 1
              ,GROUP_CONCAT( CASE WHEN IFNULL(FGO.OPTN_INFO, '') = '' THEN ' ' ELSE FGO.OPTN_INFO END ORDER BY FGO.OPTN_ORDR ASC SEPARATOR '|') AS OPTN_INFO  -- 옵션정보
              ,GROUP_CONCAT(FGO.MLG_POLICY_CD ORDER BY FGO.OPTN_ORDR ASC SEPARATOR '|') AS MLG_POLICY_CD  -- 마일리지정책코드
+             ,GROUP_CONCAT(FGO.HSCODE ORDER BY FGO.OPTN_ORDR ASC SEPARATOR '|') AS HSCODE  -- HS Code
+             ,GROUP_CONCAT(FGO.REAL_WT ORDER BY FGO.OPTN_ORDR ASC SEPARATOR '|') AS REAL_WT  -- 실무게(KG)
              ,GROUP_CONCAT(FGO.INVNTRY_QY ORDER BY FGO.OPTN_ORDR ASC SEPARATOR '|') AS INVNTRY_QY  -- 재고수량
              ,GROUP_CONCAT(CASE WHEN FG.INVNTRY_POLICY_CD = '01' THEN FGO.INVNTRY_QY - IFNULL(FGO.USEFUL_INVNTRY_QY, 0) ELSE FGO.INVNTRY_QY END ORDER BY FGO.OPTN_ORDR ASC  SEPARATOR '|') AS USEFUL_INVNTRY  -- 가용재고수량
              ,GROUP_CONCAT(ROUND(IFNULL(FGO.USEFUL_INVNTRY_QY, 0), 0) ORDER BY FGO.OPTN_ORDR ASC SEPARATOR '|') AS USEFUL_INVNTRY_QY -- 판매재고수량
@@ -2011,6 +2014,7 @@
         GOODS_CD,
         REPRSNT_GOODS_CD,
         GOODS_NM,
+        GOODS_NM_EN,
         TAX_AT,
         GOODS_STTUS_CD,
         SEL_STPGE_CUSTOM_WORDS_AT,
@@ -2079,6 +2083,7 @@
         #{goodsCd},
         #{reprsntGoodsCd},
         #{goodsNm},
+        #{goodsNmEn},
         #{taxAt},
         #{goodsSttusCd},
         #{selStpgeCustomWordsAt},
@@ -2188,6 +2193,7 @@
             GC_GOODS FG
         set
             GOODS_NM  = #{goodsNm} -- 상품명
+          , GOODS_NM_EN  = #{goodsNmEn} -- 상품명(영문)
           , SRT_DC = #{srtDc} -- 간략설명
           , REPRSNT_DC = #{reprsntDc} -- 대표설명
           , BRAND_CD = #{brandCd} -- 브랜드
@@ -2534,6 +2540,8 @@
         OPTN_CD_3,
         OPTN_CD_4,
         OPTN_INFO,
+        HSCODE,
+        REAL_WT,
         INVNTRY_QY,
         USEFUL_INVNTRY_QY,
         CNSMRPRIC,
@@ -2572,6 +2580,8 @@
                 #{optnCd3},
                 #{optnCd4},
                 #{optnInfo},
+                #{hscode},
+                #{realWt},
                 #{invntryQy},
                 #{usefulInvntryQy},
                 #{cnsmrpric},
@@ -2686,6 +2696,8 @@
             OPTN_CD_3                  = #{optnCd3},
             OPTN_CD_4                  = #{optnCd4},
             OPTN_INFO                  = #{optnInfo},
+            HSCODE                     = #{hscode},
+            REAL_WT                    = #{realWt},
             INVNTRY_QY                 = #{invntryQy},
             <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(usefulInvntryQy)">
             USEFUL_INVNTRY_QY          = #{usefulInvntryQy},

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

@@ -24,6 +24,8 @@
                            , ORDR_TY_CD
                            , RL_SETLE_AMT
                            , ENURI_AMT
+                           , WON_RL_SETLE_AMT
+                           , BUY_RATE
                            , ORDRR_NM
                            , ORDRR_TELNB
                            , ORDRR_MBTLNB
@@ -64,6 +66,10 @@
                            , RCIPT_NB
                            , SLE_EMPL_NM
                            , DWLD_COUPON_INNB
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(subsvcInnb)">
+                           , SUBSVC_INNB
+                           , SUBSVC_AT
+        </if>
                            , INDVDL_SETLE_SMS_CN
                            , INDVDL_SETLE_SMS_MBTLNB
                            , INDVDL_SETLE_SMS_AT
@@ -84,6 +90,8 @@
                            , #{ordrTyCd}
                            , #{rlSetleAmt}
                            , #{enuriAmt}
+                           , #{wonRlSetleAmt}
+                           , #{buyRate}
                            , #{ordrrNm}
                            , HEX(AES_ENCRYPT(REPLACE(#{ordrrTelnb}, '-', ''), '1df5be2f7e90ae36'))
                            , HEX(AES_ENCRYPT(REPLACE(#{ordrrMbtlnb}, '-', ''), '1df5be2f7e90ae36'))
@@ -128,6 +136,10 @@
                            , #{rciptNb}
                            , #{sleEmplNm}
                            , #{dwldCouponInnb}
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(subsvcInnb)">
+                           , #{subsvcInnb}
+                           , 'Y'
+        </if>
                            , #{indvdlSetleSmsCn}
                            , HEX(AES_ENCRYPT(REPLACE(#{indvdlSetleSmsMbtlnb}, '-', ''), '1df5be2f7e90ae36'))
                            , #{indvdlSetleSmsAt}
@@ -190,6 +202,7 @@
                                 , GOODS_INNB
                                 , GOODS_IMG_COURS
                                 , GOODS_NM
+                                , GOODS_NM_EN
                                 , SUBSCRPT_WTHDRAW_POSBL_AT
                                 , INDVDLZ_CANCL_POSBL_AT
                                 , INDVDLZ_DLIVY_POSBL_AT
@@ -204,6 +217,7 @@
                                 , #{goodsInnb}
                                 , #{goodsImgCours}
                                 , #{goodsNm}
+                                , #{goodsNmEn}
                                 , #{subscrptWthdrawPosblAt}
                                 , #{indvdlzCanclPosblAt}
                                 , #{indvdlzDlivyPosblAt}
@@ -293,6 +307,10 @@
                                        , STEP85
                                        , COMPNB_DSCNT_AT
                                        , SCTN_DSCNT_AT
+                                       , HSCODE
+                                       , REAL_WT
+                                       , VOL_WT
+                                       , PACKAGE_CNT
                                        , PURCHS_DCSN_AT
                                        , PURCHS_DCSN_QY
                                        , RETURN_DLVY_APPLC_AT
@@ -322,8 +340,8 @@
                                        , #{relateOrdrGoodsOptnInnb}
                                        , #{ordrQy}
                                        , #{mlgAccmlCn}
-                                       ,SP.MLG_VALID_PD
-                                       ,SP.MLG_VALID_PD_AT
+                                       , SP.MLG_VALID_PD
+                                       , SP.MLG_VALID_PD_AT
                                        , #{npayGoodsOrdrnb}
                                        , #{npayBundleDlvyNb}
                                        , #{posGoodsCd}
@@ -356,8 +374,12 @@
                                        , #{step65}
                                        , #{step75}
                                        , #{step85}
-                                       ,GI.COMPNB_DSCNT_AT
-                                       ,GI.SCTN_DSCNT_AT
+                                       , GI.COMPNB_DSCNT_AT
+                                       , GI.SCTN_DSCNT_AT
+                                       , #{hscode}
+                                       , #{realWt}
+                                       , #{volWt}
+                                       , #{packageCnt}
                                        , 'N'
                                        , 0
                                        , SG.RETURN_DLVY_APPLC_AT
@@ -386,7 +408,10 @@
                                     , ORDR_STTUS_CD
                                     , RECPNT_NM
                                     , RECPNT_MBTLNB
+                                    , DLVYLC_AREA_CD
+                                    , CSTMCLER_CD
                                     , DLVYLC_ZIP
+                                    , PREFCD
                                     , DLVYLC_ADRES_DV_CD
                                     , DLVYLC_LNB_ADRES
                                     , DLVYLC_RNM_ADRES
@@ -422,7 +447,10 @@
                                     , #{ordrSttusCd}
                                     , #{recpntNm}
                                     , HEX(AES_ENCRYPT(REPLACE(#{recpntMbtlnb}, '-', ''), '1df5be2f7e90ae36'))
+                                    , #{dlvylcAreaCd}
+                                    , #{cstmclerCd}
                                     , #{dlvylcZip}
+                                    , #{prefcd}
                                     , #{dlvylcAdresDvCd}
                                     , #{dlvylcLnbAdres}
                                     , #{dlvylcRnmAdres}
@@ -461,6 +489,7 @@
                                  , SOPMAL_CD
                                  , ORDR_INNB
                                  , SETLE_AMT
+                                 , WON_SETLE_AMT
                                  , PG_CMPNY_NM
                                  , SETLE_TY_CD
                                  , PG_INNB
@@ -485,6 +514,7 @@
                                  , #{sopmalCd}
                                  , #{ordrInnb}
                                  , #{setleAmt}
+                                 , #{wonSetleAmt}
                                  , #{pgCmpnyNm}
                                  , #{setleTyCd}
                                  , #{pgInnb}
@@ -1280,6 +1310,7 @@ FROM (
                     ELSE FDA.LNB_ADRES
                END ADRES
              , FDA.DTL_ADRES
+             , FDA.CSTMCLER_CD
           FROM GC_DELIVERY_ADDRESS FDA
          WHERE FDA.MBR_INNB = #{mbrInnb}
            AND FDA.MBR_DV_CD = #{mbrDvCd}
@@ -1478,6 +1509,7 @@ FROM (
         SELECT FG.SOPMAL_CD
              , FG.GOODS_INNB
              , FG.GOODS_NM
+             , FG.GOODS_NM_EN
              , FG.GOODS_KND_CD
              , FG.GOODS_STTUS_CD
              , FN_GET_COMMCODE_NAME('GOODS_STTUS', FG.GOODS_STTUS_CD) AS GOODS_STTUS_NM
@@ -1488,9 +1520,9 @@ FROM (
              , FORMAT(IFNULL(FGO.CNSMRPRIC, 0), 0) AS CNSMRPRIC
              , FORMAT(IFNULL(FGO.SLEPRIC, 0), 0) AS SLEPRIC
              , CONCAT(OPTN1, IF(FGO.OPTN2 IS NULL , '', CONCAT('/', OPTN2))
-            , IF(FGO.OPTN3 IS NULL , '', CONCAT('/', OPTN3))
-            , IF(FGO.OPTN4 IS NULL , '', CONCAT('/', OPTN4))) AS OPTN
-             ,IMG.IMG AS GOODS_IMG_COURS
+             , IF(FGO.OPTN3 IS NULL , '', CONCAT('/', OPTN3))
+             , IF(FGO.OPTN4 IS NULL , '', CONCAT('/', OPTN4))) AS OPTN
+             , IMG.IMG AS GOODS_IMG_COURS
              , (
             SELECT FGI.IMG AS GOODS_IMG
             FROM GC_GOODS_IMAGE FGI
@@ -1536,17 +1568,17 @@ FROM (
                  , FGO.CNSMRPRIC
                  , FGO.SLEPRIC
                  , CASE WHEN FGO.OPTN_NM_1 != '' AND FGO.OPTN_VAL_1 != ''
-                           THEN CONCAT(FGO.OPTN_NM_1,':',FGO.OPTN_VAL_1)
-                      END OPTN1
-                    , CASE WHEN FGO.OPTN_NM_2 != '' AND FGO.OPTN_VAL_2 != ''
-                           THEN CONCAT(FGO.OPTN_NM_2,':',FGO.OPTN_VAL_2)
-                      END OPTN2
-                    , CASE WHEN FGO.OPTN_NM_3 != '' AND FGO.OPTN_VAL_3 != ''
-                           THEN CONCAT(FGO.OPTN_NM_3,':',FGO.OPTN_VAL_3)
-                      END OPTN3
-                    , CASE WHEN FGO.OPTN_NM_4 != '' AND FGO.OPTN_VAL_4 != ''
-                           THEN CONCAT(FGO.OPTN_NM_4,':',FGO.OPTN_VAL_4)
-                      END OPTN4
+                    THEN CONCAT(FGO.OPTN_NM_1,':',FGO.OPTN_VAL_1)
+                 END OPTN1
+                 , CASE WHEN FGO.OPTN_NM_2 != '' AND FGO.OPTN_VAL_2 != ''
+                    THEN CONCAT(FGO.OPTN_NM_2,':',FGO.OPTN_VAL_2)
+                 END OPTN2
+                 , CASE WHEN FGO.OPTN_NM_3 != '' AND FGO.OPTN_VAL_3 != ''
+                    THEN CONCAT(FGO.OPTN_NM_3,':',FGO.OPTN_VAL_3)
+                 END OPTN3
+                 , CASE WHEN FGO.OPTN_NM_4 != '' AND FGO.OPTN_VAL_4 != ''
+                    THEN CONCAT(FGO.OPTN_NM_4,':',FGO.OPTN_VAL_4)
+                 END OPTN4
             FROM GC_GOODS_OPTION FGO
             WHERE FGO.OPTN_EXPSR_AT = 'Y'
               AND FGO.STDR_DV_AT = 'Y'
@@ -1918,6 +1950,10 @@ FROM (
              , FGO.OPTN_CD_2
              , FGO.OPTN_CD_3
              , FGO.OPTN_CD_4
+             , FGO.HSCODE
+             , FGO.REAL_WT
+             , FGO.VOL_WT
+             , FGO.PACKAGE_CNT
              , FGO.OPTN_INFO
              , FGO.OPTN_RELATE_NB
           FROM (
@@ -1953,6 +1989,10 @@ FROM (
                     , FGO.OPTN_CD_2
                     , FGO.OPTN_CD_3
                     , FGO.OPTN_CD_4
+                    , FGO.HSCODE
+                    , FGO.REAL_WT
+                    , FGO.VOL_WT
+                    , FGO.PACKAGE_CNT
                     , FGO.OPTN_INFO
                     , FGO.OPTN_RELATE_NB
                  FROM GC_GOODS_OPTION FGO
@@ -1979,11 +2019,16 @@ FROM (
                   ELSE FN_GET_COMMCODE_NAME('GOODS_STTUS', FG.GOODS_STTUS_CD)
               END AS GOODS_STTUS_NM
              , FG.GOODS_NM
+             , FG.GOODS_NM_EN
              , FGO.GOODS_OPTN_INNB
              , FGO.OPTN_TY
              , FGO.OPTN_RELATE_NB
              , FGO.COMPNB_DSCNT_AT
              , FGO.SCTN_DSCNT_AT
+             , FGO.HSCODE
+             , FGO.REAL_WT
+             , FGO.VOL_WT
+             , FGO.PACKAGE_CNT
              , NULLIF(FGO.OPTN_ESSNTL_AT, '') AS OPTN_ESSNTL_AT
              , FORMAT(IFNULL(FGO.CNSMRPRIC, 0) * #{qy}, 0) AS SUB_CNSMRPRIC_BY_FORMAT
              , IFNULL(FGO.CNSMRPRIC, 0) * #{qy}  AS SUB_CNSMRPRIC
@@ -2044,6 +2089,10 @@ FROM (
                     , FGO.OPTN_RELATE_NB
                     , FGO.COMPNB_DSCNT_AT
                     , FGO.SCTN_DSCNT_AT
+                    , HSCODE
+                    , REAL_WT
+                    , VOL_WT
+                    , PACKAGE_CNT
                  FROM GC_GOODS_OPTION FGO
                 WHERE FGO.GOODS_OPTN_INNB = #{goodsOptnInnb}
           ) FGO ON FGO.GOODS_INNB = FG.GOODS_INNB
@@ -2673,6 +2722,14 @@ FROM (
           AND FO.SOPMAL_CD = #{sopmalCd}
     </select>
 
+    <!-- 관리자 주문 > 실결제금액조회 -->
+    <select id="selectWonRlSetleAmt" parameterType="dataMap" resultType="String">
+        SELECT FLOOR (FO.WON_RL_SETLE_AMT) AS RL_SETLE_AMT
+        FROM GC_ORDER FO
+        WHERE FO.ORDR_INNB = #{ordrInnb}
+          AND FO.SOPMAL_CD = #{sopmalCd}
+    </select>
+
 
     <!-- 0원 상품 포함시 짜투리 업데이트 ( 장바구니, 마일리지, 애누리 ) -->
     <update id="updateOrdrItemOptnRestAmtUpdt">

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

@@ -8,8 +8,8 @@
 			resultType="dataMap">
 		<![CDATA[
 			SELECT GS.SUBSVC_INNB
-			     , SUBSVC_STTUS_CD
-			     , CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
+				 , SUBSVC_STTUS_CD
+				 , CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
 			FROM GC_SUBSVC GS
 			WHERE GS.SOPMAL_CD = 'SK'
 			  AND GS.SUBSVC_STTUS_CD != '03'
@@ -20,6 +20,7 @@
 					THEN NOW() BETWEEN GS.EXPSR_BGN_DT AND GS.EXPSR_END_DT
 					ELSE 1=1
 				END
+			  AND GS.USE_AT = 'Y'
 		]]>
 	</select>
 
@@ -33,7 +34,7 @@
 				 , GS.SUBSVC_NM
 				 , GS.SUB_PD					/*구독기간*/
 				 , GS.SUBSVC_GNR				/*기수*/
-			     , (SELECT MAX(A.SUBSVC_GNR) + 1 FROM GC_SUBSVC A WHERE A.SOPMAL_CD = GS.SOPMAL_CD AND A.SUBSVC_NM = GS.SUBSVC_NM) AS SUBSVC_NEXT_GNR		/*다음기수*/
+				 , (SELECT MAX(A.SUBSVC_GNR) + 1 FROM GC_SUBSVC A WHERE A.SOPMAL_CD = GS.SOPMAL_CD AND A.SUBSVC_NM = GS.SUBSVC_NM) AS SUBSVC_NEXT_GNR		/*다음기수*/
 				 , GS.SUBSVC_GNR_NM				/*기수명*/
 				 , CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
 				 , GS.DLVY_CNT					/*배송횟수*/
@@ -41,7 +42,7 @@
 				 , GS.SUBSVC_CT					/*구독료*/
 				 , GS.TME_DLVY_AMT				/*1회배송비*/
 				 , GS.CNSMRPRIC					/*소비자가*/
-				 , GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
+				 , GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SLEPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
 				 , ROUND((GS.CNSMRPRIC - (GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT))) / NULLIF(GS.CNSMRPRIC, 0) * 100, 0) AS DSCNT_RAITO
 				 , GS.INVNTRY_QY				/*재고수량*/
 				 , GS.USEFUL_INVNTRY_QY 		/*판매재고수량*/
@@ -60,6 +61,15 @@
 				 , GS.MBL_SUBSVC_DC_PC_SAME_AT	/*모바일 구독서비스 설명 PC동일여부*/
 				 , GS.LAST_PROCS_ODR			/*최종차수*/
 				 , GS.DFT_GOODS_OPTN_INNB	 	/*기본상품옵션고유번호*/
+				 , 1 AS QY	 					/*구독서비스 결제 수량*/
+		]]>
+			<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbrInnb)">
+				 , #{mbrInnb} AS mbrInnb	 	/*회원 고유번호*/
+			</if>
+			<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbrDvCd)">
+				, #{mbrDvCd} AS mbrDvCd	 		/*회원구분코드*/
+			</if>
+		<![CDATA[
 			FROM GC_SUBSVC GS
 			WHERE GS.SOPMAL_CD = #{sopmalCd}
 			  AND GS.SUBSVC_INNB = #{subsvcInnb}
@@ -74,60 +84,61 @@
 			, CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
 			FROM (
 				SELECT COUNT(*) OVER() AS TOT_CNT
-				, GC.SUBSVC_INNB
-				, GC.SOPMAL_CD
-				, GC.SUBSVC_NM
-				, GC.SUBSVC_GNR
-				, GC.SUBSVC_GNR_NM
-				, GC.DLVY_CNT
-				, GC.INVNTRY_QY
-				, GC.INVNTRY_QY - GC.USEFUL_INVNTRY_QY AS AVAIL_QT		/*가용제고*/
-				, GC.SUBSVC_STTUS_CD
-				, FN_GET_COMMCODE_NAME('GOODS_STTUS', GC.SUBSVC_STTUS_CD) AS SUBSVC_STTUS		/*구독서비스 상태*/
-				, FN_GET_COMMCODE_NAME('EXPSR_DV', GC.EXPSR_DV_CD) AS EXPSR_DV				/*노출구분*/
-				, GC.SUBSVC_CT			/*구독료*/
-				, GC.TME_DLVY_AMT		/*1회배송비*/
-				, GC.CNSMRPRIC			/*소비자가*/
-				, GC.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
-				, GC.IMG							/*섬네일 이미지*/
-				, GC.LAST_PROCS_ODR				/*최종차수*/
-				FROM GC_SUBSVC GC
-				WHERE GC.USE_AT = 'Y'
-				  AND GC.SOPMAL_CD = #{sopmalCd}
+				, GS.SUBSVC_INNB
+				, GS.SOPMAL_CD
+				, CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
+				, GS.SUBSVC_NM
+				, GS.SUBSVC_GNR
+				, GS.SUBSVC_GNR_NM
+				, GS.DLVY_CNT
+				, GS.INVNTRY_QY
+				, GS.INVNTRY_QY - GS.USEFUL_INVNTRY_QY AS AVAIL_QT		/*가용제고*/
+				, GS.SUBSVC_STTUS_CD
+				, FN_GET_COMMCODE_NAME('GOODS_STTUS', GS.SUBSVC_STTUS_CD) AS SUBSVC_STTUS		/*구독서비스 상태*/
+				, FN_GET_COMMCODE_NAME('EXPSR_DV', GS.EXPSR_DV_CD) AS EXPSR_DV				/*노출구분*/
+				, GS.SUBSVC_CT			/*구독료*/
+				, GS.TME_DLVY_AMT		/*1회배송비*/
+				, GS.CNSMRPRIC			/*소비자가*/
+				, GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
+				, GS.IMG							/*섬네일 이미지*/
+				, GS.LAST_PROCS_ODR				/*최종차수*/
+				FROM GC_SUBSVC GS
+				WHERE GS.USE_AT = 'Y'
+				  AND GS.SOPMAL_CD = #{sopmalCd}
 				<if test="srchSelSubsvcNm != null and srchSelSubsvcNm != ''">
-					AND GC.SUBSVC_NM = #{srchSelSubsvcNm}						/*구독서비스 명*/
+					AND GS.SUBSVC_NM = #{srchSelSubsvcNm}						/*구독서비스 명*/
 				</if>
 				<if test="srchSelSubsvcGnr != null and srchSelSubsvcGnr != ''">
-				AND GC.SUBSVC_GNR = #{srchSelSubsvcGnr}						/*기수*/
+				AND GS.SUBSVC_GNR = #{srchSelSubsvcGnr}						/*기수*/
 				</if>
 				<if test="srchSubsvcNm != null and srchSubsvcNm != ''">
-				AND GC.SUBSVC_NM LIKE CONCAT('%',#{srchSubsvcNm},'%')			/*구독서비스 명*/
+				AND GS.SUBSVC_NM LIKE CONCAT('%',#{srchSubsvcNm},'%')			/*구독서비스 명*/
 				</if>
 				<if test="srchSubsvcGnrNm != null and srchSubsvcGnrNm != ''">
-				AND GC.SUBSVC_GNR_NM LIKE CONCAT('%',#{srchSubsvcGnrNm},'%')	/*기수명*/
+				AND GS.SUBSVC_GNR_NM LIKE CONCAT('%',#{srchSubsvcGnrNm},'%')	/*기수명*/
 				</if>
 				<choose>
 					<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchArrSubsvcSttusCd)">
 						/*판매상태*/
-						AND GC.SUBSVC_STTUS_CD IN
+						AND GS.SUBSVC_STTUS_CD IN
 						<foreach collection="srchArrSubsvcSttusCd" item="subsvcSttusCd" open="(" close=")" separator=",">
 							#{subsvcSttusCd}
 						</foreach>
 					</when>
 				</choose>
 				<if test="srchExpsrDvCd != null and srchExpsrDvCd != ''">
-				AND GC.EXPSR_DV_CD = #{srchExpsrDvCd}						/*노출여부*/
+				AND GS.EXPSR_DV_CD = #{srchExpsrDvCd}						/*노출여부*/
 				</if>
 				ORDER BY
 				<choose>
-				    <when test="sortDv == 'subsvcGnrAsc'">
-						GC.SUBSVC_NM ASC, SUBSVC_GNR ASC,
+					<when test="sortDv == 'subsvcGnrAsc'">
+						GS.SUBSVC_NM ASC, SUBSVC_GNR ASC,
 					</when>
-				    <otherwise>
-						GC.SUBSVC_NM DESC, SUBSVC_GNR DESC,
+					<otherwise>
+						GS.SUBSVC_NM DESC, SUBSVC_GNR DESC,
 					</otherwise>
 				</choose>
-				GC.SUBSVC_INNB ASC
+				GS.SUBSVC_INNB ASC
 			) TB
 			WHERE (@ROWNUM:=0)=0
 		) PV
@@ -190,17 +201,20 @@
 		  , CNSMRPRIC = REPLACE(#{cnsmrpric},',','')
 		  , INVNTRY_QY = REPLACE(#{invntryQy},',','')
 		  , INVNTRY_POLICY_CD = #{invntryPolicyCd}
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(usefulInvntryQyInit, 'Y')">
+		  , USEFUL_INVNTRY_QY = 0
+		</if>
 		  , AVLINV_LMTT_QY = #{avlinvLmttQy}
 		  , SUBSVC_STTUS_CD = #{subsvcSttusCd}
 		  , EXPSR_DV_CD = #{expsrDvCd}
-		  <choose>
+		<choose>
 		  	<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(expsrBgnDt)">
 		  , EXPSR_BGN_DT = #{expsrBgnDt}
 			</when>
 		  	<otherwise>
 		  , EXPSR_BGN_DT = null
 			</otherwise>
-		  </choose>
+		</choose>
 		<choose>
 			<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(expsrEndDt)">
 		  , EXPSR_END_DT = #{expsrEndDt}
@@ -212,9 +226,9 @@
 		  , SUBSVC_DC = #{subsvcDc}
 		  , MBL_SUBSVC_DC = #{mblSubsvcDc}
 		  , MBL_SUBSVC_DC_PC_SAME_AT = #{mblSubsvcDcPcSameAt}
-		  <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(img)">
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(img)">
 		  , IMG = #{img}
-		  </if>
+		</if>
 		  , UPDUSR = #{updusr}
 		  , UPDT_DT = NOW()
 		WHERE SUBSVC_INNB = #{subsvcInnb}
@@ -248,7 +262,7 @@
 				  , USE_AT
 				  , REGUSR
 				  , REGIST_DT)
-		VALUES    (#{sopmalCd}
+		VALUES	(#{sopmalCd}
 				, #{subsvcNm}
 				, #{subPd}
 				, #{subsvcGnr}
@@ -298,4 +312,89 @@
 		WHERE GS.SOPMAL_CD = #{sopmalCd}
 		  AND GS.SUBSVC_NM = #{subsvcNm}
 	</select>
+	
+
+	<!-- 구독서비스 주문에 따른 판매재고수량 수정 -->
+	<update id="updateSubsvcOrdrUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC GS
+				INNER JOIN (
+					SELECT
+						GO.SUBSVC_INNB,
+						COUNT(*) AS ORDR_QY
+					FROM GC_ORDER GO
+					WHERE GO.SOPMAL_CD = #{sopmalCd}
+					  AND GO.ORDR_INNB = #{ordrInnb}
+					GROUP BY
+						GO.SUBSVC_INNB
+				) SUBQUERY
+				ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+			SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) + SUBQUERY.ORDR_QY
+			WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+		]]>
+	</update>
+
+	<!-- 구독서비스 환불에 따른 판매재고수량 수정 -->
+	<update id="updateSubsvcRefundUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC GS
+				INNER JOIN (
+					SELECT
+						GO.SUBSVC_INNB,
+						SUM(CASE WHEN GOR.REFUND_TY_CD = '01' THEN 1 ELSE 0 END) AS REFUND_QY
+					FROM GC_ORDER GO
+					INNER JOIN GC_ORDER_REFUND GOR
+					   ON GO.ORDR_INNB = GOR.ORDR_INNB
+					WHERE GO.SOPMAL_CD = #{sopmalCd}
+					  AND GO.ORDR_INNB = #{ordrInnb}
+					GROUP BY
+						GO.SUBSVC_INNB
+				) SUBQUERY
+				ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+			SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) - SUBQUERY.REFUND_QY
+			WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+		]]>
+	</update>
+
+	<!-- 구독서비스 주문무효에 따른 판매재고수량 수정 -->
+	<update id="updateSubsvcCancelOrderUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC GS
+				INNER JOIN (
+					SELECT
+						GO.SUBSVC_INNB,
+						COUNT(*) AS ORDR_QY
+					FROM GC_ORDER GO
+					WHERE GO.SOPMAL_CD = #{sopmalCd}
+					  AND GO.ORDR_INNB = #{ordrInnb}
+					GROUP BY
+						GO.SUBSVC_INNB
+				) SUBQUERY
+				ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+			SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) - SUBQUERY.ORDR_QY
+			WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+		]]>
+	</update>
+
+	<!-- 판매재고수량 변경에 따른 구독서비스 상태 수정 -->
+	<update id="updateInvntryPolicySubsvcSttusChng" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC
+			SET SUBSVC_STTUS_CD =
+				CASE
+					WHEN INVNTRY_POLICY_CD = '02' THEN SUBSVC_STTUS_CD
+					ELSE
+						CASE
+							WHEN (INVNTRY_QY - IFNULL(USEFUL_INVNTRY_QY, 0)) > IFNULL(AVLINV_LMTT_QY, 0)
+							 AND SUBSVC_STTUS_CD <> '03' THEN '01'
+							WHEN (INVNTRY_QY - IFNULL(USEFUL_INVNTRY_QY, 0)) <= IFNULL(AVLINV_LMTT_QY, 0)
+							 AND SUBSVC_STTUS_CD <> '03' THEN '02'
+							ELSE SUBSVC_STTUS_CD
+					END
+				END
+			WHERE SUBSVC_INNB = #{subsvcInnb}
+			  AND SOPMAL_CD = #{sopmalCd}
+			  AND USE_AT = 'Y'
+		]]>
+	</update>
 </mapper>

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

@@ -11,24 +11,44 @@
         AND FM.USE_AT = 'Y'
     	]]>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchMbrNm)">
-            <![CDATA[
-            AND FM.MBR_NM = #{srchMbrNm}
-    		]]>
+            <choose>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '0')">
+                    AND FM.MBR_NM LIKE CONCAT('%', #{srchMbrNm}, '%')
+                </when>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '1')">
+                    AND FM.MBR_NM = #{srchMbrNm}
+                </when>
+            </choose>
         </if>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchKywordID)">
-            <![CDATA[
-            AND FM.MBR_ID = #{srchKywordID}
-    		]]>
+            <choose>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '0')">
+                    AND FM.MBR_ID LIKE CONCAT('%', #{srchKywordID}, '%')
+                </when>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '1')">
+                    AND FM.MBR_ID = #{srchKywordID}
+                </when>
+            </choose>
         </if>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchKywordEmail)">
-            <![CDATA[
-            AND FM.EMAIL = (select HEX(AES_ENCRYPT(#{srchKywordEmail} , #{secretKey})))
-    		]]>
+            <choose>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '0')">
+                    AND AES_DECRYPT(UNHEX(FM.EMAIL), #{secretKey}) LIKE CONCAT('%', #{srchKywordEmail}, '%')
+                </when>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '1')">
+                    AND FM.EMAIL = (select HEX(AES_ENCRYPT(#{srchKywordEmail} , #{secretKey})))
+                </when>
+            </choose>
         </if>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchKywordMb)">
-            <![CDATA[
-            AND FM.MBTLNB =  (select HEX(AES_ENCRYPT(REPLACE(#{srchKywordMb},'-',''), #{secretKey})))
-    		]]>
+            <choose>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '0')">
+                    AND AES_DECRYPT(UNHEX(FM.MBTLNB), #{secretKey}) LIKE CONCAT('%', #{srchKywordMb}, '%')
+                </when>
+                <when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEquals(srchDv, '1')">
+                    AND FM.MBTLNB =  (select HEX(AES_ENCRYPT(REPLACE(#{srchKywordMb},'-',''), #{secretKey})))
+                </when>
+            </choose>
         </if>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(actionDv)">
             <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isEmpty(eventYn)">
@@ -744,6 +764,9 @@
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbrNm) and mbrNm != ''">
 			MBR_NM = #{mbrNm},
         </if>
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbtlnb)">
+            MBTLNB = HEX(AES_ENCRYPT(REPLACE(#{mbtlnb},'-',''), #{secretKey})),
+        </if>
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(zip) and zip != ''">
 			ZIP = #{zip},
 			ADRES_DV = #{adresDv},

src/main/resources/mybatis/xml/mapper/gcone/mbr/mlg/BOMlgMapper.xml

@@ -13,6 +13,7 @@
   	<sql id="mbrMlgWhere">
 	    <![CDATA[
 	    	WHERE 1=1
+			AND MLG.ACCMLMNY_AMT != 0
 	    ]]>
 	    <choose>
 			<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mbrInnb)">

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

@@ -683,6 +683,7 @@
 										,FMG.MBR_GRAD_NM -- 회원 등급명
 									    ,IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(SH.RECPNT_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS RECPNT_MBTLNB
 										,IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(O.ORDRR_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS ORDRR_MBTLNB
+										,FN_GET_COMMCODE_NAME('ORDR_STTUS', SH.ORDR_STTUS_CD) AS ORDR_STTUS_NM
     ]]>
 		<include refid="dlivyProcsFrom"/>
 		<include refid="dlivyProcsWhere"/>

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

@@ -476,6 +476,9 @@
             AND FO.ORDRR_MBTLNB = HEX(AES_ENCRYPT(REPLACE(#{mbtlnb}, '-', ''), #{secretKey}))
             AND FO.MBR_INNB = 0
         </if>
+        <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchSubsvcAt)">
+            AND FO.SUBSVC_AT = #{srchSubsvcAt}
+        </if>
     </sql>
 
     <!-- 전체 주문 조회 > 매장 목록 조회 -->
@@ -514,7 +517,10 @@
         			, DATE_FORMAT(FO.ORDR_RCEPT_DT, '%Y-%m-%d %H:%i') AS ORDR_RCEPT_DT -- 주문접수일
         			, FO.SLE_ENVRN_CD -- 판매환경코드
         			, FN_GET_COMMCODE_NAME('SLE_ENVRN', FO.SLE_ENVRN_CD) AS SLE_ENVRN_NM
-        			, FN_GET_ORDER_GOODS_NAME(FO.SOPMAL_CD, FO.ORDR_INNB) AS GOODS_NM -- 상품명
+        			, CASE
+        			        WHEN FO.SUBSVC_AT = 'Y' THEN CONCAT(GS.SUBSVC_NM,'(', GS.SUBSVC_GNR_NM, ')')
+        			        ELSE FN_GET_ORDER_GOODS_NAME(FO.SOPMAL_CD, FO.ORDR_INNB)
+        			  END AS GOODS_NM -- 상품명
         			, FN_GET_ORDER_COUNT(FO.SOPMAL_CD, FO.ORDR_INNB, 'ITEM') AS ITEM_CNT -- 상품 개수
         			, FN_GET_ORDER_COUNT(FO.SOPMAL_CD, FO.ORDR_INNB, 'ORDER') AS ORDER_CNT -- 상품 종수
         			, (
@@ -580,6 +586,7 @@
         														 END
         													 )
         			  ) BLACK_DV -- 블랙리스트 구분
+                    , FO.SUBSVC_AT
         		FROM GC_ORDER FO
         		LEFT JOIN LATERAL (
         				  SELECT FM.MBR_INNB
@@ -597,9 +604,12 @@
         			  AND FMGM.SOPMAL_CD = FO.SOPMAL_CD    -- 주문의 회원번호만 등급을 조회하면 되므로 조건을 추가함.
         			  WHERE FM.USE_AT = 'Y'
         				  ) MBR ON 1=1
-        		LEFT JOIN GC_ORDER_SETLE FOS  -- LEFT 로 다시 변경
-        		ON FOS.SOPMAL_CD = FO.SOPMAL_CD
+                LEFT JOIN GC_ORDER_SETLE FOS  -- LEFT 로 다시 변경
+                ON FOS.SOPMAL_CD = FO.SOPMAL_CD
                 AND FOS.ORDR_INNB = FO.ORDR_INNB
+                LEFT JOIN GC_SUBSVC GS
+                ON GS.SOPMAL_CD = FO.SOPMAL_CD
+                AND GS.SUBSVC_INNB = FO.SUBSVC_INNB
         			WHERE FO.USE_AT = 'Y'
                     /*AND FO.SUBSVC_AT = 'N'*/
         			AND   FOS.ORDR_INNB IS NOT NULL   -- GC_ORDER_SETLE 에 데이터가 있을 때 조건
@@ -996,6 +1006,7 @@
              , IFNULL(FOI.MLG_AMT, 0) AS MLG_AMT
              , IFNULL(FOS.DLVY_AMT, 0) AS DLVY_AMT
              , IFNULL(FO.RL_SETLE_AMT, 0) AS SETLE_AMT
+             , ROUND(IFNULL(FO.WON_RL_SETLE_AMT, 0)) AS WON_RL_SETLE_AMT
           FROM (
                SELECT FOI.SOPMAL_CD
                     , FOI.ORDR_INNB
@@ -1062,7 +1073,7 @@
                         , FOI.ORDR_GOODS_INNB AS ordr_goods_innb
                         , FO.SMRT_SHOPNG_ORDRNB AS npay_goods_ordrnb
                         , CASE
-                            WHEN FOI.OPTN_NM IS NOT NULL THEN FOI.OPTN_NM
+                            WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM, ' ', FOI.OPTN_NM)
                             ELSE FOI.GOODS_NM
                           END AS goods_nm
                         , FOI.INVNTRY_QY AS invntry_qy
@@ -1096,6 +1107,11 @@
                         , FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ordr_ty_nm
                         , FOI.optn_cd_1
                         , FOSH.dlvy_mssage_cn
+                        , FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS shipping_sttus_nm
+                        , CASE WHEN FO.SUBSVC_AT = 'Y'
+                                        THEN '구독'
+                                        ELSE '일반'
+                                        END AS subsvc_at
                  FROM GC_ORDER FO
                     INNER JOIN LATERAL (
                             SELECT   GOI.SOPMAL_CD
@@ -1232,6 +1248,8 @@
                     , GROUP_CONCAT(A.ORDR_TY_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS ORDR_TY_NM
                     , GROUP_CONCAT(A.OPTN_CD_1 ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS OPTN_CD_1
                     , GROUP_CONCAT(A.DLVY_MSSAGE_CN ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS DLVY_MSSAGE_CN
+                    , GROUP_CONCAT(A.SHIPPING_STTUS_NM ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS SHIPPING_STTUS_NM
+                    , GROUP_CONCAT(A.SUBSVC_AT ORDER BY A.ORDR_GOODS_INNB ASC SEPARATOR '\n') AS SUBSVC_AT
                  FROM (
                         SELECT FOI.ORDR_DLVY_INNB AS EXPORT_GROUP_INNB
                                 , CONCAT(FO.ORDR_INNB, '-', FOI.ORDR_DLVY_INNB) AS ORDR_INNB_WITH_EXPORT_GROUP_INNB
@@ -1264,7 +1282,7 @@
                                 , FOI.ORDR_GOODS_INNB
                                 , FO.SMRT_SHOPNG_ORDRNB AS NPAY_GOODS_ORDRNB
                                 , CASE
-                                    WHEN FOI.OPTN_NM IS NOT NULL THEN FOI.OPTN_NM
+                                    WHEN FOI.OPTN_NM IS NOT NULL THEN CONCAT(FOI.GOODS_NM, ' ', FOI.OPTN_NM)
                                     ELSE FOI.GOODS_NM
                                   END AS GOODS_NM
                                 , FOI.INVNTRY_QY
@@ -1298,6 +1316,11 @@
                                 , FN_GET_COMMCODE_NAME('ORDR_TY', FO.ORDR_TY_CD) AS ORDR_TY_NM
                                 , FOI.OPTN_CD_1
                                 , FOSH.DLVY_MSSAGE_CN
+                                , FN_GET_COMMCODE_NAME('ORDR_STTUS', FOSH.ORDR_STTUS_CD) AS SHIPPING_STTUS_NM
+                                , CASE WHEN FO.SUBSVC_AT = 'Y'
+                                        THEN '구독'
+                                        ELSE '일반'
+                                        END AS SUBSVC_AT
                         FROM GC_ORDER FO
                         INNER JOIN LATERAL (
                                         SELECT   GOI.SOPMAL_CD
@@ -1378,6 +1401,125 @@
                GROUP BY A.ORDR_INNB
                ) EXCEL
     </select>
+
+	<!-- 전체 주문 조회 > 엑셀다운로드 발주서 -->
+	<select id="selectExcelListPurchOrder" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrSrchVO" resultType="dataMap">
+		SELECT
+			GO.ORDR_RCEPT_DT,
+			'UNIHAN' AS ENTRPS_CD,
+			'UNIHAN CO.,LTD.' AS ENTRPS_NM,
+			'03-5990-2880' AS ENTRPS_TEL,
+			'RM.302,YOTSUYA-AKEBONOBASHI BLDG.,2-14, SUMIYOSHI-CHO, SHINJUKU-KU, TOKYO, 162-0065, JAPAN' AS ENTRPS_ADRES,
+			NULL AS SPCL_CSTMCLER_ENTRPS,
+			NULL AS SPCL_CSTMCLER_CD,
+			GO.ORDR_INNB,
+			1 AS PURPS_DV,
+			GOS.RECPNT_NM,
+            CAST(AES_DECRYPT(UNHEX(GOS.RECPNT_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)) AS RECPNT_MBTLNB,
+			NULL AS RECPNT_HP,
+			GOS.CSTMCLER_CD,
+			GOS.DLVYLC_ZIP,
+			CASE
+				WHEN GOS.DLVYLC_ADRES_DV_CD = '01'
+				THEN GOS.DLVYLC_RNM_ADRES
+				ELSE GOS.DLVYLC_LNB_ADRES
+			END DLVYLC_RNM_LNB_ADRES,
+			GOS.DLVYLC_ADRES_DTL,
+			GOS.DLVY_MSSAGE_CN,
+			'www.sake1jan.com' AS CSTMR_PURCHS_SITE,
+			GOIO.REAL_WT,
+			GOIO.PACKAGE_CNT,
+			GOIO.HSCODE,
+			'A' AS CMMRC_TY,
+			CONCAT(GOI.GOODS_NM_EN, ' ', GOIO.OPTN_NM_1, '-', GOIO.OPTN_VAL_1) AS CN,
+			/*원가 관리 시작*/
+			GOIO.SLEPRIC,
+			GOS.DFT_DLVY_AMT,
+			GGC.CSTMS_FEE,
+			(
+			    (GOIO.SLEPRIC + GOS.DFT_DLVY_AMT)
+			        * GGC.PLTFOM_FEE
+			        * GGC.EXPCT_TAX
+			) AS EXPCT_TAX_AMT,
+			GGC.EXPCT_TAX,
+			GGC.KR_DLVY_CT,
+			GGC.PLTFOM_FEE,
+			GGC.USD_RATE,
+			TRUNCATE(
+				(
+					(
+						(GOIO.SLEPRIC + GOS.DFT_DLVY_AMT)
+							- (
+							    GGC.CSTMS_FEE
+								+ (GOIO.SLEPRIC + GOS.DFT_DLVY_AMT)
+									* GGC.PLTFOM_FEE
+									* GGC.EXPCT_TAX
+								+ GGC.KR_DLVY_CT
+							)
+					) * GGC.USD_RATE / 1000
+				), 2
+			) AS UNIT_VALUE,
+			/*원가 관리 종료*/
+			GOIO.ORDR_QY,
+			(
+				TRUNCATE(
+					(
+						(
+							(GOIO.SLEPRIC + GOS.DFT_DLVY_AMT)
+								- (
+									GGC.CSTMS_FEE
+									+ (GOIO.SLEPRIC + GOS.DFT_DLVY_AMT)
+										* GGC.PLTFOM_FEE
+										* GGC.EXPCT_TAX
+									+ GGC.KR_DLVY_CT
+								)
+						) * GGC.USD_RATE / 1000
+					), 2
+				) * GOIO.ORDR_QY
+			) AS VALUE,
+			NULL AS BRAND,
+			NULL AS PRE_FOOD_DCL,
+			NULL AS PROVD_NATION,
+			NULL AS PROVD_CMPNY_NM,
+			NULL AS CHNLNG_GOODS_NM,
+			NULL AS SHIPPER_PURCHS_SITE,
+			NULL AS SLE_AGNT_ENTRPS_NM,
+			NULL AS SLE_AGNT_ENTRPS_REGIST_CD,
+			NULL AS PURCHS_DLVY_AGENCY_NM,
+			NULL AS PURCHS_DLVY_AGENCY_REGIST_CD,
+			NULL AS OVSEA_SELER_NM,
+			GOS.ORDR_DLVY_INNB AS OVSEA_SELER_REGIST_CD,
+			CONCAT(GO.SUBSVC_AT, GOS.DLVYLC_AREA_CD, GOS.ORDR_DLVY_INNB) AS SITE_ORDR_INNB,
+			/*아래부터는 발주서에 포함되지 않음*/
+			GO.ORDR_STTUS_CD,
+			GOI.ORDR_GOODS_INNB,
+			GOI.GOODS_INNB,
+			GOI.GOODS_NM,
+			GOIO.ORDR_GOODS_OPTN_INNB,
+			GOIO.GOODS_OPTN_INNB,
+			GOS.DLVYLC_AREA_CD,
+			GGC.STDR_DE
+		FROM GC_ORDER GO
+		INNER JOIN GC_ORDER_ITEM GOI
+			ON GOI.ORDR_INNB = GO.ORDR_INNB
+			AND GOI.SOPMAL_CD = GO.SOPMAL_CD
+		INNER JOIN GC_ORDER_ITEM_OPTION GOIO
+			ON GOIO.ORDR_GOODS_INNB = GOI.ORDR_GOODS_INNB
+			AND GOIO.SOPMAL_CD = GOI.SOPMAL_CD
+		INNER JOIN GC_ORDER_SHIPPING GOS
+			ON GOS.ORDR_DLVY_INNB = GOIO.ORDR_DLVY_INNB
+			AND GOS.SOPMAL_CD = GOIO.SOPMAL_CD
+		LEFT JOIN GC_GOODS_COST GGC
+			ON GGC.STDR_DE = (
+				SELECT MAX(GGC.STDR_DE)
+				FROM GC_GOODS_COST GGC
+				WHERE GGC.STDR_DE <![CDATA[<=]]> GO.ORDR_RCEPT_DT
+			)
+		WHERE 1 = 1
+			AND GO.ORDR_RCEPT_DT BETWEEN #{srchStartDate} AND #{srchEndDate} ' 23:59:59'
+			AND GOIO.ORDR_STTUS_CD = #{srchOrdrSttusCd}
+			AND GO.SOPMAL_CD = #{sopmalCd}
+	</select>
     <!--
     ####################################
         전체주문 조회 서비스 종료
@@ -1482,6 +1624,14 @@
               END AS SALES_POSBLE_REGIST_AT /* 현금영수증 신청 가능 여부 */
             , IF(FO.SMRT_SHOPNG_ORDRNB IS NOT NULL AND FO.SMRT_SHOPNG_ORDRNB != '0', FO.SMRT_SHOPNG_ORDRNB, NULL) AS SMRT_SHOPNG_ORDRNB
             , CONCAT(SP.SOPMAL_NM, ' ', STR.STR_NM) AS STR_NM
+            , (SELECT MAX(CAST(GOR.ORDER_REFUND_INNB AS CHAR))
+               FROM GC_ORDER_REFUND GOR
+               WHERE GOR.SOPMAL_CD = FO.SOPMAL_CD
+                 AND GOR.ORDR_INNB = FO.ORDR_INNB
+                 AND GOR.USE_AT = 'Y'
+                 AND GOR.REFUND_PROCS_STTUS_CD = '03'	/*처리상태:환불완료*/) AS ORDER_RE_INNB
+            , FO.SUBSVC_AT
+            , FO.SUBSVC_INNB
           FROM GC_ORDER FO
     INNER JOIN (
                SELECT FOI.SOPMAL_CD
@@ -1650,8 +1800,10 @@
                 , REFUND_ACNT_DPSTR_NM
                 , REFUND_ACNTNB
                 , REFUND_AMT
+                , WON_REFUND_AMT
                 , REFUND_ACCMLMNY_AMT
                 , REFUND_DLVY_AMT
+                , WON_REFUND_DLVY_AMT
                 , MLG_ACCMLMNY_AMT
                 , MLG_ACCMLMNY_VALID_DT
                 , ENURI_REVISN_AMT
@@ -1677,6 +1829,7 @@
                 , RETURN_CSTMR_TELNB
                 , RETURN_CSTMR_MBTLNB
                 , RETURN_DLVY_AMT
+                , WON_RETURN_DLVY_AMT
                 , RETURN_DLVY_TRGET_CD
                 , RETURN_DLVY_RSPNSBL_CD
                 , RETURN_DLVY_PYMNT_TY_CD
@@ -1714,8 +1867,10 @@
                 , #{refundAcntDpstrNm}
                 , REPLACE(#{refundAcntnb}, '-', '')
                 , #{refundAmt}
+                , ROUND((SELECT GO2.BUY_RATE FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * #{refundAmt},0)
                 , #{refundAccmlmnyAmt}
                 , #{refundDlvyAmt}
+                , ROUND((SELECT GO2.BUY_RATE FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * #{refundDlvyAmt},0)
                 , #{mlgAccmlmnyAmt}
                 , #{mlgAccmlmnyValidDt}
                 , #{enuriRevisnAmt}
@@ -1741,6 +1896,7 @@
                 , HEX(AES_ENCRYPT(REPLACE(#{returnCstmrTelnb}, '-', ''), '1df5be2f7e90ae36'))
                 , HEX(AES_ENCRYPT(REPLACE(#{returnCstmrMbtlnb}, '-', ''), '1df5be2f7e90ae36'))
                 , #{returnDlvyAmt}
+                , ROUND((SELECT GO2.BUY_RATE FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * #{returnDlvyAmt},0)
                 , #{returnDlvyTrgetCd}
                 , #{returnDlvyRspnsblCd}
                 , #{returnDlvyPymntTyCd}
@@ -1992,6 +2148,71 @@
       ORDER BY FOS.ORDR_DLVY_INNB ASC
     </select>
 
+    <!-- 배송지정보 목록 조회 그룹 -->
+    <select id="selectOrderShippingListGrp" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrShippingVO" resultType="dataMap">
+        SELECT SOPMAL_CD, ORDR_INNB, RECPNT_NM, RECPNT_TELNB, RECPNT_MBTLNB, DLVYLC_ZIP, DLVYLC_ADRES_DV_CD, ADRES, DLVYLC_RNM_ADRES, DLVYLC_LNB_ADRES, DLVYLC_ADRES_DTL, DLVY_MSSAGE_CN, GIFT_MSSAGE_CN, GIFT_STTUS_CD, GIFT_STTUS_CD_NM, ORDR_STTUS_CD, ORDR_STTUS_NM, FREE_DLVY_CND_AMT, DFT_DLVY_AMT
+        FROM (
+                SELECT FOS.SOPMAL_CD
+                , FOS.ORDR_INNB
+                , FOS.ORDR_DLVY_INNB
+                , FOS.RECPNT_NM
+                ,  CASE
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 11 THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 4, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 8, 4))
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 10 AND CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)) LIKE '02%' THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 2), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 3, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 7, 4))
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 10 AND CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)) NOT LIKE '02%' THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 4, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 7, 4))
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 9 THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 2), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 3, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 6, 4))
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))) = 8 THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), 5, 4))
+                ELSE
+                CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_TELNB), '1df5be2f7e90ae36') AS CHAR(50))
+                END AS RECPNT_TELNB
+                ,  CASE
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 11 THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 4, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 8, 4))
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 10 AND CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)) LIKE '02%' THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 2), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 3, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 7, 4))
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 10 AND CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)) NOT LIKE '02%' THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 4, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 7, 4))
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 9 THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 2), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 3, 3), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 6, 4))
+                WHEN LENGTH(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))) = 8 THEN
+                CONCAT(SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 1, 4), '-', SUBSTR(CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), 5, 4))
+                ELSE
+                CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50))
+                END AS RECPNT_MBTLNB
+                , FOS.DLVYLC_ZIP
+                , FOS.DLVYLC_ADRES_DV_CD
+                , CASE WHEN FOS.DLVYLC_ADRES_DV_CD = '01'
+                THEN FOS.DLVYLC_RNM_ADRES
+                ELSE FOS.DLVYLC_LNB_ADRES
+                END ADRES
+                , FOS.DLVYLC_RNM_ADRES
+                , FOS.DLVYLC_LNB_ADRES
+                , FOS.DLVYLC_ADRES_DTL
+                , FOS.DLVY_MSSAGE_CN
+                , FOS.GIFT_MSSAGE_CN
+                , FOS.GIFT_STTUS_CD
+                , FN_GET_COMMCODE_NAME('GIFT_STTUS', FOS.GIFT_STTUS_CD) AS GIFT_STTUS_CD_NM
+                , FOS.ORDR_STTUS_CD
+                , FN_GET_COMMCODE_NAME('ORDR_STTUS', FOS.ORDR_STTUS_CD) AS ORDR_STTUS_NM
+                , ROUND(FOS.RL_DLVY_AMT) AS RL_DLVY_AMT
+                , ROUND(FOS.FREE_DLVY_CND_AMT) AS FREE_DLVY_CND_AMT
+                , ROUND(FOS.DFT_DLVY_AMT) AS DFT_DLVY_AMT
+                FROM GC_ORDER_SHIPPING FOS
+                WHERE FOS.SOPMAL_CD = #{sopmalCd}
+                AND FOS.ORDR_INNB = #{ordrInnb}
+                <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(ordrDlvyInnb)">
+                    AND FOS.ORDR_DLVY_INNB = #{ordrDlvyInnb}
+                </if>
+                ORDER BY FOS.ORDR_DLVY_INNB ASC
+        ) AA
+        GROUP BY SOPMAL_CD, ORDR_INNB, RECPNT_NM, RECPNT_TELNB, RECPNT_MBTLNB, DLVYLC_ZIP, DLVYLC_ADRES_DV_CD, ADRES, DLVYLC_RNM_ADRES, DLVYLC_LNB_ADRES, DLVYLC_ADRES_DTL, DLVY_MSSAGE_CN, GIFT_MSSAGE_CN, GIFT_STTUS_CD, GIFT_STTUS_CD_NM, ORDR_STTUS_CD, ORDR_STTUS_NM, FREE_DLVY_CND_AMT, DFT_DLVY_AMT
+    </select>
+
     <!-- 배송지별 상품 목록 조회 -->
     <select id="selectOrderShippingGoodsList" parameterType="dataMap" resultType="dataMap">
         <![CDATA[
@@ -2233,6 +2454,16 @@
         ]]>
     </select>
 
+    <!-- 배송지정보 일치여부 확인 -->
+    <select id="selectDlvylcAreaCdInfo" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrShippingVO">
+        SELECT COUNT(*) AS CNT
+        FROM GC_ORDER_SHIPPING GOS
+        WHERE GOS.SOPMAL_CD = #{sopmalCd}
+          AND GOS.ORDR_INNB = #{ordrInnb}
+          AND GOS.ORDR_DLVY_INNB = #{ordrDlvyInnb}
+          AND GOS.DLVYLC_AREA_CD = #{dlvylcAreaCd}
+    </select>
+
     <!-- 배송지정보 수정 -->
     <update id="updateDlvylcInfo" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrShippingVO">
         UPDATE GC_ORDER_SHIPPING FOS
@@ -2264,6 +2495,7 @@
          WHERE FOS.SOPMAL_CD = #{sopmalCd}
            AND FOS.ORDR_INNB = #{ordrInnb}
            AND FOS.ORDR_DLVY_INNB = #{ordrDlvyInnb}
+           AND FOS.DLVYLC_AREA_CD = #{dlvylcAreaCd}
     </update>
 
     <!-- 주문메모 목록 조회 -->
@@ -2421,6 +2653,7 @@
                  WHEN FOS.PG_CMPNY_NM = 'kcp' THEN GPL.KCP_MID
                  ELSE GPL.OLD_TOSS_MID
                 END AS MID
+             , ROUND(FOS.WON_SETLE_AMT)                 AS WON_SETLE_AMT
           FROM GC_ORDER_SETLE FOS
                   INNER JOIN GC_PAY_LINK GPL
             ON FOS.SOPMAL_CD = GPL.SOPMAL_CD
@@ -2496,7 +2729,13 @@
                <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(procsDtlsDvCd)">
                   AND FOL.ADIT_INFO_CN = #{procsDtlsDvCd}
                </if>
-             ORDER BY FOL.PROCS_DT ASC
+             ORDER BY
+                    FOL.PROCS_DT ASC,
+					CASE
+						WHEN FOL.LOG_SJ LIKE '%결제취소 신청%' THEN 1
+						WHEN FOL.LOG_SJ LIKE '%결제취소 완료%' THEN 2
+						ELSE 3
+					END ASC
                ) DTLS
     </select>
 
@@ -3821,6 +4060,7 @@
                                         AND FOS.ORDR_INNB = FO.ORDR_INNB
                 WHERE FO.USE_AT = 'Y'
                   AND FO.SUBSVC_AT = 'N'        /*구독서비스 제외*/
+                  AND ( ( FO.ORDR_STTUS_CD BETWEEN '15' AND '75' ) OR FO.ORDR_STTUS_CD = '95' )
                   AND IFNULL(FOS.ORDR_INNB, '') != ''
                   AND FO.SOPMAL_CD = #{sopmalCd}
                   AND FO.MBR_DV_CD = #{mbrDvCd}
@@ -4177,6 +4417,7 @@
            AND FC.CART_DV_CD = #{cartDvCd}
      ORDER BY FC.REGIST_DT DESC
     </select>
+
     <!--사용자 > 상품 > 장바구니 목록 > 선물하기,여러곳배송 버튼 활성화 여부 -->
     <select id="selectBOSpbkGiftMultiDlvyAt" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOSpbkVO" resultType="dataMap">
         SELECT GS.SOPMAL_CD
@@ -4187,6 +4428,14 @@
           AND GS.SOPMAL_CD= #{sopmalCd}
     </select>
 
+    <!--살때 환율 조회 -->
+    <select id="selectBuyRate" parameterType="dataMap" resultType="BigDecimal">
+        SELECT GS.BUY_RATE
+        FROM GC_SHOP GS
+        WHERE 1=1
+          AND GS.SOPMAL_CD= #{sopmalCd}
+    </select>
+
     <!--장바구니 상태 변경 -->
     <update id="updateBOSpbkCartDvCd" parameterType="dataMap">
         UPDATE
@@ -4719,19 +4968,51 @@
                                                                            THEN (IFNULL(OIOP2.ENURI_DSCNT_UNIT, 0) * RI.REFUND_QY) + IFNULL(OIOP2.ENURI_DSCNT_REST, 0)
                                                                        ELSE (IFNULL(OIOP2.ENURI_DSCNT_UNIT, 0) * RI.REFUND_QY)                                     END )  AS SUB_SLEPRIC
                  , FSG.DLVY_GROUP_DV_CD
-                 , ROUND(IFNULL(FSG.DFT_DLVY_AMT, 0), '0') AS DFT_DLVY_AMT
-                 , FSG.AMT_CND_USE_AT
-                 , ROUND(IFNULL(FSG.AMT_CND_ADIT_AMT, 0), '0') AS AMT_CND_ADIT_AMT
-                 , FSG.CNT_CND_USE_AT
-                 , ROUND(IFNULL(FSG.CNT_CND_ADIT_AMT, 0), '0') AS CNT_CND_ADIT_AMT
-                 , FSG.BUNDLE_DLVY_USE_AT
-                 , ROUND(IFNULL(FSG.BUNDLE_DLVY_CND_AMT, 0), '0') AS BUNDLE_DLVY_CND_AMT
-                 , FSG.DLVY_AREA_ADIT_AT
-                 , ROUND(IFNULL(FSG.AREA_ADIT_DLVY_AMT, 0), '0') AS AREA_ADIT_DLVY_AMT
+                 , (CASE
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN ROUND(IFNULL(FSG.DFT_DLVY_AMT2, 0), '0')
+                        ELSE ROUND(IFNULL(FSG.DFT_DLVY_AMT, 0), '0')
+                    END) AS DFT_DLVY_AMT
+                 , (CASE
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN FSG.AMT_CND_USE_AT2
+                        ELSE FSG.AMT_CND_USE_AT
+                    END) AS AMT_CND_USE_AT
+                 , (CASE
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN ROUND(IFNULL(FSG.AMT_CND_ADIT_AMT2, 0), '0')
+                        ELSE ROUND(IFNULL(FSG.AMT_CND_ADIT_AMT, 0), '0')
+                    END) AS AMT_CND_ADIT_AMT
+                 , (CASE
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN FSG.CNT_CND_USE_AT2
+                        ELSE FSG.CNT_CND_USE_AT
+                    END) AS CNT_CND_USE_AT
+                 , (CASE
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN ROUND(IFNULL(FSG.CNT_CND_ADIT_AMT2, 0), '0')
+                        ELSE ROUND(IFNULL(FSG.CNT_CND_ADIT_AMT, 0), '0')
+                    END) AS CNT_CND_ADIT_AMT
+                 , (CASE
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN FSG.BUNDLE_DLVY_USE_AT2
+                        ELSE FSG.BUNDLE_DLVY_USE_AT
+                    END) AS BUNDLE_DLVY_USE_AT
+                 , (CASE
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN ROUND(IFNULL(FSG.BUNDLE_DLVY_CND_AMT2, 0), '0')
+                        ELSE ROUND(IFNULL(FSG.BUNDLE_DLVY_CND_AMT, 0), '0')
+                    END) AS BUNDLE_DLVY_CND_AMT
+                 , (CASE
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN FSG.DLVY_AREA_ADIT_AT2
+                        ELSE FSG.DLVY_AREA_ADIT_AT
+                    END) AS DLVY_AREA_ADIT_AT
+                 , (CASE
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN ROUND(IFNULL(FSG.AREA_ADIT_DLVY_AMT2, 0), '0')
+                        ELSE ROUND(IFNULL(FSG.AREA_ADIT_DLVY_AMT, 0), '0')
+                END) AS AREA_ADIT_DLVY_AMT
+                 , (CASE
+                        WHEN OIOP2.ORDR_QY = (OIOP2.STEP85 + RI.REFUND_QY) THEN ROUND(IFNULL(SH.RL_DLVY_AMT, 0), '0')
+                        ELSE 0
+                    END) AS REAL_DLVY_AMT
                  , ROUND(IFNULL(SH.RL_DLVY_AMT + SH.DLVY_COUPON_DSCNT_AMT, 0), '0') AS RL_DLVY_AMT
                  , OIOP2.RETURN_DLVY_APPLC_AT
                  , ROUND(IFNULL(OIOP2.RETURN_DLVY_AMT, 0), '0') AS RETURN_DLVY_AMT
                  , ROUND(IFNULL(OIOP2.EXCHNG_DLVY_AMT, 0), '0') AS EXCHNG_DLVY_AMT
+                 , SH.DLVYLC_AREA_CD
             FROM GC_ORDER_ITEM_OPTION OIOP2
                      INNER JOIN GC_ORDER_ITEM OI
                                 ON OIOP2.SOPMAL_CD = OI.SOPMAL_CD
@@ -4767,7 +5048,9 @@
         <![CDATA[
             UPDATE GC_ORDER_REFUND
                 SET RETURN_DLVY_AMT = #{returnDlvyAmt}
-                    ,REFUND_DLVY_AMT = #{refundDlvyAmt}
+                  , WON_RETURN_DLVY_AMT = ROUND((SELECT GO2.BUY_RATE FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * #{returnDlvyAmt}, 0)
+                  , REFUND_DLVY_AMT = #{refundDlvyAmt}
+                  , WON_REFUND_DLVY_AMT = ROUND((SELECT GO2.BUY_RATE FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * #{refundDlvyAmt}, 0)
             WHERE SOPMAL_CD = #{sopmalCd}
                 AND ORDER_REFUND_INNB = #{orderRefundInnb}
         ]]>
@@ -4861,6 +5144,7 @@
     <!-- PG로그 가상계좌 검증키 조회 -->
     <select id="selectPglogVirtualKey" parameterType="dataMap" resultType="dataMap">
         SELECT ROUND(GOR.RL_SETLE_AMT) AS RL_SETLE_AMT
+                , ROUND(GOR.WON_RL_SETLE_AMT) AS WON_RL_SETLE_AMT
                 , GOR.ORDRR_NM
                 , GOPL.SETLER_NM
                 , GOPL.DELNG_NB
@@ -4883,7 +5167,7 @@
                 AND GOR.SOPMAL_CD = GOPL.SOPMAL_CD
            WHERE GOR.SOPMAL_CD = #{sopmalCd}
              AND GOR.ORDR_INNB = #{ordrInnb}
-             AND GOPL.SETLE_MTH_CD IN ('04','05','06')
+--              AND GOPL.SETLE_MTH_CD IN ('04','05','06')
            ORDER BY GOPL.PG_LOG_INNB ASC
            LIMIT 1
     </select>
@@ -5093,7 +5377,7 @@
         <![CDATA[
             SELECT
                 CASE
-                     WHEN O.ORDR_STTUS_CD >= '30' AND O.ORDR_STTUS_CD < '85' AND #{refundTyCd} = '01' THEN 'N'
+                     WHEN O.ORDR_STTUS_CD >= '40' AND O.ORDR_STTUS_CD < '85' AND #{refundTyCd} = '01' THEN 'N'
                      ELSE 'Y'
                 END AS CANCEL_POSBLE_AT
             FROM GC_ORDER O
@@ -5117,7 +5401,7 @@
                                     WHEN #{pgCmpnyNm} = 'toss' OR #{pgCmpnyNm} = 'tosspay' THEN TOSS_MID -- 토스
                                     WHEN #{pgCmpnyNm} = 'naverpay' OR #{pgCmpnyNm} = 'kakaopay' THEN EASYPAY_MID -- 이지페이
                                     WHEN #{pgCmpnyNm} = 'gcpay' THEN BPAY_MID -- 브랜드페이
-                                    WHEN #{pgCmpnyNm} = 'kcp' THEN KCP_MID -- kcp
+                                    WHEN #{pgCmpnyNm} = 'kcp' OR #{pgCmpnyNm} = 'kiwoom' THEN KCP_MID -- kcp, kiwoom
                              END
                 END, '') AS SETLE_MID
             FROM GC_PAY_LINK
@@ -5288,7 +5572,14 @@
     <!-- 사용자 > 마이페이지 > 구독서비스 주문/배송 목록 조회 -->
     <select id="selectMbrSubsvcOrdrList" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrDlvyVO" resultType="dataMap">
         <![CDATA[
-            SELECT *
+            SELECT PV.*
+                        , (SELECT MAX('구독취소')
+                           FROM GC_ORDER_REFUND GOR
+                           WHERE GOR.SOPMAL_CD = PV.SOPMAL_CD
+                             AND GOR.ORDR_INNB = PV.ORDR_INNB
+                             AND GOR.USE_AT = 'Y'
+                             AND GOR.REFUND_PROCS_STTUS_CD = '03'	/*처리상태:환불완료*/
+                             AND GOR.REFUND_TY_CD != '01'	/*환불구분:결제취소가 아님*/) AS REFUND_STTUS_NM
               FROM (
                    SELECT CAST(@ROWNUM:=@ROWNUM + 1 AS UNSIGNED) AS RNUM
                         , TB.*
@@ -5418,7 +5709,7 @@
                                                     AND FOS.ORDR_INNB = FO.ORDR_INNB
                             WHERE FO.USE_AT = 'Y'
                               AND FO.SUBSVC_AT = 'Y' /*구독서비스*/
-                              AND ( ( FO.ORDR_STTUS_CD BETWEEN '15' AND '75' ) OR FO.ORDR_STTUS_CD = '95' )
+                              AND FO.ORDR_STTUS_CD BETWEEN '15' AND '95'
                               AND FO.SOPMAL_CD = #{sopmalCd}
                               AND FO.MBR_DV_CD = #{mbrDvCd}
                               AND FO.MBR_INNB = #{mbrInnb}
@@ -5426,12 +5717,6 @@
                           ) TB
                     WHERE (@rownum:=0) = 0
         ]]>
-        <include refid="mbrOrdrSubsvcListWhere"/>
-        ) PV
-        LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
-    </select>
-
-    <sql id="mbrOrdrSubsvcListWhere">
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchwrd)">
             AND (
             TB.ORDR_INNB LIKE CONCAT('%', #{srchwrd}, '%') OR
@@ -5441,7 +5726,208 @@
         <if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnDt) and @com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endDt)">
             AND TB.ORDR_RCEPT_DT BETWEEN DATE(#{bgnDt}) AND DATE(#{endDt}) + 1
         </if>
-    </sql>
+        ) PV
+        LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
+    </select>
+
+	<!-- 사용자 > 주문완료 > 구독서비스 주문 목록 조회 -->
+	<select id="selectOrdrSubsvcDtllList" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrDlvyVO" resultType="dataMap">
+		<![CDATA[
+			SELECT GO.SOPMAL_CD
+				 , GS.IMG AS GOODS_IMG_COURS
+				 , GS.SUBSVC_NM AS GOODS_NM
+				 , GS.SUBSVC_GNR_NM AS OPTN_NM
+				 , ITEM.INPUT_OPTN_TEXT
+				 , ITEM.CNT AS ORDR_QY
+				 , GS.SUBSVC_INNB AS GOODS_INNB
+				 , GO.RL_SETLE_AMT AS SLEPRIC
+				 , ITEM.DSCNT_AMT
+				 , ROUND((IFNULL(GO.RL_SETLE_AMT, 0) - IFNULL(ITEM.DSCNT_AMT, 0))) AS APPLY_DSCNT_AMT
+				 , ITEM.MLG_AMT
+			FROM GC_ORDER GO
+			INNER JOIN GC_SUBSVC GS ON GO.SUBSVC_INNB = GS.SUBSVC_INNB
+			INNER JOIN (
+						SELECT GOI.SOPMAL_CD
+							 , GOI.ORDR_INNB
+							 , MAX(GOI.GOODS_INNB) AS GOODS_INNB
+							 , MAX(GOIO.ORDR_DLVY_INNB) AS ORDR_DLVY_INNB
+							 , COUNT(DISTINCT GOI.ORDR_GOODS_INNB) AS CNT
+							 , SUM(GOIO.ORDR_QY) AS ORDR_QY
+							 , MAX(FN_GET_ORDER_INPUT_OPTN(GOI.SOPMAL_CD, GOI.ORDR_INNB, GOI.ORDR_GOODS_INNB, GOIO.ORDR_GOODS_OPTN_INNB)) AS INPUT_OPTN_TEXT
+							 , MAX(GOI.GOODS_IMG_COURS) AS GOODS_IMG_COURS
+							 , SUM(FN_GET_ORDER_GOODS_DSCNT_AMT_2(GOI.SOPMAL_CD, GOI.ORDR_GOODS_INNB, GOIO.ORDR_GOODS_OPTN_INNB)) AS DSCNT_AMT
+							 , SUM(FN_GET_ORDER_ACCML_MLG_AMT(GOI.SOPMAL_CD, GOI.ORDR_INNB, GOI.ORDR_GOODS_INNB, GOIO.ORDR_GOODS_OPTN_INNB)) AS MLG_AMT
+						FROM GC_ORDER_ITEM GOI
+						INNER JOIN GC_ORDER_ITEM_OPTION GOIO ON GOI.SOPMAL_CD = GOIO.SOPMAL_CD
+							   AND GOI.ORDR_GOODS_INNB = GOIO.ORDR_GOODS_INNB
+						WHERE GOI.SOPMAL_CD = #{sopmalCd}
+						  AND GOI.ORDR_INNB = #{ordrInnb}
+						  AND GOI.GOODS_KND_CD = '01'
+			) ITEM ON ITEM.SOPMAL_CD = GO.SOPMAL_CD
+				  AND ITEM.ORDR_INNB = GO.ORDR_INNB
+			LEFT JOIN GC_ORDER_SETLE GOS ON GOS.SOPMAL_CD = GO.SOPMAL_CD
+				  AND GOS.ORDR_INNB = GO.ORDR_INNB
+			WHERE GO.USE_AT = 'Y'
+			  AND GO.SUBSVC_AT = 'Y' /*구독서비스*/
+			  AND GO.SOPMAL_CD = #{sopmalCd}
+			  AND GO.ORDR_INNB = #{ordrInnb}
+			ORDER BY GO.REGIST_DT desc
+		]]>
+	</select>
+
+	<!-- 사용자 > 구독서비스 결제 > 구독서비스 주문 상품 목록 조회 -->
+    <select id="selectSubsvcGoodsList" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO" resultType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		WITH RECURSIVE seq AS (
+			SELECT 1 AS n
+			UNION ALL
+			SELECT n + 1 FROM seq WHERE n <![CDATA[<]]> 24
+		)
+		SELECT GGO.SOPMAL_CD
+			 , #{mbrInnb} AS MBR_INNB
+			 , (
+				SELECT GM.MBR_DV_CD
+				  FROM GC_MEMBER GM
+			 INNER JOIN GC_MEMBER_GRAD_MAPPING GMGM
+					ON GMGM.MBR_INNB = GM.MBR_INNB
+				   AND GMGM.MBR_DV_CD = GM.MBR_DV_CD
+				 WHERE GM.USE_AT = 'Y'
+				   AND GMGM.SOPMAL_CD = #{sopmalCd}
+				   AND GMGM.MBR_INNB = #{mbrInnb}
+			   ) AS MBR_DV_CD
+			 , GGO.GOODS_INNB
+			 , GS.DFT_GOODS_OPTN_INNB AS GOODS_OPTN_INNB
+			 , CAST(#{qy} AS UNSIGNED) AS QY
+-- 			 , (
+-- 				SELECT CONCAT(
+-- 						GS.SOPMAL_CD, ',',
+-- 						GGO.GOODS_INNB, ',',
+-- 						GS.DFT_GOODS_OPTN_INNB, ',',
+-- 						GGO.OPTN_NM_1, ',',
+-- 						''#INPUT_OPTN_CN
+-- 				   )
+-- 			   ) AS INPUT_OPTN
+-- 			 , (
+-- 				SELECT CONCAT(
+-- 						GGO.OPTN_NM_1, ':',
+-- 						''#INPUT_OPTN_CN
+-- 				   )
+-- 			   ) AS INPUT_OPTN_TEXT
+			 , GG.DLVY_GROUP_INNB
+			 , GG.GOODS_STTUS_CD
+			 , CASE WHEN GG.GOODS_STTUS_CD='03' AND GG.SEL_STPGE_CUSTOM_WORDS_AT ='Y' AND IFNULl(GG.SEL_STPGE_CUSTOM_WORDS, '')!=''  THEN GG.SEL_STPGE_CUSTOM_WORDS
+					ELSE FN_GET_COMMCODE_NAME('GOODS_STTUS', GG.GOODS_STTUS_CD)
+			   END AS GOODS_STTUS_NM
+			 , GG.GOODS_NM
+			 , GGO.OPTN_TY
+			 , GGO.OPTN_RELATE_NB
+			 , GGO.COMPNB_DSCNT_AT
+			 , GGO.SCTN_DSCNT_AT
+			 , NULLIF(GGO.OPTN_ESSNTL_AT, '') AS OPTN_ESSNTL_AT
+			 , FORMAT(IFNULL(GGO.CNSMRPRIC, 0) * #{qy}, 0) AS SUB_CNSMRPRIC_BY_FORMAT
+			 , IFNULL(GGO.CNSMRPRIC, 0) * #{qy} AS SUB_CNSMRPRIC
+			 , FORMAT(IFNULL(GGO.CNSMRPRIC, 0), 0) AS CNSMRPRIC_BY_FORMAT
+			 , IFNULL(GGO.CNSMRPRIC, 0) AS CNSMRPRIC
+			 , FORMAT(IFNULL(GGO.SLEPRIC, 0) * #{qy}, 0) AS SUB_SLEPRIC_BY_FORMAT
+			 , IFNULL(GGO.SLEPRIC, 0) * #{qy} AS SUB_SLEPRIC
+			 , FORMAT(IFNULL(GGO.SLEPRIC, 0), 0) AS SLEPRIC_BY_FORMAT
+			 , IFNULL(GGO.SLEPRIC, 0) AS SLEPRIC
+			 , 0 AS DSCNT_AMT
+			 , IFNULL(GGO.SLEPRIC, 0) * #{qy} AS DSCNT_APPLY_AMT
+			 , CONCAT(GGO.OPTN1, IF(GGO.OPTN2 IS NULL , '', CONCAT('/', GGO.OPTN2))
+							   , IF(GGO.OPTN3 IS NULL , '', CONCAT('/', GGO.OPTN3))
+							   , IF(GGO.OPTN4 IS NULL , '', CONCAT('/', GGO.OPTN4))) AS OPTN
+			 , GGI.IMG AS GOODS_IMG_COURS
+		FROM GC_SUBSVC GS
+		INNER JOIN (
+			SELECT *
+				 , CASE WHEN GGO.OPTN_NM_1 != '' AND GGO.OPTN_VAL_1 != ''
+						THEN CONCAT(GGO.OPTN_NM_1,':',GGO.OPTN_VAL_1)
+				   END OPTN1
+				 , CASE WHEN GGO.OPTN_NM_2 != '' AND GGO.OPTN_VAL_2 != ''
+						THEN CONCAT(GGO.OPTN_NM_2,':',GGO.OPTN_VAL_2)
+				   END OPTN2
+				 , CASE WHEN GGO.OPTN_NM_3 != '' AND GGO.OPTN_VAL_3 != ''
+						THEN CONCAT(GGO.OPTN_NM_3,':',GGO.OPTN_VAL_3)
+				   END OPTN3
+				 , CASE WHEN GGO.OPTN_NM_4 != '' AND GGO.OPTN_VAL_4 != ''
+						THEN CONCAT(GGO.OPTN_NM_4,':',GGO.OPTN_VAL_4)
+				   END OPTN4 from GC_GOODS_OPTION GGO
+		)GGO
+				ON GGO.SOPMAL_CD = GS.SOPMAL_CD
+			   AND GGO.GOODS_OPTN_INNB = GS.DFT_GOODS_OPTN_INNB
+		INNER JOIN GC_GOODS GG
+				ON GGO.SOPMAL_CD = GG.SOPMAL_CD
+			   AND GGO.GOODS_INNB = GG.GOODS_INNB
+			  JOIN seq
+				ON seq.n <![CDATA[<=]]> GS.SUB_PD
+		LEFT JOIN GC_GOODS_IMAGE GGI ON GG.SOPMAL_CD = GGI.SOPMAL_CD
+			 AND GG.GOODS_INNB = GGI.GOODS_INNB
+			 AND GGI.IMG_KND = '03'
+			 AND GGI.CUT_NB = 1
+		WHERE GS.SOPMAL_CD = #{sopmalCd}
+		  AND GS.SUBSVC_INNB = #{subsvcInnb}
+    </select>
+
+    <!-- 한화금액이 결제금액보다 많은지 체크하여 환불금액(원화) update -->
+    <update id="updateBOWonRefundAmt" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrRefundVO">
+        <![CDATA[
+        WITH BF AS (SELECT MAX(O.WON_RL_SETLE_AMT) - IFNULL(SUM(IFNULL(GOR2.WON_REFUND_AMT,0))+SUM(IFNULL(GOR2.WON_REFUND_DLVY_AMT,0)),0) AS WON_REST_AMT
+                    FROM GC_ORDER O
+                             LEFT OUTER JOIN GC_ORDER_REFUND GOR2
+                                             ON GOR2.SOPMAL_CD = O.SOPMAL_CD
+                                                 AND GOR2.ORDR_INNB = O.ORDR_INNB
+                                                 AND GOR2.USE_AT = 'Y'
+                                                 AND GOR2.REFUND_PROCS_STTUS_CD = '03'
+                                                 AND GOR2.ORDER_REFUND_INNB != #{orderRefundInnb}
+                    WHERE O.SOPMAL_CD = #{sopmalCd}
+                      AND O.ORDR_INNB = #{ordrInnb}
+            )
+        UPDATE GC_ORDER_REFUND
+        SET WON_REFUND_AMT = (CASE
+                                  WHEN WON_REFUND_AMT + WON_REFUND_DLVY_AMT  > (SELECT WON_REST_AMT FROM BF) THEN (SELECT WON_REST_AMT FROM BF) - WON_REFUND_DLVY_AMT
+                                  ELSE WON_REFUND_AMT
+            END)
+          , UPDT_DT = NOW()
+        WHERE SOPMAL_CD = #{sopmalCd}
+          AND ORDER_REFUND_INNB = #{orderRefundInnb}
+        ]]>
+    </update>
+
+<!--
+    결제취소 시 구독서비스 환불금액 조회
+    계산식 : 전체결제금액 - 전체배송비 - 발송및취소된(35~85)상품금액
+-->
+    <select id="selectSubsvcRefundAmt" parameterType="com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrRefundVO" resultType="java.lang.Integer">
+        SELECT (MAX(O.RL_SETLE_AMT) - SUM(GOS.RL_DLVY_AMT) - SUM(CASE
+                                                                     WHEN GOIO.ORDR_STTUS_CD BETWEEN 35 AND 85 THEN (GOIO.SLEPRIC * GOIO.ORDR_QY)
+                                                                     ELSE 0
+                                                                END)
+               ) AS REFUND_AMT
+        FROM GC_ORDER O
+        INNER JOIN GC_ORDER_SHIPPING GOS
+                   ON GOS.SOPMAL_CD = O.SOPMAL_CD
+                  AND GOS.ORDR_INNB = O.ORDR_INNB
+                  AND GOS.USE_AT = 'Y'
+        INNER JOIN GC_ORDER_ITEM GOI
+                   ON GOI.SOPMAL_CD = O.SOPMAL_CD
+                  AND GOI.ORDR_INNB = O.ORDR_INNB
+        INNER JOIN GC_ORDER_ITEM_OPTION GOIO
+                   ON GOIO.SOPMAL_CD = GOI.SOPMAL_CD
+                  AND GOIO.ORDR_GOODS_INNB = GOI.ORDR_GOODS_INNB
+                  AND GOIO.ORDR_DLVY_INNB = GOS.ORDR_DLVY_INNB
+        WHERE O.SOPMAL_CD = #{sopmalCd}
+          AND O.ORDR_INNB = #{ordrInnb}
+          AND O.SUBSVC_AT = 'Y'
+    </select>
+
+    <select id="selectKiwoomPgApiLog"
+            parameterType="com.wb.domainserver.domain.gcone.ordr.pay.vo.BOPayVO"
+            resultType="dataMap">
+        SELECT GOPAL.RSLT_PARAM FROM GC_ORDER_PG_API_LOG GOPAL
+         WHERE GOPAL.SOPMAL_CD = #{sopmalCd}
+           AND GOPAL.ORDR_INNB = #{orderId}
+    </select>
+
 
 </mapper>
 

src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml

@@ -326,12 +326,11 @@
 	<sql id="mbrRefundListWhere">
 		<![CDATA[
 			WHERE 1=1
-		]]>
-		<![CDATA[
 				AND RE.SOPMAL_CD = #{sopmalCd}
 				AND O.MBR_DV_CD = #{mbrDvCd}
 				AND O.MBR_INNB = #{mbrInnb}
 				AND RE.USE_AT = 'Y'
+				AND RE.REFUND_PROCS_STTUS_CD = '03'		/*환불완료*/
 		]]>
 			<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(srchwrd)">
 				AND (
@@ -364,6 +363,7 @@
 				INNER JOIN GC_ORDER O
 					ON RE.SOPMAL_CD = O.SOPMAL_CD -- 쇼핑몰 코드
 					AND RE.ORDR_INNB = O.ORDR_INNB -- 주문 고유번호
+					AND O.SUBSVC_AT = 'N'		/*구독상품 제외*/
 		]]>
 	</sql>
 
@@ -570,8 +570,10 @@
 			RE.REFUND_ACNT_DPSTR_NM,
 			RE.REFUND_ACNTNB,
 			RE.REFUND_AMT,
+			RE.WON_REFUND_AMT,
 			RE.REFUND_ACCMLMNY_AMT,
 			RE.REFUND_DLVY_AMT,
+			RE.WON_REFUND_DLVY_AMT,
 			RE.MLG_ACCMLMNY_AMT,
 			RE.MLG_ACCMLMNY_VALID_DT,
 			RE.ENURI_REVISN_AMT,
@@ -597,6 +599,7 @@
 			IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(RE.RETURN_CSTMR_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS RETURN_CSTMR_MBTLNB,
 			IFNULL(CAST(AES_DECRYPT(UNHEX(RE.RETURN_CSTMR_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '') AS RETURN_CSTMR_MBTLNB_N_UNDER,
 			FORMAT(ROUND(RE.RETURN_DLVY_AMT), 0) AS RETURN_DLVY_AMT,
+			FORMAT(ROUND(RE.WON_RETURN_DLVY_AMT), 0) AS WON_RETURN_DLVY_AMT,
 			RE.RETURN_DLVY_TRGET_CD,
 			RE.RETURN_DLVY_RSPNSBL_CD,
 			RE.RETURN_DLVY_PYMNT_TY_CD,
@@ -842,7 +845,7 @@
 									 CASE
 										 WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
 																					   CASE
-																						   WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.DLVY_AMT_REFUND_AMT, 0), 0)
+																						   WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.RETURN_DLVY_AMT, 0), 0)
 																						   WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
 																					   END
 										 ELSE
@@ -851,9 +854,45 @@
 												 WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
 											 END
 										 END
-						         END + (REI.REFUND_MLG_AMT + REI.REFUND_MLG_RMNDR_AMT) + (REI.REFUND_CASH_AMT + REI.REFUND_CASH_RMNDR_AMT)))
+						END + (REI.REFUND_MLG_AMT + REI.REFUND_MLG_RMNDR_AMT) + (REI.REFUND_CASH_AMT + REI.REFUND_CASH_RMNDR_AMT)+ IFNULL((REI.REFUND_GOODS_COUPON_UNIT_AMT + REI.REFUND_GOODS_COUPON_REST_AMT), 0) + IFNULL((REI.REFUND_CART_COUPON_UNIT_AMT + REI.REFUND_CART_COUPON_REST_AMT), 0) ))
 			 , 0) AS RL_REFUND_AMT        -- 마일리지, 배송비 제외한 실 환불 금액
 			 , IFNULL(
+               ROUND(CASE
+								 WHEN RE.REFUND_TY_CD = '01' THEN RE.REFUND_AMT + RE.REFUND_DLVY_AMT
+								 WHEN RE.REFUND_TY_CD = '02' THEN
+									 CASE
+										 WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
+																					   CASE
+																						   WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.RETURN_DLVY_AMT, 0), 0)
+																						   WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
+																					   END
+										 ELSE
+											 CASE
+												 WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN RE.REFUND_AMT
+												 WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
+											 END
+										 END
+						         END)
+			 , 0) AS REAL_REFUND_AMT        -- 마일리지, 쿠폰, 캐시를 제외한 실 환불 금액
+			 , IFNULL(
+				ROUND(CASE
+						  WHEN RE.REFUND_TY_CD = '01' THEN RE.WON_REFUND_AMT + RE.WON_REFUND_DLVY_AMT
+						  WHEN RE.REFUND_TY_CD = '02' THEN
+							  CASE
+								  WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
+									  CASE
+										  WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.WON_REFUND_AMT - IFNULL(RE.WON_RETURN_DLVY_AMT, 0), 0)
+										  WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.WON_REFUND_AMT + IFNULL(RE.WON_REFUND_DLVY_AMT, 0), 0)
+										  END
+								  ELSE
+									  CASE
+										  WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN RE.WON_REFUND_AMT
+										  WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.WON_REFUND_AMT + IFNULL(RE.WON_REFUND_DLVY_AMT, 0), 0)
+										  END
+								  END
+					END)
+			, 0) AS REAL_WON_REFUND_AMT        -- 마일리지, 쿠폰, 캐시를 제외한 실 환불 금액
+			 , IFNULL(
 		             ROUND((CASE
 								 WHEN RE.REFUND_TY_CD = '01' THEN 0
 								 WHEN RE.REFUND_TY_CD = '02' THEN
@@ -873,6 +912,8 @@
 		                 ))
 			 , 0) AS RL_DLVY_AMT_REFUND_AMT        -- 반품 배송비
 		     , FN_GET_COMMCODE_NAME('SETLE_MTH', ST.SETLE_TY_CD)          AS SETLE_TY_CD_NM
+		     , ROUND(ST.WON_SETLE_AMT) 									  AS WON_SETLE_AMT
+		     , O.BUY_RATE
 		FROM (SELECT REI.SOPMAL_CD
 		           , REI.ORDER_REFUND_INNB
 		           , ROUND(SUM(REI.GOODS_REFUND_AMT))                        AS REFUND_AMT           -- * REI.REFUND_QY
@@ -1026,7 +1067,8 @@
 			<![CDATA[RETURN_CSTMR_MBTLNB = HEX(AES_ENCRYPT(REPLACE(#{returnCstmrMbtlnb}, '-', ''), '1df5be2f7e90ae36')),]]>
 		</if>
 		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(returnDlvyAmt)">
-			<![CDATA[RETURN_DLVY_AMT = REPLACE(#{returnDlvyAmt}, ',', ''),]]>
+			RETURN_DLVY_AMT = REPLACE(#{returnDlvyAmt}, ',', ''),
+			WON_RETURN_DLVY_AMT = ROUND((SELECT GO2.BUY_RATE FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * REPLACE(#{returnDlvyAmt}, ',', ''), 0) ,
 		</if>
 		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(returnDlvyRspnsblCd)">
 			<![CDATA[RETURN_DLVY_RSPNSBL_CD = #{returnDlvyRspnsblCd},]]>
@@ -1102,11 +1144,20 @@
 				</when>
 			</choose>
 			<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dlvyAmtRefundAmt)">
-				<![CDATA[DLVY_AMT_REFUND_AMT = #{dlvyAmtRefundAmt},]]>
+				DLVY_AMT_REFUND_AMT = #{dlvyAmtRefundAmt},
+				WON_DLVY_AMT_REFUND_AMT = ROUND((SELECT GO2.BUY_RATE FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * #{dlvyAmtRefundAmt}, 0),
 			</if>
 			<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(refundAmt)">
-				<![CDATA[REFUND_AMT = #{refundAmt},]]>
+				REFUND_AMT = #{refundAmt},
 			</if>
+			<choose>
+				<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(refundAmt) and  @com.wb.domainserver.util.dataaccess.MybaitsUtil@isEmpty(wonRefundAmt)">
+					WON_REFUND_AMT = ROUND((SELECT GO2.BUY_RATE FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * #{refundAmt}, 0) ,
+				</when>
+				<when test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(refundAmt) and  @com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(wonRefundAmt)">
+					WON_REFUND_AMT = #{wonRefundAmt},
+				</when>
+			</choose>
 			MNGR_INNB = #{updusr},
 			UPDT_DT = SYSDATE()
 			<![CDATA[
@@ -1304,8 +1355,10 @@
 				RE.REFUND_ACNT_DPSTR_NM,
 				RE.REFUND_ACNTNB,
 				ROUND(RE.REFUND_AMT) AS REFUND_AMT,
+				ROUND(RE.WON_REFUND_AMT) AS WON_REFUND_AMT,
 				RE.REFUND_ACCMLMNY_AMT,
 				ROUND(RE.REFUND_DLVY_AMT) AS REFUND_DLVY_AMT,
+				ROUND(RE.WON_REFUND_DLVY_AMT) AS WON_REFUND_DLVY_AMT,
 				RE.MLG_ACCMLMNY_AMT,
 				RE.MLG_ACCMLMNY_VALID_DT,
 				RE.ENURI_REVISN_AMT,
@@ -1326,6 +1379,7 @@
 				REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(RE.RETURN_CSTMR_TELNB), '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3') AS RETURN_CSTMR_TELNB,
 				REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(RE.RETURN_CSTMR_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3') AS RETURN_CSTMR_MBTLNB,
 				ROUND(RE.RETURN_DLVY_AMT) AS RETURN_DLVY_AMT,
+				ROUND(RE.RETURN_DLVY_AMT * O.BUY_RATE) AS WON_RETURN_DLVY_AMT,
 				RE.RETURN_DLVY_TRGET_CD,
 				RE.RETURN_DLVY_RSPNSBL_CD,
 				RE.RETURN_DLVY_PYMNT_TY_CD,
@@ -1345,7 +1399,10 @@
 				RE.REGIST_DT,
 				RE.UPDT_DT,
 				O.MBR_DV_CD,
-				O.MBR_INNB
+				O.MBR_INNB,
+				O.BUY_RATE,
+			    ROUND(RE.DLVY_AMT_REFUND_AMT) AS DLVY_AMT_REFUND_AMT,
+				ROUND(RE.DLVY_AMT_REFUND_AMT * O.BUY_RATE) AS WON_DLVY_AMT_REFUND_AMT
 			FROM
 				GC_ORDER_REFUND RE
 					INNER JOIN GC_ORDER O ON RE.SOPMAL_CD = O.SOPMAL_CD
@@ -1496,6 +1553,7 @@
 			     ,ST.SOPMAL_CD
 			     ,ST.ORDR_INNB
 				 ,IFNULL(ST.SETLE_AMT, 0) AS SETLE_AMT  -- 결제금액
+				 ,IFNULL(ST.WON_SETLE_AMT, 0) AS WON_SETLE_AMT  -- 결제금액
 				 ,ST.PG_CMPNY_NM -- pg 회사명
 				 ,ST.PG_INNB -- pg고유번호
 				 ,ST.SETLE_TY_CD
@@ -1529,28 +1587,52 @@
 	<!-- 주문 환불 총 금액 -->
 	<select id="selectBOORderRefundAmtSumInqire"
 			parameterType="com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORtngudrefndVO"
-			resultType="Integer">
+			resultType="dataMap">
 		<![CDATA[
-			SELECT
-				IFNULL((
-						   SELECT ROUND(
-										  SUM(
-												  CASE
-													  WHEN RE.REFUND_TY_CD = '01' THEN RE.REFUND_AMT + RE.REFUND_DLVY_AMT
-													  WHEN RE.REFUND_TY_CD = '02' THEN
-																					  CASE
-																							  WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.DLVY_AMT_REFUND_AMT, 0), 0)
-																							  ELSE RE.REFUND_AMT
-																					  END
-												  END
-										  ), 0)
-						   FROM GC_ORDER_REFUND RE
-						   WHERE RE.SOPMAL_CD = #{sopmalCd}
-							 AND RE.ORDR_INNB = #{ordrInnb}
-							 AND RE.ORDER_REFUND_INNB != #{orderRefundInnb}
-							 AND RE.USE_AT = 'Y'
-						   GROUP BY RE.ORDR_INNB, RE.SOPMAL_CD
-					   ), 0) AS ORDER_REFUND_AMT_SUM
+		SELECT ROUND(
+				SUM(
+						CASE
+							WHEN RE.REFUND_TY_CD = '01' THEN RE.REFUND_AMT + RE.REFUND_DLVY_AMT
+							WHEN RE.REFUND_TY_CD = '02' THEN
+								CASE
+									WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
+										CASE
+											WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.DLVY_AMT_REFUND_AMT, 0), 0)
+											WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
+										END
+									ELSE
+										CASE
+											WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN RE.REFUND_AMT
+											WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0)
+										END
+								END
+						END
+					), 0) AS ORDER_REFUND_AMT_SUM
+			 , ROUND(
+				SUM(
+						CASE
+							WHEN RE.REFUND_TY_CD = '01' THEN RE.WON_REFUND_AMT + RE.WON_REFUND_DLVY_AMT
+							WHEN RE.REFUND_TY_CD = '02' THEN
+								CASE
+									WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
+										CASE
+											WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.WON_REFUND_AMT - IFNULL(RE.WON_DLVY_AMT_REFUND_AMT, 0), 0)
+											WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.WON_REFUND_AMT + IFNULL(RE.WON_REFUND_DLVY_AMT, 0), 0)
+										END
+									ELSE
+										CASE
+											WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN RE.WON_REFUND_AMT
+											WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.WON_REFUND_AMT + IFNULL(RE.WON_REFUND_DLVY_AMT, 0), 0)
+										END
+								END
+						END
+					), 0) AS WON_ORDER_REFUND_AMT_SUM
+		FROM GC_ORDER_REFUND RE
+		WHERE RE.SOPMAL_CD = #{sopmalCd}
+		  AND RE.ORDR_INNB = #{ordrInnb}
+		  AND RE.ORDER_REFUND_INNB != #{orderRefundInnb}
+		  AND RE.USE_AT = 'Y'
+		GROUP BY RE.ORDR_INNB, RE.SOPMAL_CD
 		]]>
 	</select>
 
@@ -1707,6 +1789,9 @@
 				,SUM(PRI.CASH_DSCNT_UNIT * PRI.REFUND_QY + PRI.CASH_DSCNT_REST) AS P_USE_CANCEL_CASH
 				,ROUND(RL_USE_CASH) AS RL_USE_CASH
 				,RL_ORDR_ITEM.RL_ORDR_QY
+				,SUM(PRE.REFUND_DLVY_AMT) AS P_REFUND_DLVY_AMT
+				,SUM(PRE.WON_REFUND_DLVY_AMT) AS P_WON_REFUND_DLVY_AMT
+				,SUM(PRE.WON_REFUND_AMT) AS P_WON_REFUND_AMT
 			FROM GC_ORDER_REFUND_ITEM PRI
 				INNER JOIN GC_ORDER_REFUND PRE ON PRI.SOPMAL_CD = PRE.SOPMAL_CD
 					AND PRI.ORDER_REFUND_INNB = PRE.ORDER_REFUND_INNB

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

@@ -374,106 +374,103 @@
 				SOPMAL_CD,
 				EVT_INNB,
 		]]>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnCnt)">
-						BGN_CNT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endCnt)">
-						END_CNT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnAmt)">
-						BGN_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endAmt)">
-						END_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(provdCnt)">
-						PROVD_CNT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntCd)">
-						ADIT_DSCNT_CD,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntAmt)">
-						ADIT_DSCNT_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dscntMxmmAmt)">
-						DSCNT_MXMM_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlCd)">
-						MLG_ACCML_CD,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlAmt)">
-						MLG_ACCML_AMT,
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgValidMtCnt)">
-						MLG_VALID_MT_CNT,
-					</if>
-				<![CDATA[
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnCnt)">
+				BGN_CNT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endCnt)">
+				END_CNT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnAmt)">
+				BGN_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endAmt)">
+				END_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(provdCnt)">
+				PROVD_CNT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntCd)">
+				ADIT_DSCNT_CD,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntAmt)">
+				ADIT_DSCNT_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dscntMxmmAmt)">
+				DSCNT_MXMM_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlCd)">
+				MLG_ACCML_CD,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlAmt)">
+				MLG_ACCML_AMT,
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgValidMtCnt)">
+				MLG_VALID_MT_CNT,
+		</if>
+		<![CDATA[
 				USE_AT,
 				REGUSR,
 				REGIST_DT,
 				UPDUSR,
 				UPDT_DT
-			) SELECT
+		) VALUES (
 				#{seq},
 				#{sopmalCd},
 				#{evtInnb},
 		]]>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnCnt)">
-						REPLACE(#{bgnCnt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endCnt)">
-						REPLACE(#{endCnt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnAmt)">
-						REPLACE(#{bgnAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endAmt)">
-						REPLACE(#{endAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(provdCnt)">
-						#{provdCnt},
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntCd)">
-						#{aditDscntCd},
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntAmt)">
-						REPLACE(#{aditDscntAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dscntMxmmAmt)">
-						REPLACE(#{dscntMxmmAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlCd)">
-						#{mlgAccmlCd},
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlAmt)">
-						REPLACE(#{mlgAccmlAmt}, ',', ''),
-					</if>
-					<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgValidMtCnt)">
-						REPLACE(#{mlgValidMtCnt}, ',', ''),
-					</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnCnt)">REPLACE(#{bgnCnt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endCnt)">REPLACE(#{endCnt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(bgnAmt)">
+				REPLACE(#{bgnAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(endAmt)">
+				REPLACE(#{endAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(provdCnt)">
+				#{provdCnt},
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntCd)">
+				#{aditDscntCd},
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(aditDscntAmt)">
+				REPLACE(#{aditDscntAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(dscntMxmmAmt)">
+				REPLACE(#{dscntMxmmAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlCd)">
+				#{mlgAccmlCd},
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgAccmlAmt)">
+				REPLACE(#{mlgAccmlAmt}, ',', ''),
+		</if>
+		<if test="@com.wb.domainserver.util.dataaccess.MybaitsUtil@isNotEmpty(mlgValidMtCnt)">
+				REPLACE(#{mlgValidMtCnt}, ',', ''),
+		</if>
 		<![CDATA[
 				'Y',
 				#{regusr},
 				SYSDATE(),
 				#{updusr},
 				SYSDATE()
-			FROM
-			 	GC_EVENT_BENEFITS
-			 	ON DUPLICATE KEY UPDATE
-					BGN_CNT = VALUES(BGN_CNT),
-					END_CNT = VALUES(END_CNT),
-					BGN_AMT = VALUES(BGN_AMT),
-					END_AMT = VALUES(END_AMT),
-					PROVD_CNT = VALUES(PROVD_CNT),
-					ADIT_DSCNT_CD = VALUES(ADIT_DSCNT_CD),
-					ADIT_DSCNT_AMT = VALUES(ADIT_DSCNT_AMT),
-					DSCNT_MXMM_AMT = VALUES(DSCNT_MXMM_AMT),
-					MLG_ACCML_CD = VALUES(MLG_ACCML_CD),
-					MLG_ACCML_AMT = VALUES(MLG_ACCML_AMT),
-					MLG_VALID_MT_CNT = VALUES(MLG_VALID_MT_CNT),
-					REGUSR = VALUES(REGUSR),
-					UPDUSR = VALUES(UPDUSR),
-					UPDT_DT = VALUES(UPDT_DT)
+		)
+		ON DUPLICATE KEY UPDATE
+			BGN_CNT = VALUES(BGN_CNT),
+			END_CNT = VALUES(END_CNT),
+			BGN_AMT = VALUES(BGN_AMT),
+			END_AMT = VALUES(END_AMT),
+			PROVD_CNT = VALUES(PROVD_CNT),
+			ADIT_DSCNT_CD = VALUES(ADIT_DSCNT_CD),
+			ADIT_DSCNT_AMT = VALUES(ADIT_DSCNT_AMT),
+			DSCNT_MXMM_AMT = VALUES(DSCNT_MXMM_AMT),
+			MLG_ACCML_CD = VALUES(MLG_ACCML_CD),
+			MLG_ACCML_AMT = VALUES(MLG_ACCML_AMT),
+			MLG_VALID_MT_CNT = VALUES(MLG_VALID_MT_CNT),
+			REGUSR = VALUES(REGUSR),
+			UPDUSR = VALUES(UPDUSR),
+			UPDT_DT = VALUES(UPDT_DT)
 		]]>
 	</insert>
 

src/main/resources/mybatis/xml/mapper/gcone/setup/ordrmngr/BOOrdrmngrMapper.xml

@@ -42,7 +42,12 @@
     <!--주문 설정  수정-->
     <update id="updateBOOrdrSetup">
         UPDATE GC_SHOP
-        SET MLG_PYMNT_AT = #{mlgPymntAt},
+        SET CASH_AT = IFNULL(#{cashAt},'N'),
+            MULTI_DLVY_AT = IFNULL(#{multiDlvyAt},'N'),
+            FDRM_DLVY_AT = IFNULL(#{fdrmDlvyAt},'N'),
+            GIFT_DLVY_AT = IFNULL(#{giftDlvyAt},'N'),
+            GIFT_DLVY_ATMC_CANCL_PD = #{giftDlvyAtmcCanclPd},
+            MLG_PYMNT_AT = #{mlgPymntAt},
             MLG_PYMNT_DV_CD = #{mlgPymntDvCd},
             MLG_PYMNT_RT = REPLACE(#{mlgPymntRt},',',''),
             MLG_MXMM_PYMNT_AMT = REPLACE(#{mlgMxmmPymntAmt},',',''),
@@ -63,11 +68,13 @@
                     MLG_VALID_PD_AT = 'Y',
                 </otherwise>
             </choose>
-            CASH_AT = IFNULL(#{cashAt},'N'),
-            MULTI_DLVY_AT = IFNULL(#{multiDlvyAt},'N'),
-            FDRM_DLVY_AT = IFNULL(#{fdrmDlvyAt},'N'),
-            GIFT_DLVY_AT = IFNULL(#{giftDlvyAt},'N'),
-            GIFT_DLVY_ATMC_CANCL_PD = #{giftDlvyAtmcCanclPd}
+            MLG_HOLD_USE_AMT = #{mlgHoldUseAmt},
+            MLG_SETLE_AMT_USE_AMT = #{mlgSetleAmtUseAmt},
+            MLG_MUMM_USE_AMT = #{mlgMummUseAmt},
+            MLG_MXMM_USE_DV = #{mlgMxmmUseDv},
+            MLG_MXMM_USE_AMT = #{mlgMxmmUseAmt},
+            UPDUSR = #{updusr},
+            UPDT_DT = SYSDATE()
         WHERE SOPMAL_CD = #{sopmalCd}
     </update>
 

src/main/resources/secured-config.yml

@@ -10,6 +10,9 @@ secured:
         - /sopmal/mpage/bnef/**
         - /sopmal/mpage/mbr/**
         - /sopmal/bnft/**
+        - /sopmal/ordr/selectSpbk
+        - /sopmal/ordr/selectMbrPurchsForm
+        - /sopmal/ordr/selectSubsvcPurchsForm
     admin:
       anonmymous:
       # 로그인 없이 접근가능한 uri없음

src/main/resources/static/js/dlvylc/dlvylc.js

@@ -39,6 +39,20 @@ const fn_save_dftDlvylcAt = function (msg, adbkInnb) {
         });
     }
 }
+
+/**********************************************
+ 리턴 formId 세팅
+ ***********************************************/
+let formIdSave;
+const fn_set_formId = function (formId) {
+    if (formId !== ''){
+        formIdSave = formId;
+    } else {
+        formId = formIdSave;
+    }
+
+    return formId;
+}
 /**********************************************
  배송지 관리 팝업  ()
  ***********************************************/
@@ -46,7 +60,9 @@ const fn_move_dlvylc_manage_pop = function (pageIndex,callback, formId = '') {
     if (callback == undefined) {
         callback = 'fn_set_dlvylc';
     }
+    formId = fn_set_formId(formId);
     console.log("배송지 관리 팝업 : ", formId);
+
     $.ajax({
         type: 'post',
         url: '/sopmal/mpage/mbr/selectDlvylcManagePopup',
@@ -77,7 +93,9 @@ const fn_move_dlvylc_manage_full = function (pageIndex, callback, formId = '') {
     if (callback == undefined) {
         callback = 'fn_set_dlvylc';
     }
+    formId = fn_set_formId(formId);
     console.log("모바일 배송지 팝업 formId : ", formId);
+
     $.ajax({
         type: 'post',
         url: '/sopmal/mpage/mbr/selectDlvylcManagePopup',

src/main/resources/static/js/mngr/css/style.css

@@ -3512,7 +3512,10 @@ gap-0 {
   height: 20px;
   padding: 0 8px;
   border-radius: 40px;
-  background-color: #b1b6b9;
+  /*background-color: #b1b6b9;*/
+  color: #5c7cfa;
+  background-color: #fcfdff;
+  border: 1px solid #5c7cfa;
   font-weight: 500;
 }
 .product-badge.new {

src/main/resources/static/js/mngr/gcone.js

@@ -1850,6 +1850,47 @@ function validateInput(input, opts = {}) {
     });
 }
 
+/************************************************************
+ form데이터 sealize 후 json 스트링 형태로 전환
+ ************************************************************ */
+function queryToJson(queryString) {
+    let jsonObj = {};
+    let pairs = queryString.split("&");
+
+    $.each(pairs, function (index, pair) {
+        let [key, value] = pair.split("=");
+        if(!fn_is_empty(value)){
+            jsonObj[key] = value ? decodeURIComponent(value) : "";
+        }
+    });
+    const jsonStr = JSON.stringify(jsonObj);
+    return jsonStr;
+}
+
+/************************************************************
+ 치환코드 입력
+ * @param eventObj : 클릭객체
+ * @param closestSelector : 가까운 객체
+ * @param targetTextAreaSelector : textarea타겟대상
+ * @property obj : 클릭한 객체
+ * @property existingVal : 기존 텍스트 아리아 값
+ * @property addStr : 추가할 치환 코드
+ * @description 치환 문자 td 클래스에 subst 클래스 부여
+ ************************************************************ */
+function fn_set_substituon_in_texatarea(eventObj, closestSelector, targetTextAreaSelector) {
+    const obj = $(eventObj);
+    let existingVal = $("#"+targetTextAreaSelector).val();
+    let addStr;
+    const addStrT = obj.closest(closestSelector).find(".subst").text();
+    const addStrV = obj.closest(closestSelector).find(".subst").val();
+    if(!fn_is_empty(addStrT)){
+        addStr = addStrT;
+    }else{
+        addStr = addStrV;
+    }
+    existingVal = existingVal + " " +addStr;
+    $("#"+targetTextAreaSelector).val(existingVal);
+}
 
 /* ************************************************************
 *   인피니티 스크롤 공통 처리 (footer가 보이면 callback함수 호출)

src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js

@@ -72,6 +72,20 @@ const fn_select_recentDlvylcList = function (pageIndex, ordering) {
         }
     });
 }
+
+/**********************************************
+ 리턴 formId 세팅
+ ***********************************************/
+let formIdSave;
+const fn_set_formId = function (formId) {
+    if (formId !== ''){
+        formIdSave = formId;
+    } else {
+        formId = formIdSave;
+    }
+
+    return formId;
+}
 /**********************************************
  배송지 관리 팝업  (처음 호출 할 때)
  ***********************************************/
@@ -82,6 +96,8 @@ const fn_move_dlvylc_manage_pop = function (pageIndex, mbrInnb, mbrDvCd, callbac
     if (callback == undefined) {
         callback = fn_set_dlvylc;
     }
+    formId = fn_set_formId(formId);
+
     $.ajax({
         type: 'post',
         url: '/crm/dlvylc/selectRpuseDlvylcListInqire',

src/main/resources/static/login/sopmall/mobile/css/default.css

@@ -775,7 +775,10 @@ caption {
   height: 18px;
   padding: 0 8px;
   border-radius: 40px;
-  background-color: #b1b6b9;
+  /*background-color: #b1b6b9;*/
+  color: #5c7cfa;
+  background-color: #fcfdff;
+  border: 1px solid #5c7cfa;
   font-weight: 500;
 }
 .product-badge.new {
@@ -10239,6 +10242,12 @@ body {
   font-weight: 400;
   color: #495057;
 }
+.deliveryInfo__cstmclerCd {
+  margin-bottom: 10px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #495057;
+}
 .deliveryInfo__message {
   display: flex;
   width: 100%;

src/main/resources/static/login/sopmall/pc/css/default.css

@@ -554,7 +554,10 @@ caption {
   height: 20px;
   padding: 0 8px;
   border-radius: 40px;
-  background-color: #b1b6b9;
+  /*background-color: #b1b6b9;*/
+  color: #5c7cfa;
+  background-color: #fcfdff;
+  border: 1px solid #5c7cfa;
   font-weight: 500;
 }
 .product-badge.new {
@@ -4634,6 +4637,12 @@ CORE STYLES ABOVE - NO TOUCHY
   position: relative;
   margin-bottom: 56px;
 }
+.sub-right-content__section__btn {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
 .sub-right-content__halfSection {
   position: relative;
   margin-bottom: 56px;

src/main/resources/static/mngr/css/style.css

@@ -3512,7 +3512,10 @@ gap-0 {
   height: 20px;
   padding: 0 8px;
   border-radius: 40px;
-  background-color: #b1b6b9;
+  /*background-color: #b1b6b9;*/
+  color: #5c7cfa;
+  background-color: #fcfdff;
+  border: 1px solid #5c7cfa;
   font-weight: 500;
 }
 .product-badge.new {

src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js

@@ -72,6 +72,20 @@ const fn_select_recentDlvylcList = function (pageIndex, ordering) {
         }
     });
 }
+
+/**********************************************
+ 리턴 formId 세팅
+ ***********************************************/
+let formIdSave;
+const fn_set_formId = function (formId) {
+    if (formId !== ''){
+        formIdSave = formId;
+    } else {
+        formId = formIdSave;
+    }
+
+    return formId;
+}
 /**********************************************
  배송지 관리 팝업  (처음 호출 할 때)
  ***********************************************/
@@ -82,6 +96,8 @@ const fn_move_dlvylc_manage_pop = function (pageIndex, mbrInnb, mbrDvCd, callbac
     if (callback == undefined) {
         callback = fn_set_dlvylc;
     }
+    formId = fn_set_formId(formId);
+
     $.ajax({
         type: 'post',
         url: '/crm/dlvylc/selectRpuseDlvylcListInqire',

src/main/resources/static/mobile/css/default.css

@@ -784,7 +784,10 @@ caption {
   height: 18px;
   padding: 0 8px;
   border-radius: 40px;
-  background-color: #b1b6b9;
+  /*background-color: #b1b6b9;*/
+  color: #5c7cfa;
+  background-color: #fcfdff;
+  border: 1px solid #5c7cfa;
   font-weight: 500;
 }
 .product-badge.new {