결제 - 키움결제 적용 3차

(cherry picked from commit 8fd58d80b0)

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_WAS_SERVER_IP', choices: ['10.2.0.129'], description: 'WAR 배포할 서버IP 선택'),
-                                    choice(name: 'DEPLOY_WEB_SERVER_IP', choices: ['00.00.00.00'], description: 'STATIC RESOURCE 배포할 서버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: '배포 대상 선택')

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

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

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

@@ -419,8 +419,15 @@ public class BOMaMtngService {
 		//상품별 총 구매갯수 합계
 		Map<String, Integer> qySums = goodsList.stream()
 				.collect(Collectors.groupingBy(
+						goods -> {
 							// goodsInnb기준 키로 묶음
-						goods -> goods.get("goodsInnb").toString(),
+							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()))
 				));

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/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("분류 olddvItmInnbsArr : {}", (Object) olddvItmInnbsArr);
-						log.debug("분류 qesitmInnb_d : {}", qesitmInnb_d);
+						log.debug("분류 qesitmInnb_d : {}", (Object) qesitmInnb_d);
-						log.debug("분류 qesitmNm_d : {}", qesitmNm_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("필수 {}", (Object) vo.getQesitmEssntlAt_i());
-				log.debug("사용 {}", vo.getQesitmUseAt_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/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/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(){{
@@ -2296,15 +2298,16 @@ public class BOPurchsService {
 
                             BigDecimal goodsQy = new BigDecimal(0);
 
+                            // 수량 조건
+                            if ("Y".equals(cntCndUseAt) && cntCndAditAmt.compareTo(BigDecimal.ZERO) > 0) {
+
                                 for (DataMap goodsMap : goodsByDlvyGroupList) {
 
                                     BigDecimal qy = (BigDecimal) goodsMap.get("qy"); // 수량
 
-                                // 수량 조건
-                                if ("Y".equals(cntCndUseAt)) {
-
                                     qy = (BigDecimal) goodsMap.get("qy"); // 수량
 
+                                    //  cntCndAditAmt(설정수량)보다 qy가 큰 경우
                                     if (qy.compareTo(cntCndAditAmt) > 0) {
                                         goodsQy = qy.divide(cntCndAditAmt, 0, RoundingMode.CEILING);
                                         //배송비 합(같은상품 수량당 배송비 책정)
@@ -2328,9 +2331,11 @@ public class BOPurchsService {
                                             }
                                         }
                                     }
+                                }   //for
                             } else {
                                 //수량 조건 없는 경우
                                 paidDlvyAmt = paidDlvyAmt.add(dlvyAmt); // 유료배송비 합
+
                                 // 추가배송비 계산
                                 if (!StringUtils.isEmpty(dlvyAreaAditAt) && "Y".equals(dlvyAreaAditAt)) {
                                     if (!StringUtils.isEmpty(defaultAdressAt) && "Y".equals(defaultAdressAt)) {
@@ -2338,7 +2343,7 @@ public class BOPurchsService {
                                     }
                                 }
                             }
-                            }   //for
+
                         } else {
                             dlvyAmt = new BigDecimal(0);
                             dftDlvyAmt = new BigDecimal(0);

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/vo/BOSubsvcVO.java

@@ -37,7 +37,7 @@ private static final long serialVersionUID = 1L;
 	/** 소비자가 */
 	private String cnsmrpric;
 	/** 판매가 */
-	private String slepric;
+	private Integer slepric;
 	/** 재고수량 */
 	private String invntryQy;
 	/** 판매재고수량 */
@@ -99,4 +99,60 @@ private static final long serialVersionUID = 1L;
 	private String sortDv;
 	/** 배열 구독서비스고유번호  */
 	private List<String> arrSubsvcInnb;
+
+
+	/** 결제정보 */
+	/** 회원고유번호 */
+	private Integer mbrInnb;
+	/** 회원구분코드 */
+	private String mbrDvCd;
+
+
+	/** 결제상품정보 */
+	/** 판매상품 고유번호 */
+	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/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.*;
 
@@ -335,6 +336,8 @@ public interface BOOrdrMapper {
      */
     public List<DataMap> selectOrderShippingList(BOOrdrShippingVO ordrShippingVO);
 
+    public List<DataMap> selectOrderShippingListGrp(BOOrdrShippingVO ordrShippingVO);
+
     /**
      * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 상품 목록 조회
      * @param paramMap
@@ -349,6 +352,13 @@ public interface BOOrdrMapper {
      */
     public List<DataMap> selectRefundShippingGoodsList(DataMap paramMap);
 
+    /**
+     * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정 > 배송지정보 일치여부 확인
+     * @param ordrShippingVO
+     * @return Integer
+     */
+    public Integer selectDlvylcAreaCdInfo(BOOrdrShippingVO ordrShippingVO);
+
     /**
      * 관리자 > 주문 > 주문관리 > 전체 주문 조회 > 전체주문상세 > 배송지정보 수정
      * @param ordrShippingVO
@@ -662,6 +672,8 @@ public interface BOOrdrMapper {
      */
     public DataMap selectBOSpbkGiftMultiDlvyAt(BOSpbkVO spbkVO);
 
+    public BigDecimal selectBuyRate(DataMap param);
+
     /**
      * 사용자 > 상품 > 장바구니 > 장바구니 상품 삭제
      * @param goodsVO
@@ -982,6 +994,35 @@ 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);
 }
 
 

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

@@ -81,7 +81,8 @@ 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", "출고상태");
 
         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);
 	}
 
 	/* ============================================================================== */
@@ -1467,10 +1469,94 @@ public class BOPayService{
 	}
 
 
+	/* ============================================================================== */
+    /* =   여기서 부터 Kiwoom
+    /* = -------------------------------------------------------------------------- = */
+
+	/**
+	 * Kiwoom 결제
+	 * @param BOPayVO
+	 */
+	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 url = "https://apitest.kiwoompay.co.kr/pay/hash";
+			URL goUrl = new URL(url);
 
+			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());
+		}};
+	}
 
 
 

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

@@ -31,6 +31,7 @@ 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.string.StringUtil;
+import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -249,7 +250,6 @@ public class BORtngudrefndService {
 
 
 		try {
-
 			if (boRtngudrefndVO.getRefundProcsSttusCd() != null) {
 
 				if (boRtngudrefndVO.getReturnCstmrTelnb() != null) {
@@ -278,28 +278,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 +323,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 +333,8 @@ public class BORtngudrefndService {
 						}
 
 						mapper.updateBOOrderReSttusUpdt(boRtngudrefndVO); // 반품/환불 상태값 수정
+						/* 한화금액이 결제금액보다 많은지 체크하여 환불금액(원화) update */
+						ordrMapper.updateBOWonRefundAmt(refundVO);
 
 					} else if ( "03".equals(boRtngudrefndVO.getRefundProcsSttusCd()) && "02".equals(boRtngudrefndVO.getReturnProcsSttusCd()) ) { // 상품 받은거 확인하고
 
@@ -466,21 +480,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 +534,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 +561,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 +601,23 @@ public class BORtngudrefndService {
 
 							log.info("setle : {}", setle);
 							Integer setleAmt = setle.getSetleAmt(); // 결제금액
+							Integer wonSetleAmt = setle.getWonSetleAmt(); // 결제금액(원화)
+
 							Integer remMnyAmt = setleAmt - orderRefundAmtSum;
-							log.info("이번 환불 결제건에서 환불할 금액 확인 remMnyAmt : {}", remMnyAmt);
+							Integer wonRemMnyAmt = wonSetleAmt - wonOrderRefundAmtSum;
-							log.info("이번 환불 결제건에서 환불할 금액 확인 refundAmt : {}", refundAmt);
+
-							log.info("이번 환불 결제건에서 환불할 금액 확인 orderRefundAmtSum : {}", orderRefundAmtSum);
+							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 +777,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,8 +832,6 @@ public class BORtngudrefndService {
 
 								// TODO :
 
-							} else if ("08".equals(setle.getSetleTyCd())) { // 마일리지
-								// 마일리지 사용취소로 처리
 							}  else if ("09".equals(setle.getSetleTyCd())) {
 								// 포스 환불은 포스기계쪽에서 처리됌 GCONE 에서는 데이터 처리만 진행
 							} else if ("11".equals(setle.getSetleTyCd())) { // TODO : 복합 결제 취소 로직 확인 필요
@@ -812,9 +854,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 +883,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 +1028,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 +1036,8 @@ public class BORtngudrefndService {
 
 									payVO.setTno(setle.getDelngNb()); // 거래번호
 									payVO.setModType(refundModeType); // 전체 취소, 부분 취소
-									payVO.setModMny(String.valueOf(cancelAmt)); // 부분취소 요청 금액
+									payVO.setModMny(String.valueOf(wonCancelAmt)); // 부분취소 요청 금액
-									payVO.setRemMny(String.valueOf(remMnyAmt)); // 부분취소 가능 금액
+									payVO.setRemMny(String.valueOf(wonRemMnyAmt)); // 부분취소 가능 금액
 
 									payVO.setSubModType(sub_mod_type); // 전체 취소, 부분 취소
 
@@ -1202,6 +1246,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);

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));
@@ -326,7 +326,7 @@ public class BOPurchsEvtService {
 
 
 				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));

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());
 

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/OrdrController.java

@@ -20,30 +20,27 @@ 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.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;
@@ -51,9 +48,6 @@ 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;
@@ -65,7 +59,6 @@ import lombok.extern.slf4j.Slf4j;
 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,7 +67,10 @@ 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;
@@ -136,6 +132,10 @@ public class OrdrController {
     private BOMaMtngService boMaMtngService;
     @Autowired
     private BOPurchsService boPurchsService;
+    @Autowired
+    private BOSubsvcService subsvcService;
+    @Autowired
+    private BOPayService payService;
 
     /* ####################################
        사용자 > 상품 > 구매/결제 > 회원구매하기 시작
@@ -399,6 +399,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"))?"01":"02");
+
+        //약관정보 세팅
+        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
+//        );
+    }
+
 
     /**
      * 관리자 주문 > 브랜드페이 > 토큰발급
@@ -663,6 +793,21 @@ 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)
@@ -692,7 +837,9 @@ public class OrdrController {
            String pgCmpnyNm = setle.getPgCmpnyNm();
            String setleTyCd = setle.getSetleTyCd();
 
-            if ("gcpay".equals(pgCmpnyNm)) {
+            if ("kiwoom".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)) {
@@ -922,7 +1069,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);
@@ -943,6 +1090,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";
     }
@@ -1034,19 +1187,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");
@@ -1244,6 +1384,154 @@ public class OrdrController {
         return "sopmal/ordr/OrdrRspnsTossPayR";
     }
 
+
+    /**
+     * 키움 결제 연계 전 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 = payService.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;
+    }
+
+
+    /**
+     * 사용자 > 상품 > 구매/결제 > 회원구매하기 > 키움 결제 정보 등록
+     * @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"));
+        payVO.setSetlerNm(request.getParameter("ordrrNm"));
+
+        log.info("insertKiwoomSetle controller payVO ::: {}", 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);
+//        responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/ordr/insertBOTosspaySetle", payVO),
+//                model,
+//                "data"
+//        );
+        model.addAttribute("paramVO", payVO);
+
+        return "sopmal/ordr/OrdrRspnsKiwoomPayR";
+    }
+
+
     /**
      * 사용자 > 상품 > 구매/결제 > 회원구매하기 > 주문완료 화면 이동
      * @return OrdrComptR.jsp
@@ -2981,6 +3269,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){
@@ -3009,13 +3299,7 @@ public class OrdrController {
                 return content;
             }
         } else {
-//            if (CollectionUtils.isEmpty(multiOrdrDlvylc)) {
+            // 여러곳배송처럼 처리하더라도 주소는 하나이므로 shipping 체크
-//                log.info("배송지 정보를 찾을 수 없습니다.");
-//                content.put("result","Y");
-//                content.put("message", "배송지 정보를 찾을 수 없습니다.");
-//                //            throw new WnbtRestException("주문유형 정보를 찾을 수 없습니다.");
-//                return content;
-//            }
             if (CollectionUtils.isEmpty(shipping)) {
                 log.info("배송지 정보를 찾을 수 없습니다.");
                 content.put("result","Y");
@@ -3032,8 +3316,7 @@ public class OrdrController {
             return content;
         }
 
-
+        if (!isSubsvc && CollectionUtils.isEmpty(enuri)) {
-        if (CollectionUtils.isEmpty(enuri)) {
             log.info("할인 또는 결제 정보를 찾을 수 없습니다.");
             content.put("result","Y");
             content.put("message", "할인 또는 결제 정보를 찾을 수 없습니다.");
@@ -3043,7 +3326,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");
 
@@ -3052,70 +3335,6 @@ public class OrdrController {
         String[] receptMbtlnbArray = null; // 배송지 받는이 휴대폰번호
 
         if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원개인결제, 정기배송
-//            if (!CollectionUtils.isEmpty(multiOrdrDlvylc)) {
-//
-//                // 배송지 리스트
-//                List<LinkedHashMap<String, Object>> dlvylcListMulti = (List<LinkedHashMap<String, Object>>) multiOrdrDlvylc.get("dlvylc");
-//
-//                /** ----------------------------------------------- 배송지별 주문 상품 수량 검사 START ----------------------------------------------- */
-//                content = checkDistributedQyMatchesOrder(goodsList, dlvylcListMulti);
-//                if (!"0".equals(content.get("status"))) {
-//                    return content;
-//                }
-//                /** ----------------------------------------------- 배송지별 주문 상품 수량 검사 END ----------------------------------------------- */
-//
-//                // 부정판매 체크를 위한 배송지 정렬
-//                if (!CollectionUtils.isEmpty(dlvylcListMulti)) {
-//
-//                    boolean hasInvalidAddress = dlvylcListMulti.stream().anyMatch(map -> {
-//                        String dlvylcZip = StringUtil.isNullToString(map.get("dlvylcZip"));
-//                        String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
-//                        String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
-//                        String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
-//                        String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
-//
-//                        return StringUtil.isEmpty(dlvylcZip)
-//                                || StringUtil.isEmpty(adresDvCd)
-//                                || ("01".equals(adresDvCd) && StringUtil.isEmpty(dlvylcRnmAdres))
-//                                || ("02".equals(adresDvCd) && StringUtil.isEmpty(dlvylcLnbAdres))
-//                                || StringUtil.isEmpty(adresDtl);
-//                    });
-//
-//                    if (hasInvalidAddress) {
-//                        content.put("result","Y");
-//                        content.put("message", "배송지 정보를 찾을 수 없습니다. 다시 시도해 주세요.");
-//                        return content;
-//                    }
-//
-//                    List<String> adresList = dlvylcListMulti.stream()
-//                            .map(map -> {
-//                                String adresDvCd = StringUtil.isNullToString(map.get("dlvylcAdresDvCd"));
-//                                String adresDtl = StringUtil.isNullToString(map.get("dlvylcAdresDtl"));
-//                                String dlvylcLnbAdres = StringUtil.isNullToString(map.get("dlvylcLnbAdres"));
-//                                String dlvylcRnmAdres = StringUtil.isNullToString(map.get("dlvylcRnmAdres"));
-//                                String adresMulti;
-//                                if ("01".equals(adresDvCd)) {
-//                                    adresMulti = dlvylcRnmAdres + " " + adresDtl;
-//                                } else {
-//                                    adresMulti = dlvylcLnbAdres + " " + adresDtl;
-//                                }
-//
-//                                return adresMulti;
-//                            })
-//                            .collect(Collectors.toList());
-//
-//                    adresArray = adresList.toArray(new String[0]);
-//
-//                    List<String> receptMbtlnbList = dlvylcListMulti.stream()
-//                            .map(map -> {
-//                                return StringUtil.isNullToString(map.get("recpntMbtlnb"));
-//                            })
-//                            .collect(Collectors.toList());
-//
-//                    receptMbtlnbArray = receptMbtlnbList.toArray(new String[0]);
-//
-//                }
-//            }
             if (
                     StringUtil.isEmpty((String) shipping.get("dlvylcZip")) ||
                             StringUtil.isEmpty((String) shipping.get("dlvylcAdresDvCd")) ||
@@ -3241,17 +3460,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)
@@ -3260,6 +3489,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.*;
-import java.util.HashMap;
-import java.util.Map;
 
 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.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import  com.wb.domainserver.domain.sopmal.ordr.vo.PayVO;
@@ -630,4 +626,219 @@ 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="/selectKiwoomSample2")
+    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="/kiwoomPayWebhook")
+    @ResponseBody
+    public ResponseEntity<String> selectPaymentkiwoomWebhook(HttpServletRequest request) throws Exception {
+
+        String resultCode = request.getParameter("RESULTCODE");
+        String orderNo    = request.getParameter("ORDERNO");
+        String amount     = request.getParameter("AMOUNT");
+
+        printKiwoomRequest(request);
+
+        /*  실제 처리해야 되는 부분
+        // 1. 주문 조회
+        Order order = orderService.find(orderNo);
+
+        // 2. 중복 방지
+        if ("PAID".equals(order.getStatus())) return "OK";
+
+        // 3. 금액 검증
+        if (!order.getAmount().equals(Integer.parseInt(amount))) {
+            order.setStatus("FAIL");
+            return "OK";
+        }
+
+        // 4. 성공 처리
+        if ("0000".equals(resultCode)) {
+            order.setStatus("PAID");
+        } else {
+            order.setStatus("FAIL");
+        }
+
+        orderService.save(order);
+*/
+        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.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();
+        }
+    }
+
+
+    /**
+     * 키움 결제 연계처리  - 성공결과페이지
+     * @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<>();
+        /*String sopmalCd = payVO.getSopmalCd();
+        try {
+            message = service.insertKcpPay(payVO);
+
+        } catch (Exception e) {
+            message = new HashMap<>() {{
+                put("response", "결제를 실패하였습니다.\n관리자에게 문의하시기 바랍니다.");
+            }};
+        }*/
+
+        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);
+//        responseHandler.handleResponse(
+//                sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/ordr/pay/kcpPayProc", payVO),
+//                model,
+//                "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
+        doc: /data/gcone/docFile
-        web: /webFile
+        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: 円(엔)
+  default: 円
-  JP: 円(엔)
+  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
+      cdnurl: https://19d28cf7178139ad.kinxzone.com
-      upurl: https://www.soju1sake1.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: 円(엔)
+  default: 円
-  JP: 円(엔)
+  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:
@@ -449,6 +449,6 @@ api:
   DATA_ENCRYPT_AES_KEY: "Z8zKbHyMKn+iwD3O0PLT9g=="
 
 currency-unit:
-  default: 円(엔)
+  default: 円
-  JP: 円(엔)
+  JP: 円
   KR: 원

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}
@@ -386,7 +398,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 +437,10 @@
                                     , #{ordrSttusCd}
                                     , #{recpntNm}
                                     , HEX(AES_ENCRYPT(REPLACE(#{recpntMbtlnb}, '-', ''), '1df5be2f7e90ae36'))
+                                    , #{dlvylcAreaCd}
+                                    , #{cstmclerCd}
                                     , #{dlvylcZip}
+                                    , #{prefcd}
                                     , #{dlvylcAdresDvCd}
                                     , #{dlvylcLnbAdres}
                                     , #{dlvylcRnmAdres}
@@ -461,6 +479,7 @@
                                  , SOPMAL_CD
                                  , ORDR_INNB
                                  , SETLE_AMT
+                                 , WON_SETLE_AMT
                                  , PG_CMPNY_NM
                                  , SETLE_TY_CD
                                  , PG_INNB
@@ -485,6 +504,7 @@
                                  , #{sopmalCd}
                                  , #{ordrInnb}
                                  , #{setleAmt}
+                                 , #{wonSetleAmt}
                                  , #{pgCmpnyNm}
                                  , #{setleTyCd}
                                  , #{pgInnb}
@@ -1280,6 +1300,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}
@@ -2673,6 +2694,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

@@ -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>
 
@@ -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
+				, GS.SUBSVC_INNB
-				, GC.SOPMAL_CD
+				, GS.SOPMAL_CD
-				, GC.SUBSVC_NM
+				, CONCAT(GS.SUBSVC_NM, ' (', GS.SUBSVC_GNR_NM, ')') AS SUBSVC_CONCAT_NM
-				, GC.SUBSVC_GNR
+				, GS.SUBSVC_NM
-				, GC.SUBSVC_GNR_NM
+				, GS.SUBSVC_GNR
-				, GC.DLVY_CNT
+				, GS.SUBSVC_GNR_NM
-				, GC.INVNTRY_QY
+				, GS.DLVY_CNT
-				, GC.INVNTRY_QY - GC.USEFUL_INVNTRY_QY AS AVAIL_QT		/*가용제고*/
+				, GS.INVNTRY_QY
-				, GC.SUBSVC_STTUS_CD
+				, GS.INVNTRY_QY - GS.USEFUL_INVNTRY_QY AS AVAIL_QT		/*가용제고*/
-				, FN_GET_COMMCODE_NAME('GOODS_STTUS', GC.SUBSVC_STTUS_CD) AS SUBSVC_STTUS		/*구독서비스 상태*/
+				, GS.SUBSVC_STTUS_CD
-				, FN_GET_COMMCODE_NAME('EXPSR_DV', GC.EXPSR_DV_CD) AS EXPSR_DV				/*노출구분*/
+				, FN_GET_COMMCODE_NAME('GOODS_STTUS', GS.SUBSVC_STTUS_CD) AS SUBSVC_STTUS		/*구독서비스 상태*/
-				, GC.SUBSVC_CT			/*구독료*/
+				, FN_GET_COMMCODE_NAME('EXPSR_DV', GS.EXPSR_DV_CD) AS EXPSR_DV				/*노출구분*/
-				, GC.TME_DLVY_AMT		/*1회배송비*/
+				, GS.SUBSVC_CT			/*구독료*/
-				, GC.CNSMRPRIC			/*소비자가*/
+				, GS.TME_DLVY_AMT		/*1회배송비*/
-				, GC.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
+				, GS.CNSMRPRIC			/*소비자가*/
-				, GC.IMG							/*섬네일 이미지*/
+				, GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
-				, GC.LAST_PROCS_ODR				/*최종차수*/
+				, GS.IMG							/*섬네일 이미지*/
-				FROM GC_SUBSVC GC
+				, GS.LAST_PROCS_ODR				/*최종차수*/
-				WHERE GC.USE_AT = 'Y'
+				FROM GC_SUBSVC GS
-				  AND GC.SOPMAL_CD = #{sopmalCd}
+				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,
+						GS.SUBSVC_NM ASC, SUBSVC_GNR ASC,
 					</when>
 				    <otherwise>
-						GC.SUBSVC_NM DESC, SUBSVC_GNR DESC,
+						GS.SUBSVC_NM DESC, SUBSVC_GNR DESC,
 					</otherwise>
 				</choose>
-				GC.SUBSVC_INNB ASC
+				GS.SUBSVC_INNB ASC
 			) TB
 			WHERE (@ROWNUM:=0)=0
 		) PV

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

@@ -744,6 +744,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
@@ -600,6 +607,9 @@
                 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
@@ -1096,6 +1107,7 @@
                         , 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
                  FROM GC_ORDER FO
                     INNER JOIN LATERAL (
                             SELECT   GOI.SOPMAL_CD
@@ -1482,6 +1494,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 +1670,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 +1699,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 +1737,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 +1766,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 +2018,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 +2324,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 +2365,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 +2523,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
@@ -3821,6 +3924,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 +4281,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 +4292,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 +4832,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
+                 , (CASE
-                 , FSG.AMT_CND_USE_AT
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN ROUND(IFNULL(FSG.DFT_DLVY_AMT2, 0), '0')
-                 , ROUND(IFNULL(FSG.AMT_CND_ADIT_AMT, 0), '0') AS AMT_CND_ADIT_AMT
+                        ELSE ROUND(IFNULL(FSG.DFT_DLVY_AMT, 0), '0')
-                 , FSG.CNT_CND_USE_AT
+                    END) AS DFT_DLVY_AMT
-                 , ROUND(IFNULL(FSG.CNT_CND_ADIT_AMT, 0), '0') AS CNT_CND_ADIT_AMT
+                 , (CASE
-                 , FSG.BUNDLE_DLVY_USE_AT
+                        WHEN SH.DLVYLC_AREA_CD = 'JP' THEN FSG.AMT_CND_USE_AT2
-                 , ROUND(IFNULL(FSG.BUNDLE_DLVY_CND_AMT, 0), '0') AS BUNDLE_DLVY_CND_AMT
+                        ELSE FSG.AMT_CND_USE_AT
-                 , FSG.DLVY_AREA_ADIT_AT
+                    END) AS AMT_CND_USE_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.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 +4912,9 @@
         <![CDATA[
             UPDATE GC_ORDER_REFUND
                 SET RETURN_DLVY_AMT = #{returnDlvyAmt}
+                  , 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 +5008,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 +5031,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 +5241,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
@@ -5288,7 +5436,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 +5573,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 +5581,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 +5590,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)
+									WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN
-																							  ELSE RE.REFUND_AMT
+										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
-										  ), 0)
+						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
-					   ), 0) AS ORDER_REFUND_AMT_SUM
 		]]>
 	</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/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/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

@@ -10239,6 +10239,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/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/pc/css/default.css

@@ -1626,6 +1626,19 @@ caption {
   fill: #228be6;
   opacity: 0.9;
 }
+.shipping-apply-btn {
+  background-color: #e0e4e5;
+  color: #252521;
+  border: 1px solid #e0e4e5;
+  padding: 6px 14px;
+  border-radius: 4px;
+  margin-left: 4px;
+  font-weight: 500;
+}
+.shipping-apply-btn:hover {
+  background-color: #d8ddde;
+}
+
 .shipping-modify-btn {
   background-color: #ffffff;
   color: #252521;
@@ -7545,7 +7558,7 @@ main {
 }
 .priceSum__inner {
   display: flex;
-  gap: 24px;
+  gap: 18px;
   align-items: center;
 }
 .priceSum__item {

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

@@ -10239,6 +10239,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/sopmall/pc/css/default.css

@@ -1627,6 +1627,19 @@ caption {
   fill: #228be6;
   opacity: 0.9;
 }
+.shipping-apply-btn {
+  background-color: #e0e4e5;
+  color: #252521;
+  border: 1px solid #e0e4e5;
+  padding: 6px 14px;
+  border-radius: 4px;
+  margin-left: 4px;
+  font-weight: 500;
+}
+.shipping-apply-btn:hover {
+  background-color: #d8ddde;
+}
+
 .shipping-modify-btn {
   background-color: #ffffff;
   color: #252521;

src/main/webapp/WEB-INF/views/admin/store/sopmal/maSopmalU.jsp

@@ -1675,7 +1675,7 @@
                             </tr>
                             <tr>
                                 <th>환율(살때) 일본 1円(엔)기준</th>
-                                <td>
+                                <td colspan="3">
                                     <div class="td-inner">
                                         <div class="input-container">
                                             <input type="text" class="input-text sm right" name="buyRate" id="buyRate" title="1엔 환율(살때)" value="${resultMap.sopmalDetailList[0].buyRate }">
@@ -1683,7 +1683,7 @@
                                         </div>
                                     </div>
                                 </td>
-                                <th>환율(팔때) 일본 1円(엔)기준</th>
+                               <%-- <th>환율(팔때) 일본 1円(엔)기준</th>
                                 <td>
                                     <div class="td-inner">
                                         <div class="input-container">
@@ -1691,7 +1691,7 @@
                                             <span class="input-unit-text">원</span>
                                         </div>
                                     </div>
-                                </td>
+                                </td>--%>
                             </tr>
                             </tbody>
                         </table>

src/main/webapp/WEB-INF/views/comm/crm/Include.jsp

@@ -48,8 +48,8 @@
 <script src="<c:url value='/mngr/vendor/time-picker/timepicker.min.js'/>"></script>
 <script src="<c:url value='/mngr/vendor/dropzone/dropzone.min.js'/>"></script>
 <script src="<c:url value='/crm/js/script.js'/>" defer></script>
-<script src="<c:url value='/js/gcone.js'/>"></script>
+<script src="<c:url value='/js/mngr/gcone.js'/>"></script>
-<script src="<c:url value='/js/fileupload_comm.js'/>"></script>
+<script src="<c:url value='/js/mngr/fileupload_comm.js'/>"></script>
 <script src="<c:url value='/ckeditor/ckeditor.js'/>"></script>
 <script src="<c:url value='/mngr/vendor/chart.js/chart.umd.min.js'/>"></script>
 <script src="<c:url value='/admin/vendor/jstree/jstree.min.js'/>"></script>

src/main/webapp/WEB-INF/views/crm/dlvylc/DlvylcUpdtPopupU.jsp

@@ -14,7 +14,7 @@
 --%>
 <!-- 배송지 모달 -->
 <!-- 배송지 수정-->
-<div id="dlvylcUpdate" class="modal" style="max-width: 480px;">
+<div id="dlvylcUpdate" class="modal" style="max-width: 480px; max-height: 100%;">
     <form id="dlvylcUpdtForm" name="dlvylcUpdtForm" action="<c:url value=" /crm/dlvylc/updateDlvylcUpdt" />" method="post">
     <div class="modal-header">
         <h4>배송지 수정</h4>

src/main/webapp/WEB-INF/views/crm/ordr/MngrOrdrRegistFormC.jsp

@@ -523,7 +523,8 @@
             $(div).find('#' + id + 'Div').show();
 
             if ('ordrTy01' === id || 'ordrTy06' === id) { // 일반주문, 정기배송
-                fn_set_dft_dlvylc(fn_get_mbr('dftDlvylc'), 'dlvylcForm-' + id);
+                // (346361) 상품 추가 or 상품 쿠폰 적용시 배송지 정보가 초기화 되는 문제 방지.
+                // fn_set_dft_dlvylc(fn_get_mbr('dftDlvylc'), 'dlvylcForm-' + id);
             } else if ('ordrTy05' === id) { // 여러곳 배송
                 const mbrInnb = fn_get_mbr_innb();
 
@@ -2318,6 +2319,12 @@
     /* 구매자 > 회원검색(레이어팝업) > 선택 구매자 정보 세팅 */
     const fn_set_apply_purchsr = function() {
         const purchsr = JSON.parse(localStorage.getItem('purchsr'));
+        // 회원 정보 세팅
+        $('#mbrInnb').val(fn_get_mbr_innb());
+        $('#mbrDvCd').val(String(fn_get_mbr_dv_cd()));
+
+        // 기본 배송지로 초기화
+        $('input[name="dlvylcDvCd"]').first().trigger('click');
 
         let tr = '<tr>';
 

src/main/webapp/WEB-INF/views/crm/ordr/OrdrReqstKcpPayR.jsp

@@ -29,7 +29,7 @@
         function create_goodInfo() {
             if(document.order_info.pay_mod.value=='Y') {
                 var chr31 = String.fromCharCode(31);	// ASCII 코드값 31
-                var good_info = "seq=1" + chr31 + "ordr_numb=0001" + chr31 + "good_name=${data.setle.goodsNm}" + chr31 + "good_cntx=2" + chr31 + "good_amtx=${data.setle.setleAmt}";
+                var good_info = "seq=1" + chr31 + "ordr_numb=0001" + chr31 + "good_name=${data.setle.goodsNm}" + chr31 + "good_cntx=2" + chr31 + "good_amtx=${data.setle.wonSetleAmt}";
                 document.order_info.good_info.value = good_info;
             }
         }
@@ -112,7 +112,7 @@
     <!-- ==========  에스크로 필수정보 End ===============================  -->
 
     <input type="hidden" name="good_name" value="${data.setle.goodsNm}"/> <!-- 상품명 -->
-    <input type="hidden" name="good_mny" value="${data.setle.setleAmt}"/> <!-- 결제 금액 -->
+    <input type="hidden" name="good_mny" value="${data.setle.wonSetleAmt}"/> <!-- 결제 금액 -->
     <input type="hidden" name="buyr_name" value="${data.ordr.ordrrNm}"/> <!-- 주문자 이름 -->
     <input type="hidden" name="buyr_mail" value="${data.ordr.ordrrEmail}"/> <!-- 주문자 이메일 -->
     <input type="hidden" name="buyr_tel2" value="${data.ordr.ordrrMbtlnb}"/> <!-- 주문자 휴대폰번호 -->

src/main/webapp/WEB-INF/views/login/login-ADMIN.jsp

@@ -52,7 +52,7 @@
 						<img class="login__logo active" src="/login/admin/images/logo_default.png" alt="gcone">
 					</a>
 				</div>
-<%--				<span class="login__pageTitle__text">통합관리자</span>--%>
+				<span class="login__pageTitle__text">통합관리자</span>
 			</h2>
 			<form id="loginForm">
 				<input type="hidden" id="realm" value="${realm}">

src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsListRForm.jsp

@@ -671,7 +671,7 @@
                                                 <option value="">선택</option>
                                                 <c:if test="${not empty resultMap.dlvyGrpList}">
                                                     <c:forEach var="dlvyGrpInfo" items="${resultMap.dlvyGrpList}">
-                                                        <option value="${dlvyGrpInfo.dlvyGroupDvCd}">${dlvyGrpInfo.dlvyGroupNm}</option>
+                                                        <option value="${dlvyGrpInfo.dlvyGroupInnb}">${dlvyGrpInfo.dlvyGroupNm}</option>
                                                     </c:forEach>
                                                     </c:if>
                                                 </select>

src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailPassivSndngManage.jsp

@@ -25,7 +25,16 @@
 </head>
 <script>
 	$(document).ready(function () {
+		<c:choose>
+			<c:when test="${emailSrchVO != null && emailSrchVO.reqTab eq 'search'}">
+		fn_select_listForm(1);
+			</c:when>
+			<c:otherwise>
 		fn_select_Sndng();
+			</c:otherwise>
+		</c:choose>
+
+
 	});
 
 	/* ********************************************************

src/main/webapp/WEB-INF/views/mngr/ntcn/email/EmailSndngPopupC.jsp

@@ -14,6 +14,7 @@
 	------- -------- ---------------------------
 	2024-05-22 이대환	최초 생성
 --%>
+<spring:eval expression="@environment.getProperty('mail.username')" var="sndrEmail"/>
 <!DOCTYPE html>
 <html lang="ko">
 <head>
@@ -239,8 +240,8 @@
 						<th>보내는 사람</th>
 						<td>
 							<div class="td-inner">
-								<input class="input-text xl" type="text" title="해당 인풋에 대한 설명" name="sndrEmail" id="sndrEmail"
+								<input class="input-text xl" type="text" title="해당 인풋에 대한 설명" name="sndrEmail" id="sndrEmail" value='<c:out value="${sndrEmail}"/>'
-									   placeholder="메일 주소 입력">
+									   placeholder="메일 주소 입력" readonly>
 							</div>
 						</td>
 					</tr>
@@ -264,7 +265,7 @@
 						<th>받는 사람 (직접 입력)</th>
 						<td>
 							<div class="td-inner">
-								<input class="input-text xl" type="text" title="해당 인풋에 대한 설명" name="recpntEmail" id="recpntEmail"
+								<input class="input-text xl" type="text" title="해당 인풋에 대한 설명" name="recpntEmail" id="recpntEmail" value="<c:if test="${emailSrchVO.reqTab eq 'send'}">${emailSrchVO.email}</c:if>"
 									   placeholder="메일 주소는 ,(콤마)로 구분하여 입력">
 							</div>
 						</td>

src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssagePassivSndngManage.jsp

@@ -34,8 +34,14 @@
             }
         })
 
+        <c:choose>
+            <c:when test="${mssageVO != null && mssageVO.reqTab eq 'search'}">
+                fn_select_listForm();
+            </c:when>
+            <c:otherwise>
                 fn_select_Sndng();
-
+            </c:otherwise>
+        </c:choose>
     });
 
 

src/main/webapp/WEB-INF/views/mngr/ntcn/mssage/MssageSndngPopupC.jsp

@@ -24,9 +24,15 @@
 </head>
 <script>
     $(document).ready(function () {
-
+        var reqTab = '${resultMap.mssageVO.reqTab}';
     	fn_preview();
+    	if (reqTab == 'send'){
+            fn_select_Sndng('${resultMap.mssageVO.mbtlnb}');
+        }else if (reqTab == 'search'){
+            fn_select_listForm();
+        }else {
             fn_select_Sndng();
+        }
 
         //특수문자 버튼
    	    $("#special_cont").click(function(){
@@ -55,8 +61,8 @@
     /* ********************************************************
      * 메시지 수동 발송 TAB
      ******************************************************** */
-    const fn_select_Sndng = function () {
+    const fn_select_Sndng = function (mbtlnb) {
-
+        console.log("==========mbtlnb",mbtlnb);
         $.ajax({
             type: 'post',
             url: '/mngr/ntcn/mssage/selectMssagePassivSndng',
@@ -67,6 +73,9 @@
                 $("#selectSndngBtn").addClass("active");
                 $("#selectSndng").addClass("active");
                 $('#selectSndng').html(resultHtml);
+                if (mbtlnb != null){
+                    $('#inputData').text(mbtlnb);
+                }
             }
         });
     }

src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp

@@ -192,9 +192,9 @@
                 }
             },
             error : function(request, status, error) {
-                let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                let message = JSON.parse(request.responseText).resBody.result;
 
-                alert(message.errorMsg);
+                alert(message);
             }
         });
     }
@@ -319,9 +319,9 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -369,9 +369,9 @@
                 }
             },
             error : function(request, status, error) {
-                let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                let message = JSON.parse(request.responseText).resBody.result;
 
-                alert(message.errorMsg);
+                alert(message);
             }
         });
     }
@@ -409,9 +409,9 @@
 
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -482,8 +482,8 @@
                     // fn_move_dtlupdt(parsedResult.dlivyInnb);
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }

src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp

@@ -612,9 +612,9 @@
 					}
 				},
 				error : function(request, status, error) {
-					let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+					let message = JSON.parse(request.responseText).resBody.result;
 
-					alert(message.errorMsg);
+					alert(message);
 				}
 			});
 		}
@@ -643,9 +643,9 @@
 					}
 				},
 				error : function(request, status, error) {
-					let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+					let message = JSON.parse(request.responseText).resBody.result;
 
-					alert(message.errorMsg);
+					alert(message);
 				}
 			});
 		}
@@ -663,9 +663,9 @@
 					if (data.resBody != null) {}
 				},
 				error : function(request, status, error) {
-					let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+					let message = JSON.parse(request.responseText).resBody.result;
 
-					alert(message.errorMsg);
+					alert(message);
 				}
 			});
 		}
@@ -693,9 +693,9 @@
 					}
 				},
 				error : function(request, status, error) {
-					let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+					let message = JSON.parse(request.responseText).resBody.result;
 
-					alert(message.errorMsg);
+					alert(message);
 				}
 			});
 		}
@@ -1570,7 +1570,8 @@
 
 						},
 						error : function(request, status, error) {
-							let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+							let message = JSON.parse(request.responseText).resBody.result;
+							alert(message)
 						}
 					});
 				}

src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupU.jsp

@@ -114,8 +114,7 @@
                                         </div>
                                         <div class="sendOut-info__info-name">
                                             <a href="" class="blue-6 fw-500"><c:out value="${ exList.ordrrNm }"/></a>
-                                            <span style="font-size: 10px;" class="stone-7">▶</span>
+                                            <br><span> [<c:out value="${exList.ordrSttusNm}"/>]</span>
-                                            <span><c:out value="${ exList.recpntNm }"/>님에게 1번째</span>
                                         </div>
                                         <div>
                                             <p class="sendOut-info__info-address">(<c:out value="${ exList.dlvylcZip }"/>)

src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyProcsPopupUForm.jsp

@@ -179,6 +179,15 @@
                                                 </span>
                                         </label>
                                     </c:if>
+                                    <c:if test="${ cdList.cd eq 50 }">
+                                        <label class="b-checkbox checkbox">
+                                            <input type="checkbox" value="<c:out value="${ cdList.cd }"/>" name="srchOrdrSttusCds">
+                                            <span class="check"></span>
+                                            <span class="control-label">
+                                                    <span class="order-status-badge export"><c:out value="${ cdList.cdNm }"/></span>
+                                                </span>
+                                        </label>
+                                    </c:if>
                                     <c:if test="${ cdList.cd eq 60 }">
                                         <label class="b-checkbox checkbox">
                                             <input type="checkbox" value="<c:out value="${ cdList.cd }"/>" name="srchOrdrSttusCds">

src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp

@@ -215,31 +215,21 @@
             return false;
         }
 
-
-
         const checkedRows = $('input.dlivyCk:checked').closest('tr');
-
         let checkedRowTd = null;
         let rowTdClass = null;
 
         let data = [];
-
         checkedRows.each(function(index) {
             const currentRow = $(this);
             const nextRow = currentRow.next('tr');
 
-
             checkedRowTd = currentRow.find('td').eq(1);
-
-
             rowTdClass = checkedRowTd.find('button').attr('class');
 
-
             if (rowTdClass && rowTdClass.includes('closed')) {
-
-
-
                 let tempRow = nextRow.next(); // 'nextRow'는 제외하고 그 다음 'tr'부터 시작
+
                 while (tempRow.length && !tempRow.hasClass('sendOut-info__first')) {
                     const inputs = tempRow.find('input[name], select[name]');
                     let rowData = {};
@@ -247,39 +237,24 @@
                     inputs.each(function () {
                         const input = $(this);
                         rowData[input.attr('name')] = input.val();
-
+                        fn_create_input_popup('hidden', 'dlivyUpdtVOList[' + index + '].'+(input.attr('name').split('.')[1]), input.val(), hiddenForm);
-
-                        fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm);
                     });
-
-
                     data.push(rowData);
-
                     tempRow = tempRow.next(); // 다음 'tr'로 이동
                 }
 
-
             } else {
-
-
-
-
                 const inputs = currentRow.find('input[name], select[name]').add(nextRow.find('input[name], select[name]'));
                 let rowData = {};
 
                 inputs.each(function() {
                     const input = $(this);
                     rowData[input.attr('name')] = input.val();
-
+                    fn_create_input_popup('hidden', 'dlivyUpdtVOList[' + index + '].'+(input.attr('name').split('.')[1]), input.val(), hiddenForm);
-
+                    // fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm);
-                    fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm);
                 });
-
-
                 data.push(rowData);
-
             }
-
         });
 
         fn_create_input_popup('hidden', 'dlivyDt', dlivyRegistDate, hiddenForm);
@@ -287,11 +262,6 @@
 
         const hiddenData = $('#hiddenForm').serializeArray();
 
-
-
-
-
-
         if (isChecked()) {
             if (confirm('해당 주문을 출고처리 하시겠습니까?')) {
                 $.ajax({
@@ -928,7 +898,8 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
+                    alert(message);
                 }
             });
         }
@@ -1040,7 +1011,8 @@
                         }
                     },
                     error : function(request, status, error) {
-                        let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                        let message = JSON.parse(request.responseText).resBody.result;
+                        alert(message);
                     }
                 });
             }
@@ -1131,7 +1103,8 @@
 
                     },
                     error : function(request, status, error) {
-                        let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                        let message = JSON.parse(request.responseText).resBody.result;
+                        alert(message);
                     }
                 });
             }

src/main/webapp/WEB-INF/views/mngr/ordr/indvdlSetle/IndvdlSetleListInqireRForm.jsp

@@ -251,9 +251,9 @@
                 }
             },
             error:function(request, status, error) {
-                let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                let message = JSON.parse(request.responseText).resBody.result;
 
-                alert(message.errorMsg);
+                alert(message);
             }
         });
     }
@@ -284,9 +284,9 @@
                 }
             },
             error:function(request, status, error) {
-                let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                let message = JSON.parse(request.responseText).resBody.result;
 
-                alert(message.errorMsg);
+                alert(message);
             }
         });
     }

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp

@@ -602,7 +602,7 @@
                         const paginationInfo = result.paginationInfo;
 
                         if (allOrdrList == null) {
-                            $('#orderList').append('<tr class="row"><td class="center" colspan="15">검색어가 없거나 검색 결과가 없습니다.</td>');
+                            $('#orderList').append('<tr class="row"><td class="center" colspan="14">검색어가 없거나 검색 결과가 없습니다.</td>');
                         } else {
                             let rowNum = paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo -1) * paginationInfo.recordCountPerPage) + 1;
 
@@ -636,9 +636,9 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -666,9 +666,9 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -686,9 +686,9 @@
                     if (data.resBody != null) {}
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -718,9 +718,9 @@
                     }
                 },
                 error:function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -736,7 +736,7 @@
                 let header = '';
 
                 header += '<tr class="row order-section__header ' + ordrSttus + '" id="' + currTr + '-header">';
-                header += '    <td colspan="15">';
+                header += '    <td colspan="14">';
                 header += '        <div class="form-control-container">';
                 header += '            <div class="left">';
                 header += '                <div class="select-box">';
@@ -755,7 +755,7 @@
                     /* header += '            <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
                 }
 
-                if ('35' === data.ordrSttusCd) {
+                if ('35' === data.ordrSttusCd || '50' === data.ordrSttusCd || '60' === data.ordrSttusCd || '70' === data.ordrSttusCd) {
                     header += '            <button type="button" onclick="fn_dlivy_procs_popup_check_ordrs(\'/mngr/ordr/dlivy/selectOrdrDlivyPopupForm\',\'팝업\',\'1400\',\'840\');" class="btn primary xsm btn-dlivy-procs-pop-' + data.ordrSttusCd + '">출고처리</button>';
                     /* header += '            <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
                 }
@@ -850,16 +850,13 @@
             tr += '    <td>' + (rowNum - 1) + '</td>';
             tr += '    <td>';
 
-            if (!fn_is_empty(data.inflowCoursUrl)) {
+            /** 구독서비스 여부 (구독/일반)*/
-                tr += '    <a href="' + data.inflowCoursUrl + '" target="_blank">';
+            if (data.subsvcAt == 'Y'){
-                tr += '        <span class="blue-8 fw-500" title="' + data.inflowCoursUrl + '">' + (data.inflowCoursNm).substring(0, 1); + '</span></td>';
+                tr += '구독';
-                tr += '    </a>';
             }else{
-                tr += '    <span class="blue-8 fw-500" title="' + data.inflowCoursUrl + '">' + (data.inflowCoursNm).substring(0, 1); + '</span></td>';
+                tr += '일반';
             }
-
             tr += '    </td>';
-            tr += '    <td><span class="blue-8 fw-500" title="' + data.sopmalNm + '">' + (data.sopmalNm).substring(0, 1) + '</span></td>';
             tr += '    <td>' + data.ordrRceptDt + '</td>';
             tr += '    <td>' + fn_nvl(data.sleEnvrnNm, '') + '</td>';
             tr += '    <td class="left">';
@@ -993,7 +990,7 @@
             let detail = '';
 
             detail += '<tr class="row order-section__detail' + ' ordr-innb-detail-' + ordrInnb + '">';
-            detail += '    <td colspan="15">';
+            detail += '    <td colspan="14">';
             detail += '        <div class="order-section__detail-inner">';
             detail += '            <h5 class="order-section__detail-title">주문상품</h5>';
             detail += '            <div class="table-wrapper">';
@@ -1331,7 +1328,7 @@
                 let footer = '';
 
                 footer += '<tr class="row order-section__footer">';
-                footer += '    <td colspan="15">';
+                footer += '    <td colspan="14">';
                 footer += '        <div class="form-control-container">';
                 footer += '            <div class="left">';
                 footer += '                <div class="select-box">';
@@ -1350,8 +1347,8 @@
                     /* footer += '            <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
                 }
 
-                if ('35' === prevOrderSttusCd) {
+                if ('35' === prevOrderSttusCd || '50' === prevOrderSttusCd || '60' === data.prevOrderSttusCd || '70' === data.prevOrderSttusCd) {
-                    footer += '            <button type="button" onclick="fn_dlivy_procs_popup_check_ordrs(\'/mngr/ordr/dlivy/selectOrdrDlivyPopupForm\',\'팝업\',\'1400\',\'840\');" class="btn primary xsm btn-dlivy-procs-pop-' + data.ordrSttusCd + '">출고처리</button>';
+                    footer += '            <button type="button" onclick="fn_dlivy_procs_popup_check_ordrs(\'/mngr/ordr/dlivy/selectOrdrDlivyPopupForm\',\'팝업\',\'1400\',\'840\');" class="btn primary xsm btn-dlivy-procs-pop-' + prevOrderSttusCd + '">출고처리</button>';
                     /* footer += '            <button type="button" id="ordrSttus85" class="btn-' + currTr + ' btn gray xsm">결제취소</button>'; */
                 }
                 footer += '                <button type="button" class="btn-order-print-' + data.ordrSttusCd + ' btn outline xsm fs-13"><i class="icon icon_print"></i>프린트</button>';
@@ -1937,7 +1934,7 @@
                             </tr>
                             <tr class="search-hide">
                                 <th>배송예정</th>
-                                <td colspan="4">
+                                <td colspan="1">
                                     <div class="td-inner">
                                         <div class="select-box">
                                             <select name="srchResveSndngDvCd" id="srchResveSndngDvCd" title="배송예정">
@@ -1954,10 +1951,8 @@
                                         </div>
                                     </div>
                                 </td>
-                            </tr>
-                            <tr class="search-hide">
                                 <th>배송방법</th>
-                                <td colspan="1">
+                                <td colspan="2">
                                     <div class="td-inner">
                                         <div class="b-checkbox-container">
                                             <c:forEach items="${cond.dlvyMthCdList}" var="dlvyMthCd" varStatus="status">
@@ -1970,6 +1965,27 @@
                                         </div>
                                     </div>
                                 </td>
+                            </tr>
+                            <tr class="search-hide">
+                                <th>주문구분</th>
+                                <td colspan="1">
+                                    <div class="td-inner">
+                                        <div class="custom-radio-container">
+                                            <div class="custom-radio">
+                                                <input type="radio" id="srchSubsvcAt"  name="srchSubsvcAt" checked="checked" value="">
+                                                <label for="srchSubsvcAt">전체</label>
+                                            </div>
+                                            <div class="custom-radio">
+                                                <input type="radio" id="srchSubsvcAtY" name="srchSubsvcAt" value="Y">
+                                                <label for="srchSubsvcAtY">구독서비스</label>
+                                            </div>
+                                            <div class="custom-radio">
+                                                <input type="radio" id="srchSubsvcAtN" name="srchSubsvcAt" value="N">
+                                                <label for="srchSubsvcAtN">일반</label>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </td>
                                 <th>주문유형</th>
                                 <td colspan="2">
                                     <div class="td-inner">
@@ -2187,7 +2203,6 @@
                                 <col style="width: 50px">
                                 <col style="width: 50px">
                                 <col style="width: 50px">
-                                <col style="width: 50px">
                                 <col style="width: 120px">
                                 <col style="width: 50px">
                                 <col style="width: 215px">
@@ -2204,8 +2219,7 @@
                                 <th>선택</th>
                                 <th>중요</th>
                                 <th>번호</th>
-                                <th>유입</th>
+                                <th>주문구분</th>
-                                <th>마켓</th>
                                 <th>주문일시</th>
                                 <th>환경</th>
                                 <th>주문번호</th>
@@ -2220,7 +2234,7 @@
                             </thead>
                             <tbody id="orderList">
                             <tr>
-                                <td colspan="15">
+                                <td colspan="14">
                                     <div class="form-control-container">
                                         <div class="left">
                                         <span class="gray-6">* 블랙리스트는 자사몰은 적색, 물류센터는 녹색으로 표시됩니다.</span>

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/DwldItmSetupFormR.jsp

@@ -89,9 +89,9 @@
                     }
                 },
                 error:function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/FdrmDlvyRForm.jsp

@@ -586,9 +586,9 @@
                 }
             },
             error : function(request, status, error) {
-                let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                let message = JSON.parse(request.responseText).resBody.result;
 
-                alert(message.errorMsg);
+                alert(message);
             }
         });
     }
@@ -613,9 +613,9 @@
                 }
             },
             error : function(request, status, error) {
-                let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                let message = JSON.parse(request.responseText).resBody.result;
 
-                alert(message.errorMsg);
+                alert(message);
             }
         });
     }
@@ -633,9 +633,9 @@
                 if (data.resBody != null) {}
             },
             error : function(request, status, error) {
-                let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                let message = JSON.parse(request.responseText).resBody.result;
 
-                alert(message.errorMsg);
+                alert(message);
             }
         });
     }
@@ -663,9 +663,9 @@
                 }
             },
             error : function(request, status, error) {
-                let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                let message = JSON.parse(request.responseText).resBody.result;
 
-                alert(message.errorMsg);
+                alert(message);
             }
         });
     }

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/GiftOrdrInqireR.jsp

@@ -586,9 +586,9 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -613,9 +613,9 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -633,9 +633,9 @@
                     if (data.resBody != null) {}
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -663,9 +663,9 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }

src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp

@@ -834,9 +834,9 @@
                     }
                 },
                 error:function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -866,9 +866,9 @@
                     }
                 },
                 error:function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -914,9 +914,9 @@
 
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -1240,7 +1240,29 @@
                 return false;
             }
 
-            PopupCenter('/mngr/ntcn/mssage/selectMssageSndngPopupForm', 'SMS 발송', '1400', '840');
+            PopupCenter('', 'SMS 발송', '1400', '840');
+
+            var form = document.createElement("form");
+            form.setAttribute("method", "post");
+            form.setAttribute("action", "/mngr/ntcn/mssage/selectMssageSndngPopupForm"); // 데이터를 받을 URL
+            form.setAttribute("target", "SMS 발송"); // 위에서 생성한 팝업 이름
+
+            var reqTab = document.createElement("input");
+            reqTab.setAttribute("type", "hidden");
+            reqTab.setAttribute("name", "reqTab");
+            reqTab.setAttribute("value", "send");
+            form.appendChild(reqTab);
+
+            var mbtlnbObj = document.createElement("input");
+            mbtlnbObj.setAttribute("type", "hidden");
+            mbtlnbObj.setAttribute("name", "mbtlnb");
+            mbtlnbObj.setAttribute("value", mbtlnb);
+            form.appendChild(mbtlnbObj);
+
+            document.body.appendChild(form);
+
+            form.submit();
+            document.body.removeChild(form);
         }
 
         /* EMAIL 발송 팝업 화면 이동 */
@@ -1251,7 +1273,30 @@
                 return false;
             }
 
-            PopupCenter('/mngr/ntcn/email/selectEmailSndngPopupForm','EMAIL 발송','1400','840');
+            PopupCenter('','EMAIL 발송','1400','840');
+
+            var form = document.createElement("form");
+            form.setAttribute("method", "post");
+            form.setAttribute("action", "/mngr/ntcn/email/selectEmailSndngPopupForm"); // 데이터를 받을 URL
+            form.setAttribute("target", "EMAIL 발송"); // 위에서 생성한 팝업 이름
+
+            var reqTab = document.createElement("input");
+            reqTab.setAttribute("type", "hidden");
+            reqTab.setAttribute("name", "reqTab");
+            reqTab.setAttribute("value", "send");
+            form.appendChild(reqTab);
+
+            var emailObj = document.createElement("input");
+            emailObj.setAttribute("type", "hidden");
+            emailObj.setAttribute("name", "email");
+            emailObj.setAttribute("value", email);
+            form.appendChild(emailObj);
+
+            document.body.appendChild(form);
+
+            form.submit();
+            document.body.removeChild(form);
+
         }
 
         /* 메일 발송 내역 화면 이동 */
@@ -1262,7 +1307,7 @@
 
             $(form).attr('method', 'post');
             $(form).attr('target', '_blank');
-            $(form).attr('action', '<c:url value="/mngr/ntcn/email/selectEmailPassivSndngManage"/>');
+            $(form).attr('action', '<c:url value="/mngr/ntcn/email/selectEmailPassivSndngManage?reqTab=search"/>');
 
             $(form).appendTo('body');
 
@@ -1278,7 +1323,7 @@
 
             $(form).attr('method', 'post');
             $(form).attr('target', '_blank');
-            $(form).attr('action', '<c:url value="/mngr/ntcn/mssage/selectMssagePassivSndngManage"/>');
+            $(form).attr('action', '<c:url value="/mngr/ntcn/mssage/selectMssagePassivSndngManage?reqTab=search"/>');
 
             $(form).appendTo('body');
 
@@ -1573,9 +1618,9 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -1784,10 +1829,10 @@
                             </c:choose>
                             <button type="button" class="btn-ordr-sttus-35 btn gray">상품 준비</button>
                         </c:if>
-                        <c:if test="${'35' eq dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 -->
+                        <c:if test="${'35' eq dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 or 출고후 -->
                             <a href="javascript:void(0);" id="canclPayment" class="btn outline">결제 취소</a>
                         </c:if>
-                        <c:if test="${'35' lt dtl.ordrSttusCd && '85' gt dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 출고후 -->
+                        <c:if test="${'40' <= dtl.ordrSttusCd && '85' gt dtl.ordrSttusCd && dtl.sknEnvrnCd ne 'POS'}"> <!-- 상품준비 or 출고후 -->
                             <button type="button" class="btn outline" onclick="fn_refund_regist_popup('#modalDiv', '#setleCanclRefndRegistPopupC', '<c:url value="/mngr/ordr/ordrmngr/selectRtngudRegistPopupForm"/>', '${dtl.ordrInnb}', '${dtl.setleTyCd}', '${dtl.ordrSttusCd}');">반품 신청</button>
                         </c:if>
                     </div>
@@ -1822,7 +1867,6 @@
                             <caption>주문정보</caption>
                             <!-- 각 열 width 설정 -->
                             <colgroup>
-                                <col style="width: 60px;">
                                 <col style="width: 60px;">
                                 <col style="width: 10%;">
                                 <col style="width: 120px;">
@@ -1836,8 +1880,7 @@
                             </colgroup>
                             <thead>
                             <tr>
-                                <th>유입</th>
+                                <th>일반/구독</th>
-                                <th>마켓</th>
                                 <th>주문일시</th>
                                 <th>환경</th>
                                 <th>주문번호</th>
@@ -1851,8 +1894,10 @@
                             </thead>
                             <tbody>
                             <tr>
-                                <td><span class="blue-8 fw-500" title="${dtl.inflowCoursNm}">${fn:substring(dtl.inflowCoursNm, 0, 1)}</span></td>
+                                <td><c:choose>
-                                <td><span class="blue-8 fw-500" title="${dtl.sopmalNm}">${fn:substring(dtl.sopmalNm, 0, 1)}</span></td>
+                                    <c:when test="${dtl.subsvcAt eq 'Y'}">구독</c:when>
+                                    <c:otherwise>일반</c:otherwise>
+                                </c:choose></td>
                                 <td>${dtl.ordrRceptDt}</td>
                                 <td>${dtl.sleEnvrnNm}</td>
                                 <td>
@@ -1971,6 +2016,7 @@
                 <section class="content-section">
                     <spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
                     <spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
+                    <spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
                     <h3 class="content-section__title">주문상품
                     <c:if test="${ not empty dtl.strNm }">
                         <span class="blue-7">(${ dtl.strNm })</span>
@@ -2212,7 +2258,7 @@
                         </div>
                         <span class="sum-area__sign">=</span>
                         <div class="sum-area__item">
-                            <div class="sum-area__title red-7">총 결제금액 <fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/>${curUnit}</div>
+                            <div class="sum-area__title red-7">총 결제금액 <fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/>${curUnit} / <fmt:formatNumber value="${total.wonRlSetleAmt}" pattern="#,###"/>${krUnit}</div>
                         </div>
                     </div>
                 </section>

src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp

@@ -75,8 +75,8 @@
 
             let pRefundQy = parseAmount('<c:out value="${ resultMap.result.pRefund.pRefundQy }"/>');
             let rlOrdrQy = parseAmount('<c:out value="${ resultMap.result.pRefund.rlOrdrQy }"/>');
-            let pRefundAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pRefundAmt }"/>');
+            let pRefundAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pRefundAmt }"/>');                  /*환불상품금액*/
-
+            let pRefundDlvyAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pRefundDlvyAmt }"/>');          /*환불배송비*/
             // 마일리지
             let pUseCancelMlg = parseAmount('<c:out value="${ resultMap.result.pRefund.pUseCancelMlg }"/>');
             let rlUseMlg = parseAmount('<c:out value="${ resultMap.result.pRefund.rlUseMlg }"/>');
@@ -98,13 +98,18 @@
                 totalRefundQy += refundQy;
             });
 
-
+            //전체 환불인경우
             if (totalRefundQy + pRefundQy >= rlOrdrQy) {
 
+                let nowRefundDlvyAmt = 0;
+                $('input[name="shippingDlvyAmt"]').each(function (idx){
+                    nowRefundDlvyAmt += parseAmount($(this).val());
+                } );
 
-                let pRemainAmt = (rlSetleAmt - pRefundAmt) - nowRefundAmt;
+                // (주문전체 결제금액 - 이전환불 환불금액 - 이전환불배송비) - 총환불금액(배송비 제외) - 전체배송비
-
+                let pRemainAmt = (rlSetleAmt - pRefundAmt - pRefundDlvyAmt) - nowRefundAmt - nowRefundDlvyAmt;
 
+                // 절대값
                 let pRemainAmtRemain = Math.abs(pRemainAmt);
 
 
@@ -369,13 +374,16 @@
 
 
         $('input[name="prosbleCancelAmt"]').on('input', function() {
-            console.log("엄ㄴ아런밍럼니;아러");
             fn_mlg_display_ctrl();
         });
 
 
         function rlRefundAmtProcessing() {
-
+            let wonRlSetleAmt = parseAmount('${data.ordrGoodsDtl.total.wonRlSetleAmt}');                                    /*실주문결제금액(원)*/
+            let pWonRefundAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pWonRefundAmt }"/>');                /*이전환불상품금액*/
+            let pWonRefundDlvyAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pWonRefundDlvyAmt }"/>');        /*이전환불배송비*/
+            let wonLimitRefundAmt = wonRlSetleAmt - (pWonRefundAmt + pWonRefundDlvyAmt);                                    /*환불최대금액*/
+            let buyRate = parseFloat('${resultMap.result.totRefundDscntAmt.buyRate}',2);
             let refundTyCd = '<c:out value="${ resultMap.result.refnd.refundTyCd }"/>';
             let returnMthCd = $('input[name="returnMthCd"]:checked').val(); // 반품 방법 코드
             let refundDlvyAmt = '<c:out value="${ resultMap.result.refnd.refundDlvyAmt }"/>'; // 환불 배송비 금액
@@ -400,44 +408,38 @@
             let setleAmtMlg = 0;
             let setleAmtCash = 0;
 
+            /*상품금액 합계*/
             $('input[name="goodsRefundAmt"]').each(function(idx) {
-
                 let goodsRefundAmt = parseAmount($(this).val());
 
                 // console.log("상품별 환불 금액 : ", goodsRefundAmt);
                 refundAmt = refundAmt + goodsRefundAmt;
-
                 setleAmtGoods = setleAmtGoods + goodsRefundAmt;
-
             });
 
-
+            /*마일리지 취소금액 합계*/
             $('input[name="totSnggdsRefundMlgAmt"]').each(function(idx) {
-
                 let snggdsRefundMlgAmt = parseAmount($(this).val());
 
                 // console.log("상품별 마일리지 취소 금액 : ", snggdsRefundMlgAmt);
                 refundMltAmt = refundMltAmt + snggdsRefundMlgAmt;
-
                 setleAmtMlg = setleAmtMlg + snggdsRefundMlgAmt;
-
             });
 
-
+            /*gc머니 취소금액 합계*/
             $('input[name="totCashDscntUnit"]').each(function(idx) {
-
                 let snggdsRefundCashAmt = parseAmount($(this).val());
 
                 // console.log("상품별 마일리지 취소 금액 : ", snggdsRefundMlgAmt);
                 refundCashAmt = refundCashAmt + snggdsRefundCashAmt;
-
                 setleAmtCash = setleAmtCash + snggdsRefundCashAmt;
-
             });
 
 
             let rlRefundAmt = 0;
+            let realRefundAmt = 0;          /*실제 결제취소(환불)금액*/
             rlRefundAmt = refundAmt + refundMltAmt + refundCashAmt;
+            realRefundAmt = refundAmt;
             // rlRefundAmt = parseAmount(rlRefundAmt);
 
             // 숫자로 변환
@@ -447,11 +449,8 @@
 
 
             if (refundTyCd === '01') {
-
-
-
                 rlRefundAmt = rlRefundAmt + refundDlvyAmt;
-
+                realRefundAmt = realRefundAmt + refundDlvyAmt;
 
                 if (refundDlvyAmt > 0) {
                     $('.rlRefundamtBeforeArea').show();
@@ -462,16 +461,11 @@
                 $('.rlReturnamtBeforeArea').hide();
                 $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmtStdr));
 
-
             } else if (refundTyCd === '02') {
-
                 if (returnDlvyRspnsblCd === '01') { // 구매자
-
                     if (returnMthCd === '01') { // 고객이 배송
-
+                        // returnDlvyAmt = returnDlvyAmtStdr - refundDlvyAmt > 0 ? returnDlvyAmtStdr - refundDlvyAmt : 0;
-                        returnDlvyAmt = returnDlvyAmtStdr - refundDlvyAmt > 0 ? returnDlvyAmtStdr - refundDlvyAmt : 0;
+                        // $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmt));
-
-                        $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmt));
                     } else if (returnMthCd === '02') { // 상점이 회수
                         // $('input[name="returnDlvyAmt"]').val(formatWithComma($('input[name="returnDlvyAmt"]').val()));
                     } else {
@@ -480,24 +474,20 @@
 
                     if (returnDlvyPymntTyCd === '02') { // 환불 금액에서 차감
                         rlRefundAmt = rlRefundAmt - returnDlvyAmt > 0 ? rlRefundAmt - returnDlvyAmt : 0;
+                        realRefundAmt = realRefundAmt - returnDlvyAmt > 0 ? realRefundAmt - returnDlvyAmt : 0;
 
                         $('.shippingReturnDlvyAmt').text(formatWithComma(returnDlvyAmt))
                         $('.rlReturnamtBeforeArea').show();
-
                     } else {
-
-
                         $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmt));
-
                         $('.rlReturnamtBeforeArea').hide();
                     }
-
                     $('.rlRefundamtBeforeArea').hide();
                     // $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmt));
                 } else if (returnDlvyRspnsblCd === '02') { // 판매자
-
+                    console.log("refundDlvyAmt:",refundDlvyAmt)
                     rlRefundAmt = rlRefundAmt + refundDlvyAmt;
-
+                    realRefundAmt = realRefundAmt + refundDlvyAmt;
 
                     if (refundDlvyAmt > 0) {
                         $('.rlRefundamtBeforeArea').show();
@@ -521,13 +511,30 @@
             $('.setleAmtCash').text(formatWithComma(setleAmtCash)); // 결제내역 영역의 상품 마일리지 사용 금액
 
             rlRefundAmt = rlRefundAmt > 0 ? rlRefundAmt : 0;
-            $('.rlRefundAmt').text(formatWithComma(rlRefundAmt));
+            realRefundAmt = realRefundAmt > 0 ? realRefundAmt : 0;
 
+            $('.rlRefundAmt').text(formatWithComma(rlRefundAmt));
+            $('.realRefundAmt').text(formatWithComma(realRefundAmt));
+
+            /*환불금액 한화환불금액 계산*/
+            let wonRlRefundAmt = Math.round(realRefundAmt * buyRate);
+            console.log("wonRlRefundAmt : ",wonRlRefundAmt, " realRefundAmt : ",realRefundAmt, " buyRate : ",buyRate)
+
+            wonRlRefundAmt = wonRlRefundAmt > 0 ? wonRlRefundAmt : 0;
+            /*환불금액이 최대금액을 넘어설경우 원화 최대치로 치환 */
+            wonRlRefundAmt = wonRlRefundAmt > wonLimitRefundAmt ? wonLimitRefundAmt : wonRlRefundAmt;
+
+            $('.wonRlRefundAmt').text(formatWithComma(wonRlRefundAmt));
         }
 
 
         function rlRefundAmtProcessingInput() {
+            let wonRlSetleAmt = parseAmount('${data.ordrGoodsDtl.total.wonRlSetleAmt}');                                    /*실주문결제금액(원)*/
+            let pWonRefundAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pWonRefundAmt }"/>');                /*이전환불상품금액*/
+            let pWonRefundDlvyAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pWonRefundDlvyAmt }"/>');        /*이전환불배송비*/
+            let wonLimitRefundAmt = wonRlSetleAmt - (pWonRefundAmt + pWonRefundDlvyAmt);                                    /*환불최대금액*/
 
+            let buyRate = parseFloat('${resultMap.result.totRefundDscntAmt.buyRate}',2);
             let refundTyCd = '<c:out value="${ resultMap.result.refnd.refundTyCd }"/>';
             let returnMthCd = $('input[name="returnMthCd"]:checked').val(); // 반품 방법 코드
             let refundDlvyAmt = '<c:out value="${ resultMap.result.refnd.refundDlvyAmt }"/>'; // 환불 배송비 금액
@@ -550,43 +557,32 @@
             let setleAmtCash = 0;
 
            $('input[name="goodsRefundAmt"]').each(function(idx) {
-
                let goodsRefundAmt = parseAmount($(this).val());
 
-
                refundAmt = refundAmt + goodsRefundAmt;
-
                setleAmtGoods = setleAmtGoods + goodsRefundAmt;
-
            });
 
-
             $('input[name="totSnggdsRefundMlgAmt"]').each(function(idx) {
-
                 let snggdsRefundMlgAmt = parseAmount($(this).val());
 
-
                 refundMltAmt = refundMltAmt + snggdsRefundMlgAmt;
-
                 setleAmtMlg = setleAmtMlg + snggdsRefundMlgAmt;
-
             });
 
-
             $('input[name="totCashDscntUnit"]').each(function(idx) {
-
                 let snggdsRefundCashAmt = parseAmount($(this).val());
 
-
                 refundCashAmt = refundCashAmt + snggdsRefundCashAmt;
-
                 setleAmtCash = setleAmtCash + snggdsRefundCashAmt;
-
             });
 
 
             let rlRefundAmt = 0;
+            let realRefundAmt = 0;          /*실제 결제취소(환불)금액*/
+
             rlRefundAmt = refundAmt + refundMltAmt + refundCashAmt;
+            realRefundAmt = refundAmt;
            // rlRefundAmt = parseAmount(rlRefundAmt);
 
            // 숫자로 변환
@@ -594,14 +590,9 @@
            returnDlvyAmt = parseAmount(returnDlvyAmt);
            returnDlvyAmtStdr = parseAmount(returnDlvyAmtStdr);
 
-
-
             if (refundTyCd === '01') { // 결제 취소
-
-
-
                 rlRefundAmt = rlRefundAmt + refundDlvyAmt;
-
+                realRefundAmt = realRefundAmt + refundDlvyAmt;
 
                 if (refundDlvyAmt > 0) {
                     $('.rlRefundamtBeforeArea').show();
@@ -612,15 +603,10 @@
                 $('.rlReturnamtBeforeArea').hide();
                 $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmtStdr));
 
-
             } else if (refundTyCd === '02') { // 반품환불
-
                 if (returnDlvyRspnsblCd === '01') { // 구매자
-
                     if (returnMthCd === '01') { // 고객이 배송
-
                         // returnDlvyAmt = returnDlvyAmt - refundDlvyAmt > 0 ? returnDlvyAmt - refundDlvyAmt : 0;
-
                         $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmt));
                     } else if (returnMthCd === '02') { // 상점이 회수
                         // $('input[name="returnDlvyAmt"]').val(formatWithComma($('input[name="returnDlvyAmt"]').val()));
@@ -630,24 +616,21 @@
 
                     if (returnDlvyPymntTyCd === '02') { // 환불 금액에서 차감
                         rlRefundAmt = rlRefundAmt - returnDlvyAmt > 0 ? rlRefundAmt - returnDlvyAmt : 0;
+                        realRefundAmt = realRefundAmt - returnDlvyAmt > 0 ? realRefundAmt - returnDlvyAmt : 0;
 
                         $('.shippingReturnDlvyAmt').text(formatWithComma(returnDlvyAmt))
                         $('.rlReturnamtBeforeArea').show();
 
                     } else {
-
-
                         $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmt));
 
                         $('.rlReturnamtBeforeArea').hide();
                     }
-
                     $('.rlRefundamtBeforeArea').hide();
                     // $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmt));
                 } else if (returnDlvyRspnsblCd === '02') { // 판매자
-
                     rlRefundAmt = rlRefundAmt + refundDlvyAmt;
-
+                    realRefundAmt = realRefundAmt + refundDlvyAmt;
 
                     if (refundDlvyAmt > 0) {
                         $('.rlRefundamtBeforeArea').show();
@@ -671,8 +654,18 @@
            $('.setleAmtCash').text(formatWithComma(setleAmtCash)); // 결제내역 영역의 상품 마일리지 사용 금액
 
            rlRefundAmt = rlRefundAmt > 0 ? rlRefundAmt : 0;
+            realRefundAmt = realRefundAmt > 0 ? realRefundAmt : 0;
            $('.rlRefundAmt').text(formatWithComma(rlRefundAmt));
+           $('.realRefundAmt').text(formatWithComma(realRefundAmt));
 
+            /*환불금액 한화환불금액 계산*/
+            let wonRlRefundAmt = Math.round(realRefundAmt * buyRate);
+            wonRlRefundAmt = wonRlRefundAmt > 0 ? wonRlRefundAmt : 0;
+
+            /*환불금액이 최대금액을 넘어설경우 원화 최대치로 치환 */
+            wonRlRefundAmt = wonRlRefundAmt > wonLimitRefundAmt ? wonLimitRefundAmt : wonRlRefundAmt;
+
+            $('.wonRlRefundAmt').text(formatWithComma(wonRlRefundAmt));
         }
 
         $('#returnDlvyPymntTyCd').on('change', function() {
@@ -720,9 +713,6 @@
         $('select[name="refundMthCd"]').on('change', function() {
             fn_refund_mth_ctrl();
         });
-
-
-
     });
 
 
@@ -1114,16 +1104,20 @@
                 fn_create_input('hidden', "orderReItemVOList["+idx+"].invntryIncrsQy", $('[name=invntryIncrsQy]').eq(idx).val(), hiddenForm);
             }
         });
+        /*총 환불금액은 계산된 금액으로 대체 (상품금액 + 배송비)*/
+        totRefundAmt = parseAmount($('.realRefundAmt').text());
 
         let registRlSetleAmt = parseAmount('${data.ordrGoodsDtl.total.setleAmt}');
-        let pRefundAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pRefundAmt }"/>');
+        let pRefundAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pRefundAmt }"/>');                  /*이전상품환불금액*/
         let nowRefundAmt = parseAmount('<c:out value="${ resultMap.result.totRefundDscntAmt.refundAmt }"/>');
-        console.log("환불 계산 정보 pRefundAmt : ", pRefundAmt);
+        let pRefundDlvyAmt = parseAmount('<c:out value="${ resultMap.result.pRefund.pRefundDlvyAmt }"/>');          /*이전환불배송금액*/
-        console.log("환불 계산 정보 nowRefundAmt : ", nowRefundAmt);
+        console.debug("환불 계산 정보 pRefundAmt : ", pRefundAmt);
+        console.debug("환불 계산 정보 nowRefundAmt : ", nowRefundAmt);
 
-        let registRefundAmt = pRefundAmt + totRefundAmt;
+        /*총 환불금액 계산 : 이전상품환불금액 + 현재환불금액(상품환불금액 + 환불배송비) + 이전환불배송금액 */
-        console.log("던질 마일리지가 총 합산을 넘으면 안됌.", registRefundAmt);
+        let registRefundAmt = pRefundAmt + totRefundAmt + pRefundDlvyAmt;
-        console.log("던질 마일리지가 총 합산을 넘으면 안됌.", totRefundAmt);
+        console.debug("던질 마일리지가 총 합산을 넘으면 안됌.", registRefundAmt);
+        console.debug("던질 마일리지가 총 합산을 넘으면 안됌.", totRefundAmt);
 
         if (registRefundAmt > registRlSetleAmt) {
             alert("최종 환불금액이 전체 결제금액을 넘을 수 없습니다.");
@@ -1170,8 +1164,8 @@
                         location.reload();
                     }
                 }, error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -1505,6 +1499,7 @@
 
             <spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
             <spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
+            <spring:eval expression="@environment.getProperty('currency-unit.KR')" var="krUnit"/>
             <div class="content__inner">
                 <button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button>
                 <div class="page-title">
@@ -2673,7 +2668,7 @@
                                                                     <td class="center" rowspan="${reRowspanCnt}">
                                                                         <span class="fs-13 fw-400">${reDlvyCnt += ' 번째 배송지'}</span><br>
                                                                         <span class="fs-13 fw-400">${refundList.dlvyMthNm}</span><br>
-                                                                        <input type="hidden" id="shippingDlvyAmt" value="${ refundList.dlvyAmt }"/>
+                                                                        <input type="hidden" id="shippingDlvyAmt" name="shippingDlvyAmt" value="${ refundList.dlvyAmt }"/>
                                                                         <c:choose>
                                                                             <c:when test="${0 == refundList.dlvyAmt}">
                                                                                 <span class="fs-13 fw-400">무료</span>
@@ -2691,7 +2686,7 @@
                                                             <c:if test="${status.index == 0}">
                                                                 <td class="center" ${fn:length(resultMap.result.itemsList) > 1 ? 'rowspan="' += fn:length(resultMap.result.itemsList) += '"' : ''}>
                                                                     <span class="fs-13 fw-400">${refundList.dlvyMthNm}</span><br>
-                                                                    <input type="hidden" id="shippingDlvyAmt" value="${ refundList.dlvyAmt }"/>
+                                                                    <input type="hidden" id="shippingDlvyAmt" name="shippingDlvyAmt" value="${ refundList.dlvyAmt }"/>
                                                                     <c:choose>
                                                                         <c:when test="${0 == refundList.dlvyAmt}">
                                                                             <span class="fs-13 fw-400">무료</span>
@@ -2739,9 +2734,8 @@
                                     <tfoot>
                                     <tr class="tfoot-sum">
                                         <c:set var="reTotAmt" value="${ resultMap.result.totRefundDscntAmt }"/>
-                                        <td>결제내역</td>
+                                        <td colspan="2" style="text-align: left;">결제내역</td>
-                                        <td colspan="4" class="text-right"></td>
+                                        <td colspan="10" class="tfoot-sum__sum table__blue-td text-right">
-                                        <td colspan="7" class="tfoot-sum__sum table__blue-td text-right">
                                             <c:if test="${ not empty reTotAmt.refundAmtQySum }">
                                                 <span class="comma setleAmtGoods">
                                                     <c:out value="${ reTotAmt.refundAmtQySum }"/>
@@ -2790,6 +2784,29 @@
                                             </p>
                                         </td>
                                     </tr>
+                                    <tr class="tfoot-sum">
+                                        <td colspan="2" style="text-align: left">환불내역(원화 기준)</td>
+                                        <td colspan="10" class="tfoot-sum__sum table__blue-td text-center">
+                                            실결제 금액 :
+                                            <span class="comma">
+                                                <c:out value="${ reTotAmt.rlSetleAmt }"/>
+                                            </span>${curUnit}
+                                            /
+                                            <span class="comma">
+                                                <c:out value="${ reTotAmt.wonSetleAmt }"/>
+                                            </span>${krUnit}
+                                            |
+                                            환불 금액 :
+                                            <span class="comma <c:if test="${ resultMap.result.refnd.refundProcsSttusCd ne '03'}">realRefundAmt</c:if>">
+                                                <c:out value="${ reTotAmt.realRefundAmt }"/>
+                                            </span>${curUnit}
+                                            /
+                                            <span class="comma tfoot-sum__sum-num  <c:if test="${ resultMap.result.refnd.refundProcsSttusCd ne '03'}">wonRlRefundAmt</c:if>">
+                                                <c:out value="${ reTotAmt.realWonRefundAmt }"/>
+                                            </span>${krUnit}
+
+                                        </td>
+                                    </tr>
                                     </tfoot>
                                 </table>
                             </div>

src/main/webapp/WEB-INF/views/mngr/ordr/subsvc/SubsvcOrdrList.jsp

@@ -94,7 +94,7 @@
             <c:choose>
                 <c:when test="${ not empty resultMap.list }">
                     <c:forEach items="${ resultMap.list }" var="subsvcOrdr" varStatus="status">
-                        <tr<c:if test="${lastProcsOdr > mbrLastProcsOdr}"> class="sendOut-info__reseller"</c:if>>
+                        <tr<c:if test="${subsvcOrdr.lastProcsOdr > subsvcOrdr.mbrLastProcsOdr}"> class="sendOut-info__reseller"</c:if>>
                             <td>
                                 <label class="b-checkbox checkbox is-medium check-all">
                                     <input type="checkbox" name="arrCheck" class="arrCheck" value="${subsvcOrdr.ordrInnb}@${subsvcOrdr.ordrGoodsInnb}@${subsvcOrdr.ordrGoodsOptnInnb}@${subsvcOrdr.ordrDlvyInnb}">

src/main/webapp/WEB-INF/views/mngr/promtn/coupon/CouponPkRegistC.jsp

@@ -1145,9 +1145,9 @@ since : 2024.01.04 추지훈 최초 생성
                         }
                     }
                 }/*, error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }*/
             });
         }

src/main/webapp/WEB-INF/views/sopmal/csc/BbscttRegistC.jsp

@@ -343,11 +343,12 @@
                     </c:choose>
                         <div class="table-wrapper">
                             <form id="bbsRegForm">
-                                <div class="refund-clause ck-content">
+                                <%--구독취소 유의사항--%>
-                                    <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
+<%--                                <div class="refund-clause ck-content">--%>
-                                    <br><br>
+<%--                                    <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>--%>
-                                    <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
+<%--                                    <br><br>--%>
-                                </div>
+<%--                                    <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>--%>
+<%--                                </div>--%>
                                 <table class="table write">
                                     <caption>게시글 등록</caption>
                                     <colgroup>

src/main/webapp/WEB-INF/views/sopmal/csc/BbscttRegistPopupC.jsp

@@ -270,6 +270,8 @@
         border: 1px solid #e9ecef;
         padding: clamp(12px, 3%, 18px);
         margin-bottom: 16px;
+        overflow: scroll;
+        max-height: 170px;
     }
 </style>
 <body>
@@ -292,11 +294,13 @@
         <div class="table-wrapper">
             <form id="bbsRegForm">
                 <input type='hidden' name='bbsTyCd' id='bbsTyCd' value='<c:out value="${bbsInfo.bbsTyCd}"/>'>
+                <c:if test="${bbsInfo.bbsTyCd eq '12'}">
                     <div class="refund-clause ck-content">
                         <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
                         <br><br>
                         <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
                     </div>
+                </c:if>
                 <table class="table write">
                     <caption>게시글 등록</caption>
                     <colgroup>

src/main/webapp/WEB-INF/views/sopmal/goods/GoodsListRForm.jsp

@@ -1063,6 +1063,30 @@ function addComma(num) {
             </form>
         </div>
     </div>
+    <style>
+        .quick-menu-goods {
+            position: sticky;
+            top: 40px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+        }
+
+        .quick-menu__wrapper-goods {
+            position: fixed;
+            top: 88%;
+            left: 50%;
+            transform: translateX(720px);
+            bottom: 30px;
+        }
+    </style>
+
+    <div class="quick-menu__wrapper-goods" id="pageUpBtn">
+        <aside class="quick-menu-goods">
+            <button onclick="$('html, body').scrollTop(0);" style="margin-bottom: 10px;"><i class="icon icon_quick-to-top"></i><span class="visually-hidden">위로
+                                                가기</span></button>
+        </aside>
+    </div>
 </main>
 
 <jsp:include page="/WEB-INF/views/comm/Footer.jsp"/>

src/main/webapp/WEB-INF/views/sopmal/main/SubscribeR.jsp

@@ -16,19 +16,28 @@
 
 <head>
 	<jsp:include page="/WEB-INF/views/comm/Include.jsp"/>
+	<spring:eval expression="@environment.getProperty('sopmalfo.common.fileupload.cdnurl')" var="cdnurl"/>
 	<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
 </head>
 
 <script>
 	$(document).ready(function() {
+		var urlParams = new URLSearchParams(window.location.search);
+		if (urlParams.has('subsvcInnb')) {
+			$('#subsvcInnb').val(urlParams.get("subsvcInnb"));
+		}
+
 		var subsvcInnb = $('#subsvcInnb').val();
+		$('select[name="subsvcInnb"]').niceSelect('update');
 		fn_select_subsvcDetail(subsvcInnb);
+		fn_scroll_event();
 	});
 
 	/******************************************************
 	 *  구독서비스 상세 조회
 	 * ****************************************************/
 	const fn_select_subsvcDetail = function(subsvcInnb) {
+		var cdnurl = '${cdnurl}';
 		var curUnit = '${curUnit}';
 
 		$.ajax({
@@ -49,15 +58,23 @@
 				$('#dscntRaito').text(data.dscntRaito + '%');
 				$('#subsvcDc').html(data.subsvcDc);
 
+				$("#fixedImg").attr("src", cdnurl + data.img);
+				$('#fixedTitle').text(data.subsvcConcatNm);
+				$('#fixedPrice').text(fn_format_number(data.selpric));
+
 				switch (data.subsvcSttusCd) {
 					case '01':
 						$('#subscribeBtn').text('구독하기');
 						$('#subscribeBtn').prop('disabled', false);
+						$('#fixedButton').text('구독하기');
+						$('#fixedButton').prop('disabled', false);
 						break;
 					case '02':
 					case '03':
 						$('#subscribeBtn').text(data.subsvcSttus);
 						$('#subscribeBtn').prop('disabled', true);
+						$('#fixedButton').text(data.subsvcSttus);
+						$('#fixedButton').prop('disabled', true);
 						break;
 					default:
 						break;
@@ -66,9 +83,74 @@
 		});
 	}
 
+	/*************************************************************
+	 구매하기 버튼
+	 **************************************************************/
+	const fn_purchs_subsvc = function() {
+		var checkedValue = $("select[name='subsvcInnb']").val();
+
+		var tempForm = $('<form>', {
+			method: 'post',
+			action: '/sopmal/ordr/selectSubsvcPurchsForm'
+		});
+		$('<input>', {
+			type: 'hidden',
+			name: 'subsvcInnb',
+			value: checkedValue
+		}).appendTo(tempForm);
+
+		tempForm.appendTo('body');
+		tempForm.submit();
+		tempForm.remove();
+	}
+
+	/******************************************************
+	 *  숫자 자릿점 포메팅
+	 * ****************************************************/
 	const fn_format_number = function(number) {
 		return Number(number).toLocaleString();
 	}
+
+	/*************************************************************
+	 탭, 스크롤 이벤트
+	 **************************************************************/
+	const fn_scroll_event = () => {
+		function handleTabScroll() {
+			var scrollTop = $(window).scrollTop();
+			var fixedTabHeight = 100;
+			var initialProductDetailTop = $('#subsvcDc').offset().top;
+
+			var threshold = initialProductDetailTop - fixedTabHeight;
+
+			if (scrollTop > threshold) {
+				if (!$(".productDetailTab").hasClass("fixed")) {
+					$(".productDetailTab").addClass("fixed");
+					$(".fixedProduct").addClass("fixed");
+					$('#subsvcDc').css("margin-top", 62 + "px");
+				}
+			} else {
+				if ($(".productDetailTab").hasClass("fixed")) {
+					$(".productDetailTab").removeClass("fixed");
+					$(".fixedProduct").removeClass("fixed");
+					$('#subsvcDc').css("margin-top", "");
+				}
+			}
+		}
+
+		var debounce = function (func, delay) {
+			var timer;
+			return function () {
+				var context = this,
+						args = arguments;
+				clearTimeout(timer);
+				timer = setTimeout(function () {
+					func.apply(context, args);
+				}, delay);
+			};
+		};
+
+		$(window).scroll(debounce(handleTabScroll, 20));
+	}
 </script>
 <style>
 	.container {
@@ -112,6 +194,10 @@
 		border: 1px solid #e9ecef;
 		padding: clamp(12px, 3%, 18px);
 	}
+
+	.productDetailTab.fixed {
+		height: 100px;
+	}
 </style>
 <body>
 <%-- 공통 Header --%>
@@ -122,7 +208,7 @@
 		<div class="sub-content">
 			<form>
 				<h2 class="subList__title">구독 서비스</h2>
-				<div class="ck-content" style="border: 1px solid #e9ecef">
+				<div class="ck-content" style="border: 1px solid #e9ecef; background-color: #f8f9fB;">
 					<c:out value="${ resultMap.sopmalInfo[0].subsvcGuidanceWords }" escapeXml="false"/>
 				</div>
 				<c:choose>
@@ -159,7 +245,7 @@
 									<span id="selpric" class="product-unit-price__current"></span>
 									<span id="dscntRaito" style="color: red">%</span>
 								</div>
-								<button id="subscribeBtn" class="btn theme large">구독하기</button>
+								<button type="button" id="subscribeBtn" class="btn theme large" onclick="fn_purchs_subsvc();">구독하기</button>
 							</div>
 						</div>
 					</c:when>
@@ -167,7 +253,25 @@
 						<span style="display: block; width: 100%; text-align: center; font-size: 32px;">구독 서비스 상품 준비중</span>
 					</c:otherwise>
 				</c:choose>
-
+				<div class="productDetailTab">
+					<div class="fixedProduct">
+						<div class="fixedProduct__left">
+							<div class="fixedProduct__image">
+								<img id="fixedImg" alt="상품이미지" onerror="this.src='/pc/images/image_placeholder.png'">
+							</div>
+							<div class="fixedProduct__product">
+								<p id="fixedTitle" class="fixedProduct__title">상품명</p>
+								<span class="fixedProduct__price">
+                                    <span id="fixedPrice" class="comma">상품가격</span>
+                                    <span class="priceUnit"></span><span class="priceUnit">${curUnit}</span>
+                                </span>
+							</div>
+						</div>
+						<div class="fixedProduct__right">
+							<button type="button" id="fixedButton" class="btn theme lg purchsOrdr" onclick="fn_purchs_subsvc();">구독하기</button>
+						</div>
+					</div>
+				</div>
 				<div id="subsvcDc" class="ck-content">구독 서비스 상품 설명</div>
 			</form>
 		</div>

src/main/webapp/WEB-INF/views/sopmal/mbr/JoinC.jsp

@@ -635,6 +635,14 @@
 			return;
 		}
 
+		// console.log("mbtlnb : ",$('#mbtlnb').val());
+		if ($('#mbtlnb').val() === null || $('#mbtlnb').val() === '') {
+			alert('휴대폰 번호를 입력해주세요.');
+			$('#mbtlnb').focus();
+			fn_regist_fail();
+			return;
+		}
+
 		if (!isChkd_Dup) {
 			alert('아이디 중복 확인을 해주세요.');
 			$('#mbrId').focus();
@@ -690,7 +698,7 @@
 			return;
 		}
 		fn_make_brthDe();
-		// fn_make_mbtlnb();
+		fn_make_mbtlnb();
 		var email = $('#email').val();
 		$('[name=email]').val(email.trim());
 
@@ -1060,6 +1068,13 @@
 									<tbody id="rejoinSelect"></tbody>
 								</table>
 							</div>
+							<div class="signUp__inputBox__item">
+								<div class="signUp__inputBox__itemTitle">휴대전화<span class="required-asterisk">*</span></div>
+								<div class="inputWithBtn">
+									<input type="text" class="input-text full number" id="mbtlnb" title="휴대폰" placeholder="휴대폰번호 입력 (’-’ 없이)" oninput="fn_set_event(this, 'keyup', fn_fmt_telno)" maxlength="13">
+									<input type="hidden" name="mbtlnb">
+								</div>
+							</div>
 							<div class="signUp__inputBox__item">
 								<div class="signUp__inputBox__itemTitle">아이디<span class="required-asterisk">*</span></div>
 								<div class="inputWithBtn">

src/main/webapp/WEB-INF/views/sopmal/mpage/bnef/DwldCouponDtlsR.jsp

@@ -64,38 +64,8 @@
                         <div class="couponList__right">
                             <div class="couponList__image">
                                 <c:choose>
-                                    <c:when test="${ couponList.sopmalCd eq 'NC' }">
+                                    <c:when test="${ couponList.sopmalCd eq 'SK' }">
-                                        <img src="/pc/images/쿠폰이미지01.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
+                                        <img src="/pc/images/쿠폰이미지99.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'CH' }">
-                                        <img src="/pc/images/쿠폰이미지02.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'TZ' }">
-                                        <img src="/pc/images/쿠폰이미지03.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'DT' }">
-                                        <img src="/pc/images/쿠폰이미지04.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'PL' }">
-                                        <img src="/pc/images/쿠폰이미지05.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'LF' }">
-                                        <img src="/pc/images/쿠폰이미지06.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'AF' }">
-                                        <img src="/pc/images/쿠폰이미지07.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'DL' }">
-                                        <img src="/pc/images/쿠폰이미지08.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'JM' }">
-                                        <img src="/pc/images/쿠폰이미지09.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'NB' }">
-                                        <img src="/pc/images/쿠폰이미지10.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'BD' }">
-                                        <img src="/pc/images/쿠폰이미지11.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
                                     </c:when>
                                 </c:choose>
                             </div>

src/main/webapp/WEB-INF/views/sopmal/mpage/bnef/UsePosblCouponDtlsR.jsp

@@ -60,38 +60,8 @@
                         <div class="couponList__right">
                             <div class="couponList__image">
                                 <c:choose>
-                                    <c:when test="${ couponList.sopmalCd eq 'NC' }">
+                                    <c:when test="${ couponList.sopmalCd eq 'SK' }">
-                                        <img src="/pc/images/쿠폰이미지01.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
+                                        <img src="/pc/images/쿠폰이미지99.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'CH' }">
-                                        <img src="/pc/images/쿠폰이미지02.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'TZ' }">
-                                        <img src="/pc/images/쿠폰이미지03.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'DT' }">
-                                        <img src="/pc/images/쿠폰이미지04.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'PL' }">
-                                        <img src="/pc/images/쿠폰이미지05.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'LF' }">
-                                        <img src="/pc/images/쿠폰이미지06.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'AF' }">
-                                        <img src="/pc/images/쿠폰이미지07.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'DL' }">
-                                        <img src="/pc/images/쿠폰이미지08.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'JM' }">
-                                        <img src="/pc/images/쿠폰이미지09.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'NB' }">
-                                        <img src="/pc/images/쿠폰이미지10.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
-                                    </c:when>
-                                    <c:when test="${ couponList.sopmalCd eq 'BD' }">
-                                        <img src="/pc/images/쿠폰이미지11.png" onerror="this.src='/pc/images/image_placeholder.png'" alt="">
                                     </c:when>
                                 </c:choose>
                             </div>

src/main/webapp/WEB-INF/views/sopmal/mpage/main/MpageMainR.jsp

@@ -40,6 +40,7 @@
          **********************************************************/
         const fn_init = function () {
             fn_get_ordr_dlvy_list(1);
+            fn_get_subsvc_ordr_dlvy_list(1);
         }
 
         /* ********************************************************
@@ -535,9 +536,32 @@
                     $('#pageDiv').html(html);
                 },
                 error:function (request) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
+                }
+            });
+        }
+
+        /* 구독서비스 주문/배송 목록 조회 */
+        const fn_get_subsvc_ordr_dlvy_list = function (index) {
+            if (!fn_is_empty(index)) {
+                $('#subsvcPageIndex').val(index);
+            }
+
+            let data = $('#subsvcCondForm').serialize();
+
+            $.ajax({
+                type:'post',
+                url:'<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireMapge"/>',
+                data:data,
+                success:function (html) {
+                    $('#subsvcPageDiv').html(html);
+                },
+                error:function (request) {
+                    let message = JSON.parse(request.responseText).resBody.result;
+
+                    alert(message);
                 }
             });
         }
@@ -563,9 +587,9 @@
                     }
                 },
                 error:function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -591,9 +615,9 @@
                     }
                 },
                 error:function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -611,6 +635,19 @@
             $(form).submit();
         }
 
+        /* 구독서비스 주문상세 이동 */
+        const fn_go_subsvc_dtl = function (sopmalCd, ordrInnb) {
+            var form = $('#condForm');
+
+            $(form).append($('<input/>', {type: 'hidden', name: 'ordrInnb', id: 'ordrInnb', value: ordrInnb}));
+            $(form).append($('<input/>', {type: 'hidden', name: 'dateRange', id: 'dateRange', value: 'allDays'}));
+
+            $(form).attr('method', 'get');
+            $(form).attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrDtlInqire"/>');
+
+            $(form).submit();
+        }
+
         /* 검색조건 세팅 */
         const fn_set_param = function () {
             const params = ${paramVO};
@@ -701,9 +738,9 @@
                     }
                 },
                 error:function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -752,9 +789,9 @@
                     }
                 },
                 error:function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -812,9 +849,9 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -932,6 +969,15 @@
                             <a class="sub-right-content__more" href="/sopmal/mpage/ordr/selectMbrOrdrListInqire">전체보기</a>
                         </div>
 
+                        <div class="sub-right-content__section">
+                            <h3 class="sub-right-content__innerTitle">최근 주문 (구독서비스)</h3>
+                            <form id="subsvcCondForm">
+                                <input type="hidden" name="pageIndex" id="subsvcPageIndex" value="1">
+                            </form>
+                            <div id="subsvcPageDiv"></div>
+                            <a class="sub-right-content__more" href="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireRForm">전체보기</a>
+                        </div>
+
                         <div class="sub-right-content__section">
                             <h3 class="sub-right-content__innerTitle">위시리스트</h3>
                                 <c:choose>

src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcManagePopupR.jsp

@@ -40,15 +40,20 @@
                             <div class="shipping-list__item">
                                 <div class="shipping-list__item-top">
                                     <div class="custom-radio-container">
-                                        <div class="custom-radio" onclick = "fn_select_mngrOrdr_postcode(${callbackNm},${status.index}, '${formId}')">
+                                        <div class="custom-radio">
-                                            <label for="${status.index}">
+<%--                                        <div class="custom-radio" onclick = "fn_select_mngrOrdr_postcode(${callbackNm},${status.index}, '${formId}')">--%>
+<%--                                            <label for="${status.index}">--%>
                                                 <span><c:out value="${resultMap.dlvylcDcCn }" /></span>
-                                            </label>
+<%--                                            </label>--%>
                                         </div>
                                         <c:if test="${resultMap.dftDlvylcAt eq 'Y'}">
                                             <span class="default-address">기본배송지</span>
                                         </c:if>
                                     </div>
+                                    <button type = "button" class="shipping-apply-btn"
+                                            onclick = "fn_select_mngrOrdr_postcode(${callbackNm}, ${status.index}, '${formId}')">
+                                        적용
+                                    </button>
                                     <button type = "button" class="shipping-modify-btn" id="upt<c:out value="${resultMap.adbkInnb}" />"
                                             onclick="fn_move_dlvylc_uptpage_pop('<c:out value='${pageIndex}'/>',
                                                                                 '<c:out value='${resultMap.adbkInnb}'/>',
@@ -64,7 +69,7 @@
                                         </button>
                                     </c:if>
                                 </div>
-                                <label for="${status.index}" onclick = "fn_select_mngrOrdr_postcode(${callbackNm},${status.index}, '${formId}')">
+<%--                                <label for="${status.index}" onclick = "fn_select_mngrOrdr_postcode(${callbackNm},${status.index}, '${formId}')">--%>
                                     <div class="shipping-list__item-inner">
                                         <p class="name"><c:out value="${resultMap.recpntNm }" /></p>
                                         <p>(<c:out value="${resultMap.zip }" />)
@@ -80,7 +85,7 @@
                                         </p>
                                         <p class="number mbtlnbPop"><c:out value="${resultMap.mbtlnb}" /></p>
                                     </div>
-                                </label>
+<%--                                </label>--%>
                             </div>
                         </div>
                         <input type="hidden" name="zip" class = "zip" value="<c:out value='${resultMap.zip}'/>" />

src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcUpdtPopupU.jsp

@@ -34,12 +34,12 @@
         });
     });
 </script>
-<div id="dlvylcUpdate" class="modal default" style="max-width: 600px;">
+<div id="dlvylcUpdate" class="modal default" style="max-width: 600px; max-height: 100%;">
     <form id="dlvylcUpdtForm" name="dlvylcUpdtForm" action="<c:url value="/crm/dlvylc/updateDlvylcUpdt"/>" method="post">
         <div class="modal-header">
             <div class="modal-header__title">배송지 수정</div>
         </div>
-        <div class="modal-content">
+        <div class="modal-content" style="max-height: 600px;">
             <div class="custom-radio-container">
                 <div class="custom-radio">
                     <input type="radio" id="langKr" name="dlvylcAreaCd" value="KR" <c:if test="${'KR' eq dtlDlvylc.resultVO.dlvylcAreaCd}">checked</c:if>>

src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/MbrInfoUpdtU.jsp

@@ -54,17 +54,17 @@
 // 			fn_alert_hide_selected();
 
 			//휴대폰번호 포매팅
-			// if($("#lagacyMbtlnb").text() !== ''){
+			if($("#mbtlnb").val() !== ''){
-			// 	fn_set_lagacyMbtlnb($("#lagacyMbtlnb").text());
+				fn_set_lagacyMbtlnb($("#mbtlnb").val());
-			// }
+			}
 		});
 
 		/* ********************************************************
 		 * 휴대폰번호 포매팅
 		 ******************************************************** */
 		const fn_set_lagacyMbtlnb = function(mbtlnb) {
-			$("#lagacyMbtlnb").text(fn_format_mbtlnb(mbtlnb));
+			$("#mbtlnb").val(fn_format_mbtlnb(mbtlnb));
-			$("#inputMbtlnb").val(mbtlnb);
+			// $("#inputMbtlnb").val(mbtlnb);
 		}
 
 		/* ********************************************************
@@ -838,6 +838,15 @@
 			// 	$('#dtlAdres').focus();
 			// 	return;
 			// }
+			if ($('#mbtlnb').val() === null || $('#mbtlnb').val() === '') {
+				alert('휴대폰 번호를 입력해주세요.');
+				$('#mbtlnb').focus();
+				return;
+			}
+
+			let mbtlnb = $('#mbtlnb').val().trim().replace(/-/g, '');
+			$('[name=mbtlnb]').val(mbtlnb);
+			// console.log("mbtlnb : ",mbtlnb);
 
 			const data = $("#mbrInfoUpdtForm").serialize();
 			if (confirm('회원 정보를 <spring:message code="confirm.common.update"/>')) {
@@ -1195,6 +1204,18 @@
 														</div>
 													</td>
 												</tr>
+												<tr>
+													<th>
+														<span class="editAccount__title">휴대폰번호</span>
+													</th>
+													<td>
+														<div class="inputWithBtn">
+															<input type="text" class="input-text full number update-text" id="mbtlnb" title="휴대폰" placeholder="휴대폰번호 입력 (’-’ 없이)" oninput="fn_set_event(this, 'keyup', fn_fmt_telno)" value="<c:out value="${ resultMap.result.mbtlnb }"/>" maxlength="13">
+															<input type="hidden" name="mbtlnb" value="<c:out value="${resultMap.result.mbtlnb}"/>" id="inputMbtlnb">
+														</div>
+<%--														<p class="signUp__inputBox__alertText" id="mbtlnbAlert">휴대폰 번호를 입력해 주세요.</p>--%>
+													</td>
+												</tr>
 <%--												<tr>--%>
 <%--													<th>--%>
 <%--														<span class="editAccount__title">이메일</span>--%>

src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/IndvdlSetleR.jsp

@@ -64,9 +64,9 @@
                     $('#pageDiv').html(html);
                 },
                 error: function(data) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }

src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/NmbrOrdrDtlR.jsp

@@ -542,9 +542,9 @@
                     }
                 },
                 error: function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -572,9 +572,9 @@
                     }
                 },
                 error: function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -653,9 +653,9 @@
                     }
                 },
                 error: function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                     $("#btnSetleCancl").prop("disabled",false);
                 }
             });
@@ -702,9 +702,9 @@
                     }
                 },
                 error: function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -773,9 +773,9 @@
                     }
                 },
                 error: function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                     $("#btnReturnRegist").prop("disabled",false);
                 }
             });
@@ -1382,7 +1382,8 @@
                                 </tr>
                                 </tbody>
                             </table>
-                            <p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 문자와 이메일로 발송됩니다.</p>
+<%--                            <p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 문자와 이메일로 발송됩니다.</p>--%>
+                            <p class="textInfo"><i class="icon icon_textInfo--sm"></i>주문자 정보로 주문 관련 정보가 이메일로 발송됩니다.</p>
                         </div>
                     </div>
 

src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListR.jsp

@@ -557,9 +557,9 @@
                     $('#pageDiv').html(html);
                 },
                 error:function (data) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -587,9 +587,9 @@
                     }
                 },
                 error:function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -619,9 +619,9 @@
                     fn_mpage_info_refresh();
                 },
                 error:function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -743,9 +743,9 @@
                     }
                 },
                 error:function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
 
-                    alert(message.errorMsg);
+                    alert(message);
                 }
             });
         }
@@ -814,8 +814,8 @@
                     $('#btnSetleCancl').prop('disabled', false);
                 },
                 error:function (request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
-                    alert(message.errorMsg);
+                    alert(message);
                     $('#btnSetleCancl').prop('disabled', false);
                 }
             }).done( function (data) {
@@ -899,8 +899,8 @@
                     }
                 },
                 error : function(request, status, error) {
-                    let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
+                    let message = JSON.parse(request.responseText).resBody.result;
-                    alert(message.errorMsg);
+                    alert(message);
                     $('#btnReturnRegist').prop('disabled', false);
                 }
             });

src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp

@@ -21,7 +21,8 @@
                         <div class="orderList__item__top">
                             <a href="javascript:void(0);" onclick="fn_go_ordr_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__orderNum"><c:out value="${order.ordrInnb}"/></a>
                             <span class="orderList__dot">·</span>
-                            <span class="orderList__date"><c:out value="${order.ordrDt}"/> <span class="orderList__dot">·</span> ${order.ordrTyCdNm}</span>
+<%--                            <span class="orderList__date"><c:out value="${order.ordrDt}"/> <span class="orderList__dot">·</span> ${order.ordrTyCdNm}</span>--%>
+                            <span class="orderList__date"><c:out value="${order.ordrDt}"/></span>
                         </div>
                         <a href="javascript:void(0);" onclick="fn_go_ordr_dtl('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="orderList__productTitle"><c:out value="${order.goodsNm}"/></a>
                         <%--<span class="orderList__option"><c:out value="${order.optnNm}"/></span>--%>
@@ -49,6 +50,9 @@
                             <c:when test="${order.ordrSttusCd == 75}">
                                 <span class="orderList__status complete"><c:out value="${order.ordrSttusNm}"/></span>
                             </c:when>
+                            <c:when test="${order.ordrSttusCd > 84 && order.ordrSttusCd < 100}">
+                                <a class="btn full orderList__status cancel" style="background-color:transparent;"><c:out value="${order.ordrSttusNm}"/></a>
+                            </c:when>
                         </c:choose>
                         <c:if test="${ order.ordrTyCd == '04'}">
                             <br/>