fix : 구독서비스 주문/배송 - 주문 접수(15) → 주문 무효(95) 버튼 추가

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

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

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

@@ -306,8 +306,12 @@ public class BOMaMtngService {
 		}
 
 		for(BOPreOrderValidVO goods : goodsList) {
-
+			List<DataMap> resultValid = new ArrayList<>();
-			List<DataMap> resultValid = mapper.selectBOPreOrderValidation(goods);
+			if(goods.getSubsvcInnb() != "") {
+				resultValid = mapper.selectBOSubsvcPreOrderValidation(goods);
+			} else {
+				resultValid = mapper.selectBOPreOrderValidation(goods);
+			}
 
 			//구매정보 변경대상 필터링
 			// 값이 1인 항목 == 변경항목
@@ -473,12 +477,14 @@ public class BOMaMtngService {
 		goodsList.forEach(goods -> {
 
 			String goodsInnb = StringUtil.isNullToString(goods.get("goodsInnb"));
-
+			String subsvcInnb = StringUtil.isNullToString(goods.get("subsvcInnb"));
 
 			//상품별 수량합계
 			int goodsTotalQy = 0;
 			if(qySums.containsKey(goodsInnb)){
 				goodsTotalQy = qySums.getOrDefault(goodsInnb, 0);
+			} else if (qySums.containsKey(subsvcInnb)) {
+				goodsTotalQy = qySums.getOrDefault(subsvcInnb, 0);
 			}
 
 
@@ -514,6 +520,7 @@ public class BOMaMtngService {
 						.sopmalCd(StringUtil.isNullToString(goods.get("sopmalCd")))
 						.goodsInnb(StringUtil.isNullToString(goods.get("goodsInnb")))
 						.goodsOptnInnb(StringUtil.isNullToString(goods.get("goodsOptnInnb")))
+						.subsvcInnb(StringUtil.isNullToString(goods.get("subsvcInnb")))
 						.mbrInnb(StringUtil.isNullToString(goods.get("mbrInnb")))
 						.mbrDvCd(StringUtil.isNullToString(goods.get("mbrDvCd")))
 						.qy(StringUtil.isNullToString(goods.get("qy")))

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

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

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

@@ -25,6 +25,7 @@ import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Service
 @Slf4j
@@ -569,7 +570,7 @@ public class BOOrderService {
         /* ***********************************
             4. 주문상품 등록(GC_ORDER_ITEM)
          *********************************** */
-        List<BOOrderItemVO> insertedGoodsList = insertOrdrGoods(sopmalCd, "01", ordrInnb, goodsList);
+        List<BOOrderItemVO> insertedGoodsList = insertOrdrGoods(sopmalCd, "01", ordrInnb, goodsList, subsvcAt);
 
         BOOrderShippingVO shippingEscrowVO = new BOOrderShippingVO();
         if ("01".equals(ordrTyCd) || "03".equals(ordrTyCd) || "04".equals(ordrTyCd) || "06".equals(ordrTyCd)) { // 일반주문, 회원 개인결제, 정기배송
@@ -869,8 +870,14 @@ public class BOOrderService {
                             int goodsOptnInnb = (int) goods.get("goodsOptnInnb");
                             int ordrQy = (int) goods.get("qy");
 
-                            BOOrderItemVO orderItemVO = insertedGoodsList.stream().filter(obj-> Objects.equals(ordrInnb, obj.getOrdrInnb()) &&
+                            List<BOOrderItemVO> orderItemVOList = insertedGoodsList.stream().filter(obj-> Objects.equals(ordrInnb, obj.getOrdrInnb()) &&
-                                                                                          Objects.equals(BigInteger.valueOf(goodsInnb), obj.getGoodsInnb())).findAny().orElse(null);
+                                                                                                          Objects.equals(BigInteger.valueOf(goodsInnb), obj.getGoodsInnb())).toList();
+                            BOOrderItemVO orderItemVO = new BOOrderItemVO();
+                            if(subsvcAt) {
+                                orderItemVO = orderItemVOList.size() > allGoodsCount ? orderItemVOList.get(allGoodsCount) : null;
+                            } else {
+                                orderItemVO = orderItemVOList.stream().findAny().orElse(null);
+                            }
 
                             /* ***********************************************
                                 6. 주문 상품 옵션 정보 등록(GC_ORDER_ITEM_OPTION)
@@ -1051,7 +1058,14 @@ public class BOOrderService {
      * @return
      */
     public List<BOOrderItemVO> insertOrdrGoods(String sopmalCd, String goodsKndCd, BigInteger ordrInnb, List<LinkedHashMap> goodsList) {
-        List<Integer> goodsInnbList = (goodsList.stream().map(obj-> (int) obj.get("goodsInnb")).toList()).stream().distinct().toList(); // 상품번호 목록(중복제거)
+        return insertOrdrGoods(sopmalCd, goodsKndCd, ordrInnb, goodsList, false);
+    }
+    public List<BOOrderItemVO> insertOrdrGoods(String sopmalCd, String goodsKndCd, BigInteger ordrInnb, List<LinkedHashMap> goodsList, Boolean subsvcAt) {
+        Stream<Integer> goodsInnbstream = goodsList.stream().map(obj -> (int) obj.get("goodsInnb"));
+        if(!subsvcAt) // 상품번호 목록(중복제거)
+            goodsInnbstream = goodsInnbstream.distinct();
+        List<Integer> goodsInnbList = goodsInnbstream.toList();
+
         boolean tmAt = goodsList.stream().anyMatch(map -> map.containsKey("tmAt")); //tm주문 여부
         List<BOOrderItemVO> insertedGoodsList = new ArrayList<>(); // 주문상품 목록
 

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

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

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

@@ -1,13 +1,15 @@
 package com.wb.domainserver.domain.gcone.goods.subsvc.service;
 
-import com.wb.domainserver.domain.gcone.goods.goodsinfo.vo.BOGoodsInfoVO;
 import com.wb.domainserver.domain.gcone.goods.subsvc.mapper.BOSubsvcMapper;
 import com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO;
+import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrVO;
 import com.wb.domainserver.util.dataaccess.DataMap;
 import io.micrometer.common.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -137,4 +139,51 @@ public class BOSubsvcService {
 		return message;
 	}
 
+	/**
+	 * 주문에 따른 판매재고수량 수정
+	 * @param ordrVO
+	 * @return
+	 */
+	@Transactional
+	public void updateSubsvcOrdrUsefulInvntryQy(BOOrdrVO ordrVO) throws Exception {
+		BOSubsvcVO subsvcVO = new BOSubsvcVO();
+		BeanUtils.copyProperties(ordrVO, subsvcVO);
+
+		//판매수량 수정
+		mapper.updateSubsvcOrdrUsefulInvntryQy(subsvcVO);
+		//구독서비스 상태 수정
+		mapper.updateInvntryPolicySubsvcSttusChng(subsvcVO);
+	}
+
+	/**
+	 * 환불에 따른 판매재고수량 수정
+	 * @param ordrVO
+	 * @return
+	 */
+	@Transactional
+	public void updateSubsvcRefundUsefulInvntryQy(BOOrdrVO ordrVO) throws Exception {
+		BOSubsvcVO subsvcVO = new BOSubsvcVO();
+		BeanUtils.copyProperties(ordrVO, subsvcVO);
+
+		//판매수량 수정
+		mapper.updateSubsvcRefundUsefulInvntryQy(subsvcVO);
+		//구독서비스 상태 수정
+		mapper.updateInvntryPolicySubsvcSttusChng(subsvcVO);
+	}
+
+	/**
+	 * 주문취소에 따른 판매재고수량 수정
+	 * @param ordrVO
+	 * @return
+	 */
+	@Transactional
+	public void updateSubsvcCancelOrderUsefulInvntryQy(BOOrdrVO ordrVO) throws Exception {
+		BOSubsvcVO subsvcVO = new BOSubsvcVO();
+		BeanUtils.copyProperties(ordrVO, subsvcVO);
+
+		//판매수량 수정
+		mapper.updateSubsvcCancelOrderUsefulInvntryQy(subsvcVO);
+		//구독서비스 상태 수정
+		mapper.updateInvntryPolicySubsvcSttusChng(subsvcVO);
+	}
 }

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

@@ -4,6 +4,7 @@ import com.wb.domainserver.domain.comm.vo.AbstractVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigInteger;
 import java.util.List;
 
 @Data
@@ -12,14 +13,14 @@ public class BOSubsvcVO extends AbstractVO {
 
 private static final long serialVersionUID = 1L;
 
-	/** 구독서비스고유번호 */
-	private String subsvcInnb;
 	/** 쇼핑몰코드 */
 	private String sopmalCd;
 	/** 구독서비스명 */
 	private String subsvcNm;
 	/** 구독기간 */
 	private String subPd;
+	/** 구독서비스고유번호 */
+	private String subsvcInnb;
 	/** 구독서비스기수 */
 	private String subsvcGnr;
 	/** 구독서비스명 다음기수 */
@@ -108,6 +109,8 @@ private static final long serialVersionUID = 1L;
 	private Integer mbrInnb;
 	/** 회원구분코드 */
 	private String mbrDvCd;
+	/** 주문고유번호 */
+	private String ordrInnb;
 
 
 	/** 결제상품정보 */

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

@@ -6015,8 +6015,8 @@ public class BOOrdrService{
             LinkedHashMap subsvcOne = subsvcList.get(0);
             log.debug("subsvcOne : {}", subsvcOne);
 
-            goodsAmt = BigDecimal.valueOf((Integer) subsvcOne.get("selpric"));
+            goodsAmt = BigDecimal.valueOf((Integer) subsvcOne.get("slepric"));
-            setleAmt = BigDecimal.valueOf((Integer) subsvcOne.get("selpric"));
+            setleAmt = BigDecimal.valueOf((Integer) subsvcOne.get("slepric"));
             log.debug("결제 예정 금액 : {}", setleAmt);
 
             // 환율계산

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

@@ -1,53 +1,45 @@
 package com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.service;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.wb.domainserver.domain.gcone.goods.goods.service.BOGoodsService;
 import com.wb.domainserver.domain.gcone.goods.purchs.mapper.BOPurchsMapper;
 import com.wb.domainserver.domain.gcone.goods.purchs.service.BOOrderService;
 import com.wb.domainserver.domain.gcone.goods.purchs.vo.BOOrderLogVO;
+import com.wb.domainserver.domain.gcone.goods.subsvc.service.BOSubsvcService;
 import com.wb.domainserver.domain.gcone.mbr.mlg.service.BOMlgService;
 import com.wb.domainserver.domain.gcone.mbr.mlg.vo.BOCashVO;
 import com.wb.domainserver.domain.gcone.mbr.mlg.vo.BOMlgVO;
 import com.wb.domainserver.domain.gcone.ntcn.mssage.service.BOMssageService;
 import com.wb.domainserver.domain.gcone.ordr.ordr.mapper.BOOrdrMapper;
-import com.wb.domainserver.domain.gcone.ordr.ordr.service.BOOrdrService;
-import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrDlvyVO;
 import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrRefundVO;
+import com.wb.domainserver.domain.gcone.ordr.ordr.vo.BOOrdrVO;
 import com.wb.domainserver.domain.gcone.ordr.pay.service.BOPayService;
 import com.wb.domainserver.domain.gcone.ordr.pay.vo.BOPayVO;
+import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.mapper.BORtngudrefndMapper;
 import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BOOrderReItemVO;
 import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORefundSetleVO;
+import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORtngudrefndSrchVO;
+import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORtngudrefndVO;
 import com.wb.domainserver.domain.gcone.ordr.selngpruf.service.BOSelngprufService;
 import com.wb.domainserver.domain.gcone.ordr.selngpruf.vo.BOSelngprufVO;
 import com.wb.domainserver.domain.gcone.promtn.coupon.service.BOCouponService;
 import com.wb.domainserver.domain.gcone.promtn.coupon.vo.BODwldCouponVO;
 import com.wb.domainserver.domain.gcone.setup.site.mapper.BOSiteMapper;
-import com.wb.domainserver.domain.gcone.setup.site.vo.BOSetupContentsItemVO;
 import com.wb.domainserver.exception.WnbtRestException;
+import com.wb.domainserver.util.dataaccess.DataMap;
 import com.wb.domainserver.util.string.StringUtil;
-import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.wb.domainserver.domain.admin.sys.comncd.service.BOMaComncdService;
-import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.mapper.BORtngudrefndMapper;
-import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORtngudrefndSrchVO;
-import com.wb.domainserver.domain.gcone.ordr.rtngudrefnd.vo.BORtngudrefndVO;
-import com.wb.domainserver.util.dataaccess.DataMap;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.support.WebExchangeBindException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
 *
@@ -87,6 +79,9 @@ public class BORtngudrefndService {
 	@Autowired
 	private BOOrderService orderService;
 
+	@Autowired
+	private BOSubsvcService subsvcService;
+
 	@Autowired
 	private BORtngudrefndMapper mapper;
 
@@ -1331,7 +1326,18 @@ public class BORtngudrefndService {
 		if ("0".equals(message.get("status"))) {
 
 			// ########################################### 상품 재고  ###########################################
+			BOOrdrVO ordrVO = new BOOrdrVO();
+			ordrVO.setOrdrInnb(refundVO.getOrdrInnb());
+			ordrVO.setSopmalCd(refundVO.getSopmalCd());
+
+			DataMap ordrDtl = ordrMapper.selectOrdrDtl(ordrVO);
+			boolean subsvcAt = "Y".equals(ordrDtl.get("subsvcAt"));
+			if(subsvcAt) {
+				ordrVO.setSubsvcInnb(ordrDtl.get("subsvcInnb").toString());
+				subsvcService.updateSubsvcRefundUsefulInvntryQy(ordrVO);
+			} else {
 				boGoodsService.updateRefundUsefulInvntryQy(refundVO);
+			}
 
 
 			// ########################################### 쿠폰 복원 ###########################################
@@ -1486,7 +1492,18 @@ public class BORtngudrefndService {
 
 
 			// ########################################### 상품 재고  ###########################################
+			BOOrdrVO boOrdrVO = new BOOrdrVO();
+			boOrdrVO.setOrdrInnb(ordrVO.getOrdrInnb());
+			boOrdrVO.setSopmalCd(ordrVO.getSopmalCd());
+
+			DataMap ordrDtl = ordrMapper.selectOrdrDtl(boOrdrVO);
+			boolean subsvcAt = "Y".equals(ordrDtl.get("subsvcAt"));
+			if(subsvcAt) {
+				boOrdrVO.setSubsvcInnb(ordrDtl.get("subsvcInnb").toString());
+				subsvcService.updateSubsvcCancelOrderUsefulInvntryQy(boOrdrVO);
+			} else {
 				boGoodsService.updateCancelOrderUsefulInvntryQy(ordrVO, ordrVO.getOrdrInnb());
+			}
 
 			resotreResult.put("restoreResult", "0");
 		} catch (Exception e) {

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

@@ -2898,7 +2898,18 @@ public class OrdrController {
 
             // 2.가용재고수량 수정 ==============================================================
             try {
+                BOOrdrVO ordrVO = new BOOrdrVO();
+                ordrVO.setOrdrInnb(orderVO.getOrdrInnb().toString());
+                ordrVO.setSopmalCd(orderVO.getSopmalCd());
+
+                DataMap ordrDtl = (DataMap) service.selectOrdrDtlInqire(ordrVO).get("dtl");
+                boolean subsvcAt = "Y".equals(ordrDtl.get("subsvcAt"));
+                if(subsvcAt) {
+                    ordrVO.setSubsvcInnb(ordrDtl.get("subsvcInnb").toString());
+                    subsvcService.updateSubsvcOrdrUsefulInvntryQy(ordrVO);
+                } else {
                     boGoodsService.updateOrdrUsefulInvntryQy(orderVO);
+                }
             } catch (Exception e) {
                 logVO.setFailContent("상품 재고수량 업데이트 실패");
                 log.error("{} 상품 재고수량 업데이트 실패!", payVO.getOrderId());

src/main/resources/application-stage.yml

@@ -359,7 +359,7 @@ mngrfo:
         images: .gif,.jpg,.jpeg,.png
       cdnurl: https://19b0bde6dcdc15ad.kinxzone.com
     subsvc:
-      dft-goods-optn-innb: 5
+      dft-goods-optn-innb: 1
 
 
 secret:

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

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

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

@@ -42,7 +42,7 @@
 				 , GS.SUBSVC_CT					/*구독료*/
 				 , GS.TME_DLVY_AMT				/*1회배송비*/
 				 , GS.CNSMRPRIC					/*소비자가*/
-				 , GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SELPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
+				 , GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT) as SLEPRIC							  /*실판매가=구독료+(1회배송비X배송횟수)*/
 				 , ROUND((GS.CNSMRPRIC - (GS.SUBSVC_CT + (TME_DLVY_AMT * DLVY_CNT))) / NULLIF(GS.CNSMRPRIC, 0) * 100, 0) AS DSCNT_RAITO
 				 , GS.INVNTRY_QY				/*재고수량*/
 				 , GS.USEFUL_INVNTRY_QY 		/*판매재고수량*/
@@ -312,4 +312,89 @@
 		WHERE GS.SOPMAL_CD = #{sopmalCd}
 		  AND GS.SUBSVC_NM = #{subsvcNm}
 	</select>
+	
+
+	<!-- 구독서비스 주문에 따른 판매재고수량 수정 -->
+	<update id="updateSubsvcOrdrUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC GS
+				INNER JOIN (
+					SELECT
+						GO.SUBSVC_INNB,
+						COUNT(*) AS ORDR_QY
+					FROM GC_ORDER GO
+					WHERE GO.SOPMAL_CD = #{sopmalCd}
+					  AND GO.ORDR_INNB = #{ordrInnb}
+					GROUP BY
+						GO.SUBSVC_INNB
+				) SUBQUERY
+				ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+			SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) + SUBQUERY.ORDR_QY
+			WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+		]]>
+	</update>
+
+	<!-- 구독서비스 환불에 따른 판매재고수량 수정 -->
+	<update id="updateSubsvcRefundUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC GS
+				INNER JOIN (
+					SELECT
+						GO.SUBSVC_INNB,
+						SUM(CASE WHEN GOR.REFUND_TY_CD = '01' THEN 1 ELSE 0 END) AS REFUND_QY
+					FROM GC_ORDER GO
+					INNER JOIN GC_ORDER_REFUND GOR
+					   ON GO.ORDR_INNB = GOR.ORDR_INNB
+					WHERE GO.SOPMAL_CD = #{sopmalCd}
+					  AND GO.ORDR_INNB = #{ordrInnb}
+					GROUP BY
+						GO.SUBSVC_INNB
+				) SUBQUERY
+				ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+			SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) - SUBQUERY.REFUND_QY
+			WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+		]]>
+	</update>
+
+	<!-- 구독서비스 주문무효에 따른 판매재고수량 수정 -->
+	<update id="updateSubsvcCancelOrderUsefulInvntryQy" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC GS
+				INNER JOIN (
+					SELECT
+						GO.SUBSVC_INNB,
+						COUNT(*) AS ORDR_QY
+					FROM GC_ORDER GO
+					WHERE GO.SOPMAL_CD = #{sopmalCd}
+					  AND GO.ORDR_INNB = #{ordrInnb}
+					GROUP BY
+						GO.SUBSVC_INNB
+				) SUBQUERY
+				ON GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+			SET GS.USEFUL_INVNTRY_QY = IFNULL(GS.USEFUL_INVNTRY_QY, 0) - SUBQUERY.ORDR_QY
+			WHERE GS.SUBSVC_INNB = SUBQUERY.SUBSVC_INNB
+		]]>
+	</update>
+
+	<!-- 판매재고수량 변경에 따른 구독서비스 상태 수정 -->
+	<update id="updateInvntryPolicySubsvcSttusChng" parameterType="com.wb.domainserver.domain.gcone.goods.subsvc.vo.BOSubsvcVO">
+		<![CDATA[
+			UPDATE GC_SUBSVC
+			SET SUBSVC_STTUS_CD =
+				CASE
+					WHEN INVNTRY_POLICY_CD = '02' THEN SUBSVC_STTUS_CD
+					ELSE
+						CASE
+							WHEN (INVNTRY_QY - IFNULL(USEFUL_INVNTRY_QY, 0)) > IFNULL(AVLINV_LMTT_QY, 0)
+							 AND SUBSVC_STTUS_CD <> '03' THEN '01'
+							WHEN (INVNTRY_QY - IFNULL(USEFUL_INVNTRY_QY, 0)) <= IFNULL(AVLINV_LMTT_QY, 0)
+							 AND SUBSVC_STTUS_CD <> '03' THEN '02'
+							ELSE SUBSVC_STTUS_CD
+					END
+				END
+			WHERE SUBSVC_INNB = #{subsvcInnb}
+			  AND SOPMAL_CD = #{sopmalCd}
+			  AND USE_AT = 'Y'
+		]]>
+	</update>
 </mapper>

src/main/webapp/WEB-INF/views/mngr/goods/subsvc/SubsvcU.jsp

@@ -33,6 +33,9 @@
             $(this).val(input.replace(/[^0-9]/g, "").replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,"));
         });
 
+        //실판매가 세팅
+        fn_cal_selpric();
+
         const expsrSetTable = document.getElementById('expsrSet');
         //노출예약 체크되어있을 경우 enable 처리
         if($("input[name='expsrDvCd']:checked").val() ==='03'){
@@ -504,7 +507,6 @@
                 <input type="hidden" id="expsrBgnDt" name="expsrBgnDt" value="${resultMap.subsvcDtl.expsrBgnDt}">
                 <input type="hidden" id="expsrEndDt" name="expsrEndDt" value="${resultMap.subsvcDtl.expsrEndDt}">
                 <input type="hidden" id="invntryPolicyCdAsIs" value="${resultMap.subsvcDtl.invntryPolicyCd}">
-                <input type="hidden" id="usefulInvntryQy" name="usefulInvntryQy" value="${resultMap.subsvcDtl.usefulInvntryQy}">
                 <spring:eval expression="@environment.getProperty('spring.servlet.multipart.max-file-size')" var="maxFileSize"/>
                 <spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.extensions.images')" var="acceptFileExtensions"/>
                 <spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
@@ -613,7 +615,7 @@
                                     <th>실판매가<span class="red-7">*</span></th>
                                     <td>
                                         <div class="td-inner">
-                                            <input class="input-text sm number text-right allow-zero" type="text" title="실판매가" id="selpric" name="selpric" maxlength="11" value="${resultMap.subsvcDtl.selpric}" required readonly> 円(엔)
+                                            <input class="input-text sm number text-right allow-zero" type="text" title="실판매가" id="selpric" name="selpric" maxlength="11" required readonly> 円(엔)
                                         </div>
                                     </td>
                                 </tr>
@@ -633,9 +635,9 @@
                                 <caption>구독설정</caption>
                                 <colgroup>
                                     <col style="width: 12%;">
-                                    <col>
+                                    <col style="width: 38%">
                                     <col style="width: 12%;">
-                                    <col>
+                                    <col style="width: 38%">
                                 </colgroup>
                                 <tbody>
                                 <tr>
@@ -654,7 +656,7 @@
                                 </tr>
                                 <tr>
                                     <th>판매 상태</th>
-                                    <td colspan="2">
+                                    <td>
                                         <div class="td-inner">
                                             <div class="custom-radio-container">
                                                 <c:forEach items="${resultMap.subsvcSttusList}" var="subsvcSttus" varStatus="status">
@@ -667,6 +669,12 @@
                                             </div>
                                         </div>
                                     </td>
+                                    <th>판매수량</th>
+                                    <td>
+                                        <div class="td-inner">
+                                            <input class="input-text sm text-right" type="text" title="판매재고수량" id="usefulInvntryQy" name="usefulInvntryQy" value="${resultMap.subsvcDtl.usefulInvntryQy}" readonly>
+                                        </div>
+                                    </td>
                                 </tr>
                                 <tr>
                                     <th>노출 여부</th>

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

@@ -54,14 +54,14 @@
 				$('#dlvyCnt').text(data.dlvyCnt);
 				$('#dlvyCycle').text(data.dlvyCycle);
 				$('#cnsmrpric').text(fn_format_number(data.cnsmrpric) + curUnit);
-				$('#selpric').text(fn_format_number(data.selpric) + curUnit);
+				$('#slepric').text(fn_format_number(data.slepric) + curUnit);
 				$('#dscntRaito').text(data.dscntRaito + '%');
 				$('#subsvcDc').html(data.subsvcDc);
-				fn_hide_subsvcDetail(data.subPd, data.dlvyCnt, data.selpric);
+				fn_hide_subsvcDetail(data.subPd, data.dlvyCnt, data.slepric);
 
 				$("#fixedImg").attr("src", cdnurl + data.img);
 				$('#fixedTitle').text(data.subsvcConcatNm);
-				$('#fixedPrice').text(fn_format_number(data.selpric));
+				$('#fixedPrice').text(fn_format_number(data.slepric));
 
 				switch (data.subsvcSttusCd) {
 					case '01':
@@ -87,7 +87,7 @@
 	/******************************************************
 	 *  구독서비스 상세 숨기기
 	 * ****************************************************/
-	const fn_hide_subsvcDetail = function(subPd, dlvyCnt, selpric) {
+	const fn_hide_subsvcDetail = function(subPd, dlvyCnt, slepric) {
 		function isEmpty(val) {
 			return !val || val === 0;
 		}
@@ -99,8 +99,8 @@
 		hideIf(isEmpty(subPd), 'li', '#subPd');
 		hideIf(isEmpty(dlvyCnt), 'li', '#dlvyCnt');
 		hideIf(isEmpty(subPd) && isEmpty(dlvyCnt), '.box', '#subPd');
-		hideIf(isEmpty(selpric), '.box', '#selpric');
+		hideIf(isEmpty(slepric), '.box', '#slepric');
-		hideIf(isEmpty(selpric), '#fixedButton');
+		hideIf(isEmpty(slepric), '#fixedButton');
 	}
 
 	/*************************************************************
@@ -109,19 +109,23 @@
 	const fn_purchs_subsvc = function() {
 		var checkedValue = $("select[name='subsvcInnb']").val();
 
-		var tempForm = $('<form>', {
+		sessionStorage.setItem("subsvcInnb", checkedValue);
-			method: 'post',
+		location.href = "/sopmal/ordr/selectSubsvcPurchsForm" +
-			action: '/sopmal/ordr/selectSubsvcPurchsForm'
+						"?subsvcInnb=" + encodeURIComponent(checkedValue);
-		});
-		$('<input>', {
-			type: 'hidden',
-			name: 'subsvcInnb',
-			value: checkedValue
-		}).appendTo(tempForm);
 
-		tempForm.appendTo('body');
+		// var tempForm = $('<form>', {
-		tempForm.submit();
+		// 	method: 'post',
-		tempForm.remove();
+		// 	action: '/sopmal/ordr/selectSubsvcPurchsForm'
+		// });
+		// $('<input>', {
+		// 	type: 'hidden',
+		// 	name: 'subsvcInnb',
+		// 	value: checkedValue
+		// }).appendTo(tempForm);
+		//
+		// tempForm.appendTo('body');
+		// tempForm.submit();
+		// tempForm.remove();
 	}
 
 	/******************************************************
@@ -262,7 +266,7 @@
 							<div class="box">
 								<div class="productDetailInfo__price__price boxTitle">
 									<span id="cnsmrpric" class="product-unit-price__original"></span>
-									<span id="selpric" class="product-unit-price__current"></span>
+									<span id="slepric" class="product-unit-price__current"></span>
 									<span id="dscntRaito" style="color: red">%</span>
 								</div>
 								<button type="button" id="subscribeBtn" class="btn theme large" onclick="fn_purchs_subsvc();">구독하기</button>

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

@@ -1491,6 +1491,9 @@
                             <div class="multiDeliveryStatus">
                                 <p class="multiDeliveryStatus__title">총 <em><c:out value="${fn:length(data.shippingList)}"/>곳</em>의 배송지로 주문하셨습니다.</p>
                                 <c:choose>
+                                    <c:when test="${order.ordrSttusCd == 15}">
+                                        <a href="javascript:void(0);" onclick="fn_post_cancl_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">주문취소</a>
+                                    </c:when>
                                     <c:when test="${order.ordrSttusCd == 25}">
                                         <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${setleDt}"/>', '<c:out value="${setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">전체 결제취소</a>
                                     </c:when>

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

@@ -53,7 +53,10 @@
             const gcpayCardUseAt = $('#gcpayCardUseAt').val();
             let gcpayAt = ( gcpayCardUseAt === 'Y')? 'Y' : 'N';
             const setleTy = $('#setleSetupTyCd').val();
-            const setleTyCd = (setleTy==='01')?'#pg04':'#pg03';
+            let setleTyCd = '#pg04';
+            if(setleTy==='01')setleTyCd = '#pg04'; //kcp
+            else if(setleTy==='02')setleTyCd = '#pg03'; //toss
+            else if(setleTy==='03')setleTyCd = '#pg06'; //kiwoom
 
             if (gcpayAt === 'N') {
                $(setleTyCd).click();
@@ -528,11 +531,16 @@
 
                 $(form).find('.pgContent').hide();
                 $(form).find('#' + id + 'Content').show();
-                $(form).find('#setleSetupTyCd').val() === '01' ? $(form).find('#pg04Content').show() : $(form).find('#pg03Content').show();
+
+                //$(form).find('#setleSetupTyCd').val() === '01' ? $(form).find('#pg04Content').show() : $(form).find('#pg03Content').show();
+                if($(form).find('#setleSetupTyCd').val() === '01'){$(form).find('#pg04Content').show();}
+                else if($(form).find('#setleSetupTyCd').val() === '02'){$(form).find('#pg03Content').show();}
+                else if($(form).find('#setleSetupTyCd').val() === '03'){$(form).find('#pg06Content').show();}
+
                 $('.order-method-normal__btn').removeClass('active');
                 $(form).find('#pgCmpnyNm').val(pgCmpnyNm);
 
-                if ('pg01' === id || 'pg02' === id) {
+                if ('pg01' === id || 'pg02' === id) {  //GC페이
                     if ('pg02' === id) {
                         $('#gc-pay-bank-cash-receipt').prop('checked', true).trigger("click");
 
@@ -552,7 +560,7 @@
                     $(form).find('#setleTyCd').val('pg01' === id ? '01' : '03');
 
                     $('.bankSlideW, .cardSlideW').slick('setPosition');
-                } else if('pg05' === id){
+                } else if('pg05' === id){  //퀵계좌이체
                     $('#transfer-cash-receipt').prop('checked', true).trigger("click");
 
                     $(form).find('#transfer-cash-receipt').on('click', function () {
@@ -582,7 +590,10 @@
                 const content = $('.order-method-normal__content');
                 const useCashMlgAmt = $('#useCashMlgAmt').val();
 
-                $('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click();
+                //$('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click();
+                if($('#setleSetupTyCd').val() === '01'){$('#pg04').click();}
+                else if($('#setleSetupTyCd').val() === '02'){$('#pg03').click();}
+                else if($('#setleSetupTyCd').val() === '03'){$('#pg06').click();}
 
                 $('.order-method-normal__btn').removeClass('active');
                 $(this).addClass('active');
@@ -2065,7 +2076,7 @@
                     tr += '    </td>';
                     tr += '    <td>';
                     tr += '        <span class="cartItem__beforePrice"><span class="comma product-subCnsmrpric">' + (goods.cnsmrpric).toLocaleString() + '</span>' + curUnit + '</span>';
-                    tr += '        <span class="cartItem__afterPrice"><span class="comma product-dscntApplyAmt">' + (goods.selpric).toLocaleString() + '</span><span class="priceUnit">' + curUnit + '</span></span>';
+                    tr += '        <span class="cartItem__afterPrice"><span class="comma product-dscntApplyAmt">' + (goods.slepric).toLocaleString() + '</span><span class="priceUnit">' + curUnit + '</span></span>';
                     tr += '    </td>';
                     tr += '</tr>';
 
@@ -2968,7 +2979,7 @@
                 return false;
             }
 
-            if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm) {
+            if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm || 'kiwoom' === pgCmpnyNm) {
                 const div = $('#setleForm').find('.order-method-normal');
 
                 if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) {
@@ -3009,7 +3020,12 @@
                     const id = '01' === issuTrgetDvCd ? 'issuTrgetMbtlnb' : 'issuTrgetBsnmNb';
                     let rlPgCmpnyNm = $('#pgCmpnyNm').val();
 
-                    let setleTyId = $('kcp' === pgCmpnyNm ? '#pg04Content' : '#pg03Content').find('button[name="' + setleTyCd + '"]').attr('id');
+                    let pgCont = "";
+                    if('kiwoom' === pgCmpnyNm) pgCont='pg06Content';
+                    else if('kcp' === pgCmpnyNm) pgCont='pg04Content';
+                    else pgCont='pg03Content';
+                    let setleTyId = $('#'+pgCont).find('button[name="' + setleTyCd + '"]').attr('id');
+
 
                     if ('tosspay' === rlPgCmpnyNm) {
                        setleTyId = 'acount'
@@ -3058,7 +3074,7 @@
 
                 $('#setleForm').find('#pgCmpnyNm').val(pgCmpnyNm);
                 $('#setleForm').find('#setleTyCd').val(setleTyCd);
-            } else {
+            } else {  //gc페이
                 if ('01' === setleTyCd) { // 카드
                     const index = $('.cardSlideW').slick('slickCurrentSlide');
                     const curCardId = $('#gcCardId' + index).val();
@@ -3186,7 +3202,7 @@
             // const enuriObj = JSON.parse(enuri);
             // const setleAmtFromEnuri = enuriObj['setleAmt']; // 계산된 결제금액
             const setleAmtFromSubsvc = order.goodsList.reduce(function(sum, item){
-                return sum + Number(item.selpric || 0); // 계산된 결제금액
+                return sum + Number(item.slepric || 0); // 계산된 결제금액
             }, 0);
 
             if (setleAmtFromOrder !== setleAmtFromSubsvc.toString()) {
@@ -3367,38 +3383,6 @@
              fn_get_setle_amt();
 
          }
-    </script>
-
-    <script>
-        /****************************************************************/
-        /* m_Completepayment  설명                                      */
-        /****************************************************************/
-        /* 인증완료시 재귀 함수                                         */
-        /* 해당 함수명은 절대 변경하면 안됩니다.                        */
-        /* 해당 함수의 위치는 kcp_spay_hub.js 보다먼저 선언되어여 합니다.    */
-        /* Web 방식의 경우 리턴 값이 form 으로 넘어옴                   */
-        /****************************************************************/
-        function m_Completepayment(FormOrJson, closeEvent) {
-            var frm = document.order_info;
-
-            /********************************************************************/
-            /* FormOrJson은 가맹점 임의 활용 금지                               */
-            /* frm 값에 FormOrJson 값이 설정 된 frm 값으로 활용 하셔야 됩니다.  */
-            /********************************************************************/
-            GetField(frm, FormOrJson);
-
-            if (frm.res_cd.value == "0000"){
-                /* 결제인증 완료 후 결제승인 요청을 위한 비즈니스 로직 구현 */
-                frm.submit();
-            } else {
-                /* 결제인증 실패에 대한 처리 */
-                alert( "[" + frm.res_cd.value + "] " + frm.res_msg.value );
-
-                location.reload();
-
-                closeEvent();
-            }
-        }
 
         /* 약관 상세 보기, 마케팅동의여부 모달 데이터 정제*/
         const fn_select_clause = (stplatDvCd,agreeAt) => {
@@ -3461,6 +3445,38 @@
         }
     </script>
 
+    <script>
+        /****************************************************************/
+        /* m_Completepayment  설명                                      */
+        /****************************************************************/
+        /* 인증완료시 재귀 함수                                         */
+        /* 해당 함수명은 절대 변경하면 안됩니다.                        */
+        /* 해당 함수의 위치는 kcp_spay_hub.js 보다먼저 선언되어여 합니다.    */
+        /* Web 방식의 경우 리턴 값이 form 으로 넘어옴                   */
+        /****************************************************************/
+        function m_Completepayment(FormOrJson, closeEvent) {
+            var frm = document.order_info;
+
+            /********************************************************************/
+            /* FormOrJson은 가맹점 임의 활용 금지                               */
+            /* frm 값에 FormOrJson 값이 설정 된 frm 값으로 활용 하셔야 됩니다.  */
+            /********************************************************************/
+            GetField(frm, FormOrJson);
+
+            if (frm.res_cd.value == "0000"){
+                /* 결제인증 완료 후 결제승인 요청을 위한 비즈니스 로직 구현 */
+                frm.submit();
+            } else {
+                /* 결제인증 실패에 대한 처리 */
+                alert( "[" + frm.res_cd.value + "] " + frm.res_msg.value );
+
+                location.reload();
+
+                closeEvent();
+            }
+        }
+    </script>
+
     <c:choose>
         <c:when test="${data.payInfo.kcpMid eq 'T0007'}">
             <script type="text/javascript" src="https://testspay.kcp.co.kr/plugin/kcp_spay_hub.js"></script>
@@ -3504,6 +3520,15 @@
             });
         }
     </script>
+
+    <script>
+        function kiwoom_Completepayment() {
+            var frm = document.order_info;
+            const encoded = btoa(unescape(encodeURIComponent(frm.ordrrNm.value)));
+            frm.ordrrNm.value = encoded;
+            frm.submit();
+        }
+    </script>
 </head>
 <body>
 <%-- 공통 Header --%>
@@ -4417,6 +4442,138 @@
                                             </div>
                                         </c:if>
                                         <%-- kcp 결제 종료 --%>
+
+                                        <%-- 키움 결제 시작 --%>
+                                        <c:if test="${'03' eq payInfo.setleSetupTyCd}">
+                                            <div class="custom-radio is-medium">
+                                                <input type="radio" name="pg" id="pg06" value="kiwoom">
+                                                <label for="pg06">일반결제</label>
+                                            </div>
+                                            <div id="pg06Content" class="pgContent order-method-normal" <%-- style="display: none"--%>>
+                                                <div class="order-method-normal__btn-container">
+                                                    <c:if test="${'Y' eq payInfo.cardUseAt}">
+                                                        <button type="button" name="01" id="card" class="order-method-normal__btn gift_pay">
+                                                            <div class="order-method-normal__icon order-method-normal__icon--card"></div>신용카드
+                                                        </button>
+                                                    </c:if>
+                                                        <%--
+                                                        <c:if test="${'Y' eq payInfo.rltmAcntUseAt}">
+                                                            <button type="button" name="03" id="acount" class="order-method-normal__btn gift_pay">
+                                                                <div class="order-method-normal__icon order-method-normal__icon--transfer"></div>실시간 계좌이체
+                                                            </button>
+                                                        </c:if>
+                                                        --%>
+                                                    <c:if test="${'Y' eq payInfo.virtlAcntUseAt}">
+                                                        <button type="button" name="04" id="virtual" class="order-method-normal__btn">
+                                                            <div class="order-method-normal__icon order-method-normal__icon--account"></div>가상계좌
+                                                        </button>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.virtlAcntEscwUseAt}">
+                                                        <button type="button" name="05" id="escrow-virtual" class="order-method-normal__btn not_multi_pay">
+                                                            <div class="order-method-normal__icon order-method-normal__icon--account"></div>가상계좌(에스크로)
+                                                        </button>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.nbkkUseAt}">
+                                                        <button type="button" name="02" id="bank" class="order-method-normal__btn">
+                                                            <div class="order-method-normal__icon order-method-normal__icon--deposit"></div>무통장
+                                                        </button>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.paycoUseAt}">
+                                                        <button type="button" name="10" id="payco" class="order-method-normal__btn gift_pay">
+                                                            <div class="order-method-normal__icon order-method-normal__icon--payco"></div>PAYCO
+                                                        </button>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.tpayUseAt}">
+                                                        <button type="button" name="tosspay" id="tosspay" class="order-method-normal__btn gift_pay">
+                                                            <div class="order-method-normal__icon order-method-normal__icon--toss"></div>토스페이
+                                                        </button>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.npayUseAt}">
+                                                        <button type="button" name="naverpay" id="naverpay" class="order-method-normal__btn gift_pay">
+                                                            <div class="order-method-normal__icon order-method-normal__icon--naver"></div>네이버페이
+                                                        </button>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.kpayUseAt}">
+                                                        <button type="button" name="kakaopay" id="kakaopay" class="order-method-normal__btn gift_pay">
+                                                            <div class="order-method-normal__icon order-method-normal__icon--kakao"></div>카카오페이
+                                                        </button>
+                                                    </c:if>
+                                                </div>
+                                                <div class="order-method-normal__content-wrapper">
+                                                    <c:if test="${'Y' eq payInfo.cardUseAt}">
+                                                        <div id="card-content" class="order-method-normal__content" style="display: none">
+                                                            <div id="card-content-inner" class="order-method-normal__content-inner">
+                                                                <p class="fyi gray-7 mt-10 ml-10 noempty">발급정보 : 카드매출전표(또는 휴대폰결제전표)로 대체합니다.</p>
+                                                            </div>
+                                                        </div>
+                                                    </c:if>
+                                                        <%--
+                                                        <c:if test="${'Y' eq payInfo.rltmAcntUseAt}">
+                                                            <div id="acount-content" class="order-method-normal__content" style="display: none">
+                                                                <div id="acount-content-inner" class="order-method-normal__content-inner"></div>
+                                                            </div>
+                                                        </c:if>
+                                                        --%>
+                                                    <c:if test="${'Y' eq payInfo.virtlAcntUseAt}">
+                                                        <div id="virtual-content" class="order-method-normal__content" style="display: none">
+                                                            <div id="virtual-content-inner" class="order-method-normal__content-inner"></div>
+                                                        </div>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.virtlAcntEscwUseAt}">
+                                                        <div id="escrow-virtual-content" class="order-method-normal__content" style="display: none">
+                                                            <div id="escrow-virtual-content-inner" class="order-method-normal__content-inner"></div>
+                                                        </div>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.nbkkUseAt}">
+                                                        <div id="bank-content" class="order-method-normal__content" style="display: none">
+                                                            <div id="bank-content-inner" class="order-method-normal__content-inner"></div>
+                                                        </div>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.paycoUseAt}">
+                                                        <div id="payco-content" class="order-method-normal__content" style="display: none">
+                                                            <div id="payco-content-inner" class="order-method-normal__content-inner">
+                                                                <div class="infoBox noempty">
+                                                                    <h6 class="infoBox__title">PAYCO 간편결제 안내</h6>
+                                                                    <ol class="infoBox__list">
+                                                                        <li>PAYCO는 온/오프라인 쇼핑은 물론 송금, 멤버십 적립까지 가능한 통합 서비스입니다.</li>
+                                                                        <li>휴대폰과 카드 명의자가 동일해야 결제 가능하며, 결제금액 제한은 없습니다.
+                                                                            <br>- 지원카드: 모든 국내 신용/체크카드
+                                                                        </li>
+                                                                    </ol>
+                                                                </div>
+                                                                <p class="textInfo noempty"><i class="icon icon_textInfo--sm"></i>발급정보 : 카드매출전표(또는 휴대폰결제전표)로 대체합니다.</p>
+                                                            </div>
+                                                        </div>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.tpayUseAt}">
+                                                        <div id="acount-content" class="order-method-normal__content" style="display: none">
+                                                            <div id="acount-content-inner" class="order-method-normal__content-inner">
+                                                                <p class="fyi gray-7 mt-10 ml-10 noempty">발급정보 : 카드매출전표(또는 휴대폰결제전표)로 대체합니다.</p>
+                                                            </div>
+                                                        </div>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.npayUseAt}">
+                                                        <div id="naverpay-content" class="order-method-normal__content" style="display: none">
+                                                            <div id="naverpay-content-inner" class="order-method-normal__content-inner">
+                                                                <div class="noempty">
+
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </c:if>
+                                                    <c:if test="${'Y' eq payInfo.kpayUseAt}">
+                                                        <div id="kakaopay-content" class="order-method-normal__content" style="display: none">
+                                                            <div id="kakaopay-content-inner" class="order-method-normal__content-inner">
+                                                                <div class="noempty">
+
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </c:if>
+                                                </div>
+                                            </div>
+                                        </c:if>
+                                        <%-- 키움 결제 종료 --%>
                                     </div>
                                 </form>
                             </div>

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

@@ -46,12 +46,12 @@
 				$('#dlvyCnt').text(data.dlvyCnt);
 				$('#dlvyCycle').text(data.dlvyCycle);
 				$('#cnsmrpric').text(fn_format_number(data.cnsmrpric) + curUnit);
-				$('#selpric').text(fn_format_number(data.selpric) + curUnit);
+				$('#slepric').text(fn_format_number(data.slepric) + curUnit);
 				$('#dscntRaito').text(data.dscntRaito + '%');
 				$('#subsvcDc').html(
 						data.mblSubsvcDcPcSameAt === "N" ? data.mblSubsvcDc : data.subsvcDc
 				);
-				fn_hide_subsvcDetail(data.subPd, data.dlvyCnt, data.selpric);
+				fn_hide_subsvcDetail(data.subPd, data.dlvyCnt, data.slepric);
 
 				switch (data.subsvcSttusCd) {
 					case '01':
@@ -76,7 +76,7 @@
 	/******************************************************
 	 *  구독서비스 상세 숨기기
 	 * ****************************************************/
-	const fn_hide_subsvcDetail = function(subPd, dlvyCnt, selpric) {
+	const fn_hide_subsvcDetail = function(subPd, dlvyCnt, slepric) {
 		function isEmpty(val) {
 			return !val || val === 0;
 		}
@@ -88,8 +88,8 @@
 		hideIf(isEmpty(subPd), 'dl', '#subPd');
 		hideIf(isEmpty(dlvyCnt), 'dl', '#dlvyCnt');
 		hideIf(isEmpty(subPd) && isEmpty(dlvyCnt), '.productDetailInfo__info');
-		hideIf(isEmpty(selpric), '.productDetailInfo__price');
+		hideIf(isEmpty(slepric), '.productDetailInfo__price');
-		hideIf(isEmpty(selpric), '#subscribeBtn');
+		hideIf(isEmpty(slepric), '#subscribeBtn');
 	}
 
 	/*************************************************************
@@ -97,20 +97,22 @@
 	 **************************************************************/
 	const fn_purchs_subsvc = function() {
 		var checkedValue = $("input[name='subsvcInnb']:checked").val();
+		location.href = "/sopmal/ordr/selectSubsvcPurchsForm" +
+				"?subsvcInnb=" + encodeURIComponent(checkedValue);
 
-		var tempForm = $('<form>', {
+		// var tempForm = $('<form>', {
-			method: 'post',
+		// 	method: 'post',
-			action: '/sopmal/ordr/selectSubsvcPurchsForm'
+		// 	action: '/sopmal/ordr/selectSubsvcPurchsForm'
-		});
+		// });
-		$('<input>', {
+		// $('<input>', {
-			type: 'hidden',
+		// 	type: 'hidden',
-			name: 'subsvcInnb',
+		// 	name: 'subsvcInnb',
-			value: checkedValue
+		// 	value: checkedValue
-		}).appendTo(tempForm);
+		// }).appendTo(tempForm);
-
+		//
-		tempForm.appendTo('body');
+		// tempForm.appendTo('body');
-		tempForm.submit();
+		// tempForm.submit();
-		tempForm.remove();
+		// tempForm.remove();
 	}
 
 	/******************************************************
@@ -166,7 +168,7 @@
 							<div class="productDetailInfo__price">
 								<div class="productDetailInfo__price__price">
 									<span id="cnsmrpric" class="productDetailInfo__price__original"></span>
-									<span id="selpric" class="productDetailInfo__price__current"></span>
+									<span id="slepric" class="productDetailInfo__price__current"></span>
 								</div>
 								<div class="productDetailInfo__price__sale">
 									<span id="dscntRaito" class="percent" style="color: red">%</span>

src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp

@@ -965,6 +965,9 @@
                     <div class="detailTop">
                         <p class="detailTop__title">총 <em><c:out value="${fn:length(data.shippingList)}"/>곳</em>의 배송지로 주문하셨습니다.</p>
                         <c:choose>
+                            <c:when test="${order.ordrSttusCd == 15}">
+                                <a href="javascript:void(0);" onclick="fn_post_cancl_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">주문취소</a>
+                            </c:when>
                             <c:when test="${order.ordrSttusCd == 25}">
                                 <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${setleDt}"/>', '<c:out value="${setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn gray2">전체 결제취소</a>
                             </c:when>

src/main/webapp/WEB-INF/views/sopmal_m/ordr/SubsvcPurchsC.jsp

@@ -39,8 +39,14 @@
             // gcpay 사용안할 경우 기본 세팅
             const gcpayCardUseAt = $('#gcpayCardUseAt').val();
             let gcpayAt = ( gcpayCardUseAt === 'Y')? 'Y' : 'N';
-            const setleTy = $('#setleSetupTyCd').val();  //01:kcp, 02:toss
+            const setleTy = $('#setleSetupTyCd').val();
-            const setleTyCd = (setleTy==='01')?'#pg04':'#pg03';
+            //const setleTyCd = (setleTy==='01')?'#pg04':'#pg03';
+
+            let setleTyCd = '#pg04';
+            if(setleTy==='01')setleTyCd = '#pg04'; //kcp
+            else if(setleTy==='02')setleTyCd = '#pg03'; //toss
+            else if(setleTy==='03')setleTyCd = '#pg06'; //kiwoom
+
             if (gcpayAt === 'N') {
                 $(setleTyCd).click();
             }
@@ -569,7 +575,13 @@
 
                 $(form).find('.pgContent').hide();
                 $(form).find('#' + id + 'Content').show();
-                $(form).find('#setleSetupTyCd').val() === '01' ? $(form).find('#pg04Content').show() : $(form).find('#pg03Content').show();
+
+                //$(form).find('#setleSetupTyCd').val() === '01' ? $(form).find('#pg04Content').show() : $(form).find('#pg03Content').show();
+                if($(form).find('#setleSetupTyCd').val() === '01'){$(form).find('#pg04Content').show();}
+                else if($(form).find('#setleSetupTyCd').val() === '02'){$(form).find('#pg03Content').show();}
+                else if($(form).find('#setleSetupTyCd').val() === '03'){$(form).find('#pg06Content').show();}
+
+
                 $('.order-method-normal__btn').removeClass('active');
                 $(form).find('#pgCmpnyNm').val(pgCmpnyNm);
 
@@ -624,7 +636,10 @@
                 const content = $('.order-method-normal__content');
                 const useCashMlgAmt = $('#useCashMlgAmt').val();
 
-                $('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click();
+                //$('#setleSetupTyCd').val() === '01' ? $('#pg04').click() : $('#pg03').click();
+                if($('#setleSetupTyCd').val() === '01'){$('#pg04').click();}
+                else if($('#setleSetupTyCd').val() === '02'){$('#pg03').click();}
+                else if($('#setleSetupTyCd').val() === '03'){$('#pg06').click();}
 
                 $('.order-method-normal__btn').removeClass('active');
                 $(this).addClass('active');
@@ -1985,7 +2000,7 @@
                     // }
                     div += '            <p class="cartItem__productBottom">';
                     div += '                <span class="cartItem__productPrice">';
-                    div += '                    <span class="comma product-dscntApplyAmt">' + (goods.selpric).toLocaleString() + '</span><span class="priceUnit">' + curUnit + '</span>';
+                    div += '                    <span class="comma product-dscntApplyAmt">' + (goods.slepric).toLocaleString() + '</span><span class="priceUnit">' + curUnit + '</span>';
                     div += '                </span>';
                     div += '                <span class="cartItem__productDot">·</span>';
                     div += '                <span class="cartItem__productQuantity">' + goods.qy + '개</span>';
@@ -3083,7 +3098,7 @@
                 return false;
             }
 
-            if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm) {
+            if ('kcp' === pgCmpnyNm || 'toss' === pgCmpnyNm || 'kiwoom' === pgCmpnyNm) {
                 const div = $('#setleForm').find('.order-method-normal');
 
                 if (!$(div).find('.order-method-normal__btn-container button').hasClass('active')) {
@@ -3124,7 +3139,13 @@
                     const id = '01' === issuTrgetDvCd ? 'issuTrgetMbtlnb' : 'issuTrgetBsnmNb';
                     let rlPgCmpnyNm = $('#pgCmpnyNm').val();
 
-                    let setleTyId = $('kcp' === pgCmpnyNm ? '#pg04Content' : '#pg03Content').find('button[name="' + setleTyCd + '"]').attr('id');
+                    //let setleTyId = $('kcp' === pgCmpnyNm ? '#pg04Content' : '#pg03Content').find('button[name="' + setleTyCd + '"]').attr('id');
+
+                    let pgCont = "";
+                    if('kiwoom' === pgCmpnyNm) pgCont='pg06Content';
+                    else if('kcp' === pgCmpnyNm) pgCont='pg04Content';
+                    else pgCont='pg03Content';
+                    let setleTyId = $('#'+pgCont).find('button[name="' + setleTyCd + '"]').attr('id');
 
                     if ('tosspay' === rlPgCmpnyNm) {
                        setleTyId = 'acount'
@@ -3301,7 +3322,7 @@
             // const enuriObj = JSON.parse(enuri);
             // const setleAmtFromEnuri = enuriObj['setleAmt']; // 계산된 결제금액
             const setleAmtFromSubsvc = order.goodsList.reduce(function(sum, item){
-                return sum + Number(item.selpric || 0); // 계산된 결제금액
+                return sum + Number(item.slepric || 0); // 계산된 결제금액
             }, 0);
 
             if (setleAmtFromOrder !== setleAmtFromSubsvc.toString()) {
@@ -4523,6 +4544,138 @@
                                                 </div>
                                             </c:if>
                                             <%-- kcp 결제 종료 --%>
+
+                                            <%-- 키움 결제 시작 --%>
+                                            <c:if test="${'03' eq payInfo.setleSetupTyCd}">
+                                                <div class="custom-radio is-medium">
+                                                    <input type="radio" name="pg" id="pg06" value="kiwoom">
+                                                    <label for="pg06">일반결제</label>
+                                                </div>
+                                                <div id="pg06Content" class="pgContent order-method-normal" >
+                                                    <div class="order-method-normal__btn-container">
+                                                        <c:if test="${'Y' eq payInfo.cardUseAt}">
+                                                            <button type="button" name="01" id="card" class="order-method-normal__btn gift_pay">
+                                                                <div class="order-method-normal__icon order-method-normal__icon--card"></div>신용카드
+                                                            </button>
+                                                        </c:if>
+                                                            <%--
+                                                            <c:if test="${'Y' eq payInfo.rltmAcntUseAt}">
+                                                                <button type="button" name="03" id="acount" class="order-method-normal__btn gift_pay">
+                                                                    <div class="order-method-normal__icon order-method-normal__icon--transfer"></div>실시간 계좌이체
+                                                                </button>
+                                                            </c:if>
+                                                            --%>
+                                                        <c:if test="${'Y' eq payInfo.virtlAcntUseAt}">
+                                                            <button type="button" name="04" id="virtual" class="order-method-normal__btn">
+                                                                <div class="order-method-normal__icon order-method-normal__icon--account"></div>가상계좌
+                                                            </button>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.virtlAcntEscwUseAt}">
+                                                            <button type="button" name="05" id="escrow-virtual" class="order-method-normal__btn not_multi_pay">
+                                                                <div class="order-method-normal__icon order-method-normal__icon--account"></div>가상계좌(에스크로)
+                                                            </button>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.nbkkUseAt}">
+                                                            <button type="button" name="02" id="bank" class="order-method-normal__btn">
+                                                                <div class="order-method-normal__icon order-method-normal__icon--deposit"></div>무통장
+                                                            </button>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.paycoUseAt}">
+                                                            <button type="button" name="10" id="payco" class="order-method-normal__btn gift_pay">
+                                                                <div class="order-method-normal__icon order-method-normal__icon--payco"></div>PAYCO
+                                                            </button>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.tpayUseAt}">
+                                                            <button type="button" name="tosspay" id="tosspay" class="order-method-normal__btn gift_pay">
+                                                                <div class="order-method-normal__icon order-method-normal__icon--toss"></div>토스페이
+                                                            </button>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.npayUseAt}">
+                                                            <button type="button" name="naverpay" id="naverpay" class="order-method-normal__btn gift_pay">
+                                                                <div class="order-method-normal__icon order-method-normal__icon--naver"></div>네이버페이
+                                                            </button>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.kpayUseAt}">
+                                                            <button type="button" name="kakaopay" id="kakaopay" class="order-method-normal__btn gift_pay">
+                                                                <div class="order-method-normal__icon order-method-normal__icon--kakao"></div>카카오페이
+                                                            </button>
+                                                        </c:if>
+                                                    </div>
+                                                    <div class="order-method-normal__content-wrapper">
+                                                        <c:if test="${'Y' eq payInfo.cardUseAt}">
+                                                            <div id="card-content" class="order-method-normal__content" style="display: none">
+                                                                <div id="card-content-inner" class="order-method-normal__content-inner">
+                                                                    <p class="fyi gray-7 mt-10 ml-10 noempty">발급정보 : 카드매출전표(또는 휴대폰결제전표)로 대체합니다.</p>
+                                                                </div>
+                                                            </div>
+                                                        </c:if>
+                                                            <%--
+                                                            <c:if test="${'Y' eq payInfo.rltmAcntUseAt}">
+                                                                <div id="acount-content" class="order-method-normal__content" style="display: none">
+                                                                    <div id="acount-content-inner" class="order-method-normal__content-inner"></div>
+                                                                </div>
+                                                            </c:if>
+                                                            --%>
+                                                        <c:if test="${'Y' eq payInfo.virtlAcntUseAt}">
+                                                            <div id="virtual-content" class="order-method-normal__content" style="display: none">
+                                                                <div id="virtual-content-inner" class="order-method-normal__content-inner"></div>
+                                                            </div>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.virtlAcntEscwUseAt}">
+                                                            <div id="escrow-virtual-content" class="order-method-normal__content" style="display: none">
+                                                                <div id="escrow-virtual-content-inner" class="order-method-normal__content-inner"></div>
+                                                            </div>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.nbkkUseAt}">
+                                                            <div id="bank-content" class="order-method-normal__content" style="display: none">
+                                                                <div id="bank-content-inner" class="order-method-normal__content-inner"></div>
+                                                            </div>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.paycoUseAt}">
+                                                            <div id="payco-content" class="order-method-normal__content" style="display: none">
+                                                                <div id="payco-content-inner" class="order-method-normal__content-inner">
+                                                                    <div class="infoBox noempty">
+                                                                        <h6 class="infoBox__title">PAYCO 간편결제 안내</h6>
+                                                                        <ol class="infoBox__list">
+                                                                            <li>PAYCO는 온/오프라인 쇼핑은 물론 송금, 멤버십 적립까지 가능한 통합 서비스입니다.</li>
+                                                                            <li>휴대폰과 카드 명의자가 동일해야 결제 가능하며, 결제금액 제한은 없습니다.
+                                                                                <br>- 지원카드: 모든 국내 신용/체크카드
+                                                                            </li>
+                                                                        </ol>
+                                                                    </div>
+                                                                    <p class="textInfo noempty"><i class="icon icon_textInfo--sm"></i>발급정보 : 카드매출전표(또는 휴대폰결제전표)로 대체합니다.</p>
+                                                                </div>
+                                                            </div>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.tpayUseAt}">
+                                                            <div id="acount-content" class="order-method-normal__content" style="display: none">
+                                                                <div id="acount-content-inner" class="order-method-normal__content-inner">
+                                                                    <p class="fyi gray-7 mt-10 ml-10 noempty">발급정보 : 카드매출전표(또는 휴대폰결제전표)로 대체합니다.</p>
+                                                                </div>
+                                                            </div>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.npayUseAt}">
+                                                            <div id="naverpay-content" class="order-method-normal__content" style="display: none">
+                                                                <div id="naverpay-content-inner" class="order-method-normal__content-inner">
+                                                                    <div class="noempty">
+
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </c:if>
+                                                        <c:if test="${'Y' eq payInfo.kpayUseAt}">
+                                                            <div id="kakaopay-content" class="order-method-normal__content" style="display: none">
+                                                                <div id="kakaopay-content-inner" class="order-method-normal__content-inner">
+                                                                    <div class="noempty">
+
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </c:if>
+                                                    </div>
+                                                </div>
+                                            </c:if>
+                                            <%-- 키움 결제 종료 --%>
                                         </div>
                                     </form>
                                 </div>