Merge branch 'develop' into ST24PRJ-612

src/main/java/com/style24/admin/biz/web/TsaOrderChangeScmController.java

@@ -56,6 +56,7 @@ public class TsaOrderChangeScmController extends TsaBaseController {
 		
 		Order order = new Order();
 		order.setOrdChgSq(ordChgSq);
+		order.setOrdNo(ordNo);
 		
 		// 2021.06.25 페이징 처리
 		order.setPageable(new TscPageRequest(order.getPageNo() - 1, order.getPageSize()));
@@ -90,6 +91,11 @@ public class TsaOrderChangeScmController extends TsaBaseController {
 		mav.addObject("chgMemo"				, chgMemo);												// 변경메모
 		mav.addObject("chgReasonList1"		, rendererService.getAvailCommonCodeList("G688"));		// 반품사유
 		mav.addObject("chgReasonList2"		, rendererService.getAvailCommonCodeList("G689"));		// 교환사유
+		
+		// 2021.12.10 추가
+		Collection<Order> orderInfoList = coreOrderService.getOrderInfoList(order);
+		mav.addObject("orderInfoList"		, orderInfoList);
+				
 		mav.setViewName("order/OrderWithdrawConfirmForm");
 		
 		return mav;

src/main/java/com/style24/admin/biz/web/TsaOrderController.java

@@ -284,6 +284,7 @@ public class TsaOrderController extends TsaBaseController {
 		mav.addObject("userNo", TsaSession.getInfo().getUserNo());								// 관리자번호
 
 		mav.addObject("orderInfo", orderService.getOrderInfoList(order));						// 주문기본정보
+		mav.addObject("orginalOrdPayInfo", orderService.getOriginalOrderPaymentInfo(order));	// 원주문결제내역정보
 		mav.addObject("orderGoodsInfo", orderDetailList);										// 주문상품정보
 		mav.addObject("orderFreeGiftInfo", orderService.getOrderFreeGiftList(order));			// 주문사은품정보 2020.12.16 추가
 		mav.addObject("orderDeliveryAddrInfo", orderService.getDeliveryAddrList(order));		// 배송정보

src/main/java/com/style24/persistence/mybatis/shop/TsaBusiness.xml

@@ -1138,6 +1138,7 @@
 		     , REG_DT
 		     , UPD_NO
 		     , UPD_DT
+		     , BRAND_INITIAL --  초성추가 
 		)
 		VALUES (
 		       #{brandGroupNo}
@@ -1153,6 +1154,7 @@
 		     , NOW()
 		     , #{updNo}
 		     , NOW()
+		     , FN_GET_BRAND_INITIAL(CASE WHEN #{dispNmLang} = 'EN' THEN #{brandGroupEnm} ELSE #{brandGroupKnm} END) -- 초성추가 
 		)
 	</insert>
 	
@@ -1172,6 +1174,7 @@
 		     </if>
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
+		     , BRAND_INITIAL = FN_GET_BRAND_INITIAL(CASE WHEN #{dispNmLang} = 'EN' THEN #{brandGroupEnm} ELSE #{brandGroupKnm} END) -- 초성추가 
 		WHERE  BRAND_GROUP_NO = #{brandGroupNo}
 	</update>
 	

src/main/java/com/style24/persistence/mybatis/shop/TsaDelivery.xml

@@ -847,6 +847,14 @@
 		     WHERE D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		       AND B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		       AND B.GOODS_TYPE    != 'G056_S'
+		       AND NOT EXISTS (
+		           SELECT 1
+		           FROM   TB_ORDER_DETAIL X
+		           WHERE  1=1
+		           AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		           AND    X.GIFT_PACK_YN = 'Y'
+		           AND    X.GIFT_ADDR_INP_YN = 'N'
+		       )
 			<include refid="getAssignListCondition_sql"/>
 		     UNION ALL
 		    SELECT B.ORD_DTL_NO   -- 주문상세번호
@@ -858,8 +866,16 @@
 		     WHERE D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		       AND B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		       AND B.GOODS_TYPE    = 'G056_S'
-		     GROUP  BY B.ORD_DTL_NO
-		          , B.GOODS_CD
+		       AND NOT EXISTS (
+		           SELECT 1
+		           FROM   TB_ORDER_DETAIL X
+		           WHERE  1=1
+		           AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		           AND    X.GIFT_PACK_YN = 'Y'
+		           AND    X.GIFT_ADDR_INP_YN = 'N'
+		       )
+		     GROUP BY B.ORD_DTL_NO
+		         , B.GOODS_CD
 			<include refid="getAssignListCondition_sql"/>
 		) A
 	</select>
@@ -920,6 +936,14 @@
 		            AND    D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		            AND    B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		            AND    B.GOODS_TYPE    != 'G056_S'
+		            AND    NOT EXISTS (
+		                SELECT 1
+		                FROM   TB_ORDER_DETAIL X
+		                WHERE  1=1
+		                AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		                AND    X.GIFT_PACK_YN = 'Y'
+		                AND    X.GIFT_ADDR_INP_YN = 'N'
+		            )
 					<include refid="getAssignListCondition_sql"/>
 		            UNION ALL
 		            SELECT A.SITE_CD      -- 사이트
@@ -953,6 +977,14 @@
 		            WHERE  D.SELF_GOODS_YN  = 'Y'  -- 자사상품만
 		            AND    B.ORD_DTL_STAT IN ('G013_20','G013_35')
 		            AND    B.GOODS_TYPE     = 'G056_S'
+		            AND    NOT EXISTS (
+		                SELECT 1
+		                FROM   TB_ORDER_DETAIL X
+		                WHERE  1=1
+		                AND    X.ORD_DTL_NO = B.ORD_DTL_NO
+		                AND    X.GIFT_PACK_YN = 'Y'
+		                AND    X.GIFT_ADDR_INP_YN = 'N'
+		            )
 					<include refid="getAssignListCondition_sql"/>
 					GROUP  BY A.SITE_CD      -- 사이트
 		                 , A.ORD_NO       -- 주문번호

src/main/java/com/style24/persistence/mybatis/shop/TsaWithdraw.xml

@@ -183,6 +183,7 @@
 		    LEFT   OUTER JOIN TB_ORDER_DETAIL OD          ON B.ORDER_DTL_NO = OD.ORD_DTL_NO
 		    WHERE  1=1
 		    AND    B.REASON_CODE NOT IN('08','10')
+		    AND    CD.DEL_YN = 'N'
 			<if test='customerName != null and customerName != ""'>
 		    AND    A.CUSTOMER_NAME = #{customerName}
 		    </if>
@@ -354,6 +355,7 @@
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD 
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN ('09','11')
+		            AND    CD.DEL_YN = 'N'
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>
@@ -467,6 +469,7 @@
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD 
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN('00','02','03','04','05','06','15')
+		            AND    CD.DEL_YN = 'N'
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>
@@ -580,6 +583,7 @@
 		            LEFT   OUTER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD
 		            WHERE  1=1
 		            AND    B.REASON_CODE IN('01')
+		            AND    CD.DEL_YN = 'N'
 					<if test='customerName != null and customerName != ""'>
 		            AND    A.CUSTOMER_NAME = #{customerName}
 					</if>

src/main/webapp/WEB-INF/views/order/CnclReqForm.html

@@ -514,7 +514,11 @@ var columnCancelReqList = [
 		, width			: 80
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
-			return params.value.addComma();
+			if (params.data.delvFeeCrite == 'G078_30') {
+				return 0;
+			} else {
+				return params.value.addComma();
+			}
 		}
 		, hide			: temp1
 	},
@@ -765,7 +769,11 @@ var columnCancelReqToBeList = [
 				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},
@@ -860,7 +868,11 @@ var columnDelvCdList = [
 				, width			: 100
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -587,7 +587,11 @@ var columnExchangeReqList = [
 				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},
@@ -1180,7 +1184,7 @@ var fnCalculateRefundAmt = function (obj) {
 		'/orderChange/cancel/refundAmt'
 		, jsonData
 		, function(result) {
-			/*
+			
 			// 2021.12.01 취소금액설정
 			if (result.cancelOrderRefundList != null && result.cancelOrderRefundList.length > 0) {
 				for (i=0 ; i<result.cancelOrderRefundList.length ; i++) {
@@ -1203,7 +1207,6 @@ var fnCalculateRefundAmt = function (obj) {
 				// 주문변경대상정보 재설정
 				gridOptionsExchangeReqList.api.setRowData(cancelRequestTargetList);
 			}
-			*/
 		}
 	);
 }

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -32,45 +32,52 @@
 				<!-- TABLE -->
 				<table class="tableStyle">
 					<colgroup>
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
+						<col width="6%"/>
+						<col width="6%"/>
+						<col width="10%"/>
+						<col width="10%"/>
+						<col width="14%"/>
+						<col width="6%"/>
+						<col width="7%"/>
+						<col width="9%"/>
+						<col width="12%"/>
+						<col width="6%"/>
+						<col width="8%"/>
+						<col width="6%"/>
 					</colgroup>
 					<thead>
 						<tr>
-							<th>사이트</th>
+<!-- 							<th>사이트</th> -->
 							<th>몰구분</th>
 							<th>웹구분</th>
-							<th>외부몰</th>
+							<th>제휴몰</th>
 							<th>주문일시</th>
-							<th>주문자</th>
-							<th>고객번호</th>
+							<th>제휴몰주문번호</th>
 							<th>주문번호</th>
+							<th>주문자</th>
+							<th>휴대폰번호</th>
 							<th>이메일</th>
-							<th>핸드폰번호</th>
-							<th>회원구분</th>
-							<th>관리대상</th>
+							<th>고객번호</th>
+							<th>네이버주문형</th>
+<!-- 							<th>회원구분</th> -->
+<!-- 							<th>관리대상</th> -->
 							<th>등급</th>
 						</tr>
 					</thead>
 					<tbody>
 						<tr>
-							<td th:text="${orderInfo[0].siteCdNm}"></td>
+<!-- 							<td th:text="${orderInfo[0].siteCdNm}"></td> -->
 							<td th:text="${orderInfo[0].mallGbNm}"></td>
 							<td th:text="${orderInfo[0].frontGbNm}"></td>
 							<td th:text="${orderInfo[0].extmallNm}"></td>
 							<td th:text="${orderInfo[0].ordDt}"></td>
+							<td th:text="${orderInfo[0].extmallOrderId}"></td>
+							<td th:text="${orderInfo[0].ordNo}"></td>
 							<td th:text="${orderInfo[0].ordNm}"></td>
+							<td>
+								<a href="script:void(0)" class="lmsPop" th:attr="orderPhnno=${orderInfo[0].ordPhnno}"><th:block th:text="${orderInfo[0].ordPhnno}"></th:block></a>
+							</td>
+							<td th:text="${orderInfo[0].ordEmail}"></td>
 							<td>
 								<th:block th:if="${orderInfo[0].custNo} > 0">
 									<a href="script:void(0)" class="custDetailPop" th:attr="custNo=${orderInfo[0].custNo}"><th:block th:text="${orderInfo[0].custNo}"></th:block></a>
@@ -79,13 +86,9 @@
 									<th:block th:text="${orderInfo[0].custNo}"></th:block>
 								</th:block>
 							</td>
-							<td th:text="${orderInfo[0].ordNo}"></td>
-							<td th:text="${orderInfo[0].ordEmail}"></td>
-							<td>
-							<a href="script:void(0)" class="lmsPop" th:attr="orderPhnno=${orderInfo[0].ordPhnno}"><th:block th:text="${orderInfo[0].ordPhnno}"></th:block></a>
-							</td>
-							<td th:text="${orderInfo[0].custGbNm}"></td>
-							<td th:text="${orderInfo[0].managedRsnNm}"></td>
+							<td th:text="${not #strings.isEmpty(orderInfo[0].npayOrdNo) ? 'Y' : 'N'}"></td>
+<!-- 							<td th:text="${orderInfo[0].custGbNm}"></td> -->
+<!-- 							<td th:text="${orderInfo[0].managedRsnNm}"></td> -->
 							<td th:text="${orderInfo[0].custGradeNm}"></td>
 						</tr>
 					</tbody>
@@ -95,107 +98,211 @@
 				<h4>주문결제내역</h4>
 				<table class="frmStyle">
 					<colgroup>
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
+						<col width="10%"/>
+						<col width="10%"/>
+						<col width="30%"/>
+						<col width="10%"/>
+						<col width="10%"/>
+						<col/>
 					</colgroup>
 					<thead>
 						<tr>
-							<th style="height:30px;">구분</th>
-							<th style="height:30px;">항목</th>
-							<th style="height:30px;">합계</th>
-							<th style="height:30px;">내역</th>
+							<th>구분</th>
+							<th>합계</th>
+							<th>내역</th>
+							<th>구분</th>
+							<th>합계</th>
+							<th>내역</th>
 						</tr>
 					</thead>
 					<tbody>
 						<tr>
-							<td style="height:25px;">상품금액</td>
-							<td>총상품금액</td>
-							<td class="listSumAmt">15,000원</td>
+							<th>총결제금액(A+B+C)</th>
+							<td class="totPayAmt"></td>
+							<td></td>
+							<th>주문금액(A)</th>
+							<td class="ordCurrAmt"></td>
 							<td></td>
 						</tr>
 						<tr>
-							<td style="height:25px;">배송비</td>
-							<td>배송비합계</td>
-							<td class="realDelvSumAmt">15,000원</td>
-							<td style="line-height:25px;">
-								<div style="height:25px;"><span>배송비 : </span><span class="delvSumAmt">-60,000원</span></div>
-								<div style="height:25px;"><span>배송비쿠폰 : </span><span class="delvCpnDcAmt">-60,000원</span></div>
+							<th class="payMeansNm"></th>
+							<td class="mainPayAmt"></td>
+							<td class="payMeansDesc"></td>
+							<th>배송비 합산(B)</th>
+							<td class="realDelvAmt"></td>
+							<td>
+								<ul class="notice delvFeeDesc">
+								</ul>
 							</td>
 						</tr>
 						<tr>
-							<td style="height:25px;">상품할인</td>
-							<td>총상품할인금액</td>
-							<td class="goodsDcSumAmt">15,000원</td>
+							<th>상품권</th>
+							<td class="gfcdUseAmt"></td>
+							<td>
+								<ul class="notice gfcdUseDesc">
+								</ul>
+							</td>
+							<th>할인금액 총합(C)</th>
+							<td class="cRed totDcAmt"></td>
 							<td></td>
 						</tr>
 						<tr>
-							<td rowspan="4">할인내역</td>
-							<td>즉시할인</td>
-							<td class="cpn1DcSumAmt">-60,000원</td>
+							<th>포인트</th>
+							<td class="pntDcAmt"></td>
 							<td></td>
-						</tr>
-						<tr>
-							<td>다다익선할인</td>
-							<td class="tmtbDcSumAmt">-60,000원</td>
-							<td style="line-height:25px;">
-								<div style="height:25px;"><span>수량할인금액 : </span><span class="tmtb1DcSumAmt">-60,000원</span></div>
-								<div style="height:25px;"><span>금액할인금액 : </span><span class="tmtb2DcSumAmt">-60,000원</span></div>
-							</td>
-						</tr>
-						<tr>
-							<td>쿠폰할인</td>
-							<td class="cpnDcSumAmt">-60,000원</td>
-							<td style="line-height:25px;">
-								<div style="height:25px;"><span>주문서상품쿠폰 : </span><span class="goodsCpnDcSumAmt">-60,000원</span></div>
-								<div style="height:25px;"><span>장바구니쿠폰 : </span><span class="cartCpnDcSumAmt">-60,000원</span></div>
+							<th><i class="fa fa-level-up fa-rotate-90" aria-hidden="true"></i>&nbsp;즉시할인쿠폰</th>
+							<td class="cRed cpn1DcAmt"></td>
+							<td>
+								<ul class="notice cpn1CpnDcDesc">
+								</ul>
 							</td>
 						</tr>
 						<tr>
-							<td>선포인트할인</td>
-							<td class="prePntDcSumAmt">-60,000원</td>
+							<th>KCP쿠폰</th>
+							<td class="pgCpnAmt"></td>
 							<td></td>
-						</tr>
-						
-						
-						<tr>
-							<td rowspan="5">총결제금액</td>
-							<td style="height:25px;">총 매출액</td>
-							<td class="totalPayAmt">70,000원</td>
-							<td class="savePntSumAmt">15,000P 적립</td>
-						</tr>
-						<tr>
-							<td style="height:25px;">실결제액</td>
-							<td class="realOrdSumAmt">70,000원</td>
+							<th><i class="fa fa-level-up fa-rotate-90" aria-hidden="true"></i>&nbsp;다다익선할인</th>
+							<td class="tmtbDcAmt"></td>
 							<td>
-								<span class="pgGbNm">신용카드</span><span class="cardNm">(현대)</span>
+								<ul class="notice tmtbDcDesc">
+								</ul>
 							</td>
 						</tr>
 						<tr>
-							<td style="line-height:25px;">
-								<div style="height:25px;">제휴할인결제액</div>
-								<div style="height:25px;">(KCP쿠폰+포인트)</div>
-							</td>
-							<td class="pgDcSumAmt">70,000원</td>
-							<td style="line-height:25px;">
-								<div style="height:25px;"><span>제휴쿠폰 : </span><span class="allianceDcAmt">-60,000원</span></div>
-								<div style="height:25px;"><span>마일리지 : </span><span class="mileageDcAmt">-60,000원</span></div>
+							<th>마일리지</th>
+							<td class="npayPntAmt"></td>
+							<td class="npayPntDesc"></td>
+							<th><i class="fa fa-level-up fa-rotate-90" aria-hidden="true"></i>&nbsp;상품쿠폰&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+							<td class="cRed goodsCpnDcAmt"></td>
+							<td>
+								<ul class="notice goodsCpnDcDesc">
+								</ul>
 							</td>
 						</tr>
 						<tr>
-							<td style="height:25px;">포인트 결제액</td>
-							<td class="pntDcSumAmt">70,000P</td>
+							<th>적립포인트</th>
+							<td class="savePntAmt"></td>
 							<td></td>
+							<th><i class="fa fa-level-up fa-rotate-90" aria-hidden="true"></i>&nbsp;장바구니쿠폰</th>
+							<td class="cRed cartCpnDcAmt"></td>
+							<td>
+								<ul class="notice cartCpnDcDesc">
+								</ul>
+							</td>
 						</tr>
 						<tr>
-							<td style="height:25px;">상품권 결제액</td>
-							<td class="gfcdUseSumAmt">70,000원</td>
+							<th>현금영수증신청여부</th>
+							<td class="cashReceipReqYn"></td>
+							<td></td>
+							<th><i class="fa fa-level-up fa-rotate-90" aria-hidden="true"></i>&nbsp;선포인트할인</th>
+							<td class="cRed prePntDcAmt"></td>
 							<td></td>
 						</tr>
 					</tbody>
 				</table>
-									
+<!-- 				<table class="frmStyle"> -->
+<!-- 					<colgroup> -->
+<!-- 						<col width=""> -->
+<!-- 						<col width=""> -->
+<!-- 						<col width=""> -->
+<!-- 						<col width=""> -->
+<!-- 					</colgroup> -->
+<!-- 					<thead> -->
+<!-- 						<tr> -->
+<!-- 							<th style="height:30px;">구분</th> -->
+<!-- 							<th style="height:30px;">항목</th> -->
+<!-- 							<th style="height:30px;">합계</th> -->
+<!-- 							<th style="height:30px;">내역</th> -->
+<!-- 						</tr> -->
+<!-- 					</thead> -->
+<!-- 					<tbody> -->
+<!-- 						<tr> -->
+<!-- 							<td style="height:25px;">상품금액</td> -->
+<!-- 							<td>총상품금액</td> -->
+<!-- 							<td class="listSumAmt">15,000원</td> -->
+<!-- 							<td></td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td style="height:25px;">배송비</td> -->
+<!-- 							<td>배송비합계</td> -->
+<!-- 							<td class="realDelvSumAmt">15,000원</td> -->
+<!-- 							<td style="line-height:25px;"> -->
+<!-- 								<div style="height:25px;"><span>배송비 : </span><span class="delvSumAmt">-60,000원</span></div> -->
+<!-- 								<div style="height:25px;"><span>배송비쿠폰 : </span><span class="delvCpnDcAmt">-60,000원</span></div> -->
+<!-- 							</td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td style="height:25px;">상품할인</td> -->
+<!-- 							<td>총상품할인금액</td> -->
+<!-- 							<td class="goodsDcSumAmt">15,000원</td> -->
+<!-- 							<td></td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td rowspan="4">할인내역</td> -->
+<!-- 							<td>즉시할인</td> -->
+<!-- 							<td class="cpn1DcSumAmt">-60,000원</td> -->
+<!-- 							<td></td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td>다다익선할인</td> -->
+<!-- 							<td class="tmtbDcSumAmt">-60,000원</td> -->
+<!-- 							<td style="line-height:25px;"> -->
+<!-- 								<div style="height:25px;"><span>수량할인금액 : </span><span class="tmtb1DcSumAmt">-60,000원</span></div> -->
+<!-- 								<div style="height:25px;"><span>금액할인금액 : </span><span class="tmtb2DcSumAmt">-60,000원</span></div> -->
+<!-- 							</td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td>쿠폰할인</td> -->
+<!-- 							<td class="cpnDcSumAmt">-60,000원</td> -->
+<!-- 							<td style="line-height:25px;"> -->
+<!-- 								<div style="height:25px;"><span>주문서상품쿠폰 : </span><span class="goodsCpnDcSumAmt">-60,000원</span></div> -->
+<!-- 								<div style="height:25px;"><span>장바구니쿠폰 : </span><span class="cartCpnDcSumAmt">-60,000원</span></div> -->
+<!-- 							</td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td>선포인트할인</td> -->
+<!-- 							<td class="prePntDcSumAmt">-60,000원</td> -->
+<!-- 							<td></td> -->
+<!-- 						</tr> -->
+						
+						
+<!-- 						<tr> -->
+<!-- 							<td rowspan="5">총결제금액</td> -->
+<!-- 							<td style="height:25px;">총 매출액</td> -->
+<!-- 							<td class="totalPayAmt">70,000원</td> -->
+<!-- 							<td class="savePntSumAmt">15,000P 적립</td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td style="height:25px;">실결제액</td> -->
+<!-- 							<td class="realOrdSumAmt">70,000원</td> -->
+<!-- 							<td> -->
+<!-- 								<span class="pgGbNm">신용카드</span><span class="cardNm">(현대)</span> -->
+<!-- 							</td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td style="line-height:25px;"> -->
+<!-- 								<div style="height:25px;">제휴할인결제액</div> -->
+<!-- 								<div style="height:25px;">(KCP쿠폰+포인트)</div> -->
+<!-- 							</td> -->
+<!-- 							<td class="pgDcSumAmt">70,000원</td> -->
+<!-- 							<td style="line-height:25px;"> -->
+<!-- 								<div style="height:25px;"><span>제휴쿠폰 : </span><span class="allianceDcAmt">-60,000원</span></div> -->
+<!-- 								<div style="height:25px;"><span>마일리지 : </span><span class="mileageDcAmt">-60,000원</span></div> -->
+<!-- 							</td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td style="height:25px;">포인트 결제액</td> -->
+<!-- 							<td class="pntDcSumAmt">70,000P</td> -->
+<!-- 							<td></td> -->
+<!-- 						</tr> -->
+<!-- 						<tr> -->
+<!-- 							<td style="height:25px;">상품권 결제액</td> -->
+<!-- 							<td class="gfcdUseSumAmt">70,000원</td> -->
+<!-- 							<td></td> -->
+<!-- 						</tr> -->
+<!-- 					</tbody> -->
+<!-- 				</table> -->
+				
 				<h4>주문상품정보</h4>
 				<button type="button" class="btn btnRight btn-base btn-sm" id="btnAllCncl" style="margin-left:10px;" >입금대기전체취소</button>
 				<div id="gridOrderGoodsInfo" style="width:100%; height:200px;" class="ag-theme-balham"></div>
@@ -242,6 +349,7 @@ var ordNo 					= [[${ordNo}]];							// 주문번호
 var userNo 					= [[${userNo}]];						// 관리자번호
 
 var orderInfo 				= [[${orderInfo}]];						// 기본정보
+var orginalOrdPayInfo 		= [[${orginalOrdPayInfo}]];				// 원주문결제내역정보
 var orderGoodsInfo 			= [[${orderGoodsInfo}]];				// 주문상세정보
 var orderFreeGiftInfo 		= [[${orderFreeGiftInfo}]];				// 주문사은품정보
 var orderDeliveryAddrInfo	= [[${orderDeliveryAddrInfo}]];			// 배송정보
@@ -311,6 +419,7 @@ var columnDefsGoodsInfo = [
 					return option;
 				}
 			},
+			{ headerName: "배송구분", field: "shotDelvGb", width: 80, cellClass: 'text-center' },
 			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 80, cellClass: 'text-center'},
 			{headerName: "옵션1"		, field: "colorNm"		, width: 60, cellClass: 'text-center'},
 			{headerName: "옵션2"		, field: "optCd2"		, width: 60, cellClass: 'text-center'},
@@ -666,7 +775,8 @@ var columnDefsDeliveryInfo = [
 	},
 	{headerName: "주소(기본)"		, field: "recipBaseAddr"	, width: 220, cellClass: 'text-left'},
 	{headerName: "주소(상세)"		, field: "recipDtlAddr"		, width: 220, cellClass: 'text-left', editable: true},
-	{headerName: "배송메모"		, field: "delvMemo"			, width: 250, cellClass: 'text-left', editable: true}
+	{headerName: "배송메모"		, field: "delvMemo"			, width: 250, cellClass: 'text-left', editable: true},
+	{headerName: "주소입력기한"		, field: "giftLimitDt"		, width: 200, cellClass: 'text-center'}
 ];
 var gridOptionsDeliveryInfo = gagaAgGrid.getGridOptions(columnDefsDeliveryInfo);
 
@@ -699,6 +809,7 @@ var columnDefsPaymentInfo = [
 			return retStr;
 		}
 	},
+	{headerName: "입금자명"		, field: "vaNm"			, width: 100	, cellClass: 'text-center'},
 	{
 		headerName		: "승인번호"
 		, field			: "pgTradeNo"
@@ -1171,8 +1282,28 @@ $(document).ready(function () {
 		param.elementCustNo =    ""; 
 		param.pageGb = 'delv';
 		cfnOpenLmsPopup2(param);
-		
-	});	
+	});
+
+	// 입금자명 처리
+	let payMeans = orderPaymentInfo[0].payMeans;
+	let payMeansChk = false;
+	
+	if (payMeans == 'G014_20') {
+		payMeansChk = true;
+	}
+
+	gagaAgGrid.showOrHideColumn(gridOptionsPaymentInfo, 'vaNm', payMeansChk);
+	
+	// 선물하기 정보 처리
+	let giftPackYn = orderDeliveryAddrInfo[0].giftPackYn;
+	let giftAddrInpYn = orderDeliveryAddrInfo[0].giftAddrInpYn;
+	if (giftPackYn == 'Y') {
+		if (giftAddrInpYn == 'Y') {
+			gagaAgGrid.setColumnHeaderName(gridOptionsDeliveryInfo, 'giftLimitDt', '주소입력일자');
+		}
+	} else {
+		gagaAgGrid.showOrHideColumn(gridOptionsDeliveryInfo, 'giftLimitDt', false);
+	}
 });
 
 //0원이하이면 '-' 처리 삭제 함수
@@ -1219,49 +1350,49 @@ $(document).ready(function () {
 	});
 	
 	// 2021.07.30 결제정보설정
-	var listSumAmt 			= 0;			// 총상품금액 (정상가)
-	var currSumAmt 			= 0;			// 상품금액 (판매가)
-	var realDelvSumAmt		= 0;			// 실제배송비합계
-	var delvSumAmt			= 0;			// 배송비합계
-	var delvCpnDcAmt		= 0;			// 배송비쿠폰할인금액
-	var delvGfcdUseAmt		= 0;			// 배송비상품권사용금액
-	var goodsDcSumAmt		= 0;			// 총상품할인금액합계
-	var cpn1DcSumAmt		= 0;			// 즉시할인금액합계
-	var tmtbDcSumAmt		= 0;			// 다다익선할인금액합계
-	var tmtb1DcSumAmt		= 0;			// 수량다다익선할인금액합계
-	var tmtb2DcSumAmt		= 0;			// 금액다다익선할인금액합계
-	var cpnDcSumAmt			= 0;			// 쿠폰할인금액합계
-	var goodsCpnDcSumAmt	= 0;			// 상품쿠폰할인금액합계
-	var cartCpnDcSumAmt		= 0;			// 장바구니쿠폰할인금액합계
-	var prePntDcSumAmt		= 0;			// 선포인트할인금액합계
-	var totalPayAmt			= 0;			// 총결제금액
-	var realOrdSumAmt		= 0;			// 실결제금액합계
-	var pgDcSumAmt			= 0;			// 제휴할인금액
-	var allianceDcAmt		= 0;			// 제휴쿠폰할인금액
-	var mileageDcAmt		= 0;			// 마일리지할인금액
-	var pntDcSumAmt			= 0;			// 포인트 결제액
-	var gfcdUseSumAmt		= 0;			// 상품권 결제액
-	var savePntSumAmt		= 0;			// 적립포인트
-	var allCnclYn			= "N"			// 전체취소여부
+// 	var listSumAmt 			= 0;			// 총상품금액 (정상가)
+// 	var currSumAmt 			= 0;			// 상품금액 (판매가)
+// 	var realDelvSumAmt		= 0;			// 실제배송비합계
+// 	var delvSumAmt			= 0;			// 배송비합계
+// 	var delvCpnDcAmt		= 0;			// 배송비쿠폰할인금액
+// 	var delvGfcdUseAmt		= 0;			// 배송비상품권사용금액
+// 	var goodsDcSumAmt		= 0;			// 총상품할인금액합계
+// 	var cpn1DcSumAmt		= 0;			// 즉시할인금액합계
+// 	var tmtbDcSumAmt		= 0;			// 다다익선할인금액합계
+// 	var tmtb1DcSumAmt		= 0;			// 수량다다익선할인금액합계
+// 	var tmtb2DcSumAmt		= 0;			// 금액다다익선할인금액합계
+// 	var cpnDcSumAmt			= 0;			// 쿠폰할인금액합계
+// 	var goodsCpnDcSumAmt	= 0;			// 상품쿠폰할인금액합계
+// 	var cartCpnDcSumAmt		= 0;			// 장바구니쿠폰할인금액합계
+// 	var prePntDcSumAmt		= 0;			// 선포인트할인금액합계
+// 	var totalPayAmt			= 0;			// 총결제금액
+// 	var realOrdSumAmt		= 0;			// 실결제금액합계
+// 	var pgDcSumAmt			= 0;			// 제휴할인금액
+// 	var allianceDcAmt		= 0;			// 제휴쿠폰할인금액
+// 	var mileageDcAmt		= 0;			// 마일리지할인금액
+// 	var pntDcSumAmt			= 0;			// 포인트 결제액
+// 	var gfcdUseSumAmt		= 0;			// 상품권 결제액
+// 	var savePntSumAmt		= 0;			// 적립포인트
 	
+	var allCnclYn			= "N"			// 전체취소여부
 	var ordDtlNoArr			= [];			// 주문상세배열
 	var cnclRtnReqQtyArr	= [];			// 주문상세신청수량배열
 	
 	for (i=0 ; i<orderGoodsInfo.length ; i++) {
-		listSumAmt			+= (parseInt(orderGoodsInfo[i].listPrice) + parseInt(orderGoodsInfo[i].optAddPrice)) * (orderGoodsInfo[i].ordQty - orderGoodsInfo[i].cnclRtnQty);
-		currSumAmt			+= (parseInt(orderGoodsInfo[i].currPrice) + parseInt(orderGoodsInfo[i].optAddPrice)) * (orderGoodsInfo[i].ordQty - orderGoodsInfo[i].cnclRtnQty);
-		cpn1DcSumAmt		+= parseInt(orderGoodsInfo[i].cpn1DcAmt);
-		tmtb1DcSumAmt		+= parseInt(orderGoodsInfo[i].tmtb1DcAmt);
-		tmtb2DcSumAmt		+= parseInt(orderGoodsInfo[i].tmtb2DcAmt);
-		goodsCpnDcSumAmt	+= parseInt(orderGoodsInfo[i].goodsCpnDcAmt);
-		cartCpnDcSumAmt		+= parseInt(orderGoodsInfo[i].cartCpnDcAmt);
-		prePntDcSumAmt		+= parseInt(orderGoodsInfo[i].prePntDcAmt);
+// 		listSumAmt			+= (parseInt(orderGoodsInfo[i].listPrice) + parseInt(orderGoodsInfo[i].optAddPrice)) * (orderGoodsInfo[i].ordQty - orderGoodsInfo[i].cnclRtnQty);
+// 		currSumAmt			+= (parseInt(orderGoodsInfo[i].currPrice) + parseInt(orderGoodsInfo[i].optAddPrice)) * (orderGoodsInfo[i].ordQty - orderGoodsInfo[i].cnclRtnQty);
+// 		cpn1DcSumAmt		+= parseInt(orderGoodsInfo[i].cpn1DcAmt);
+// 		tmtb1DcSumAmt		+= parseInt(orderGoodsInfo[i].tmtb1DcAmt);
+// 		tmtb2DcSumAmt		+= parseInt(orderGoodsInfo[i].tmtb2DcAmt);
+// 		goodsCpnDcSumAmt	+= parseInt(orderGoodsInfo[i].goodsCpnDcAmt);
+// 		cartCpnDcSumAmt		+= parseInt(orderGoodsInfo[i].cartCpnDcAmt);
+// 		prePntDcSumAmt		+= parseInt(orderGoodsInfo[i].prePntDcAmt);
 		
-		realOrdSumAmt		+= parseInt(orderGoodsInfo[i].realOrdAmt);
-		pntDcSumAmt			+= parseInt(orderGoodsInfo[i].pntDcAmt);
-		gfcdUseSumAmt		+= parseInt(orderGoodsInfo[i].gfcdUseAmt);
+// 		realOrdSumAmt		+= parseInt(orderGoodsInfo[i].realOrdAmt);
+// 		pntDcSumAmt			+= parseInt(orderGoodsInfo[i].pntDcAmt);
+// 		gfcdUseSumAmt		+= parseInt(orderGoodsInfo[i].gfcdUseAmt);
 		
-		savePntSumAmt		+= parseInt(orderGoodsInfo[i].savePntAmt);
+// 		savePntSumAmt		+= parseInt(orderGoodsInfo[i].savePntAmt);
 		
 		// 2021.11.08 입금대기상태일때 전체취소가능
 		if (orderGoodsInfo[i].ordDtlStat == "G013_10") {
@@ -1314,79 +1445,190 @@ $(document).ready(function () {
 		});
 	});
 	
-	goodsDcSumAmt	= listSumAmt - currSumAmt;
-	tmtbDcSumAmt	= tmtb1DcSumAmt + tmtb2DcSumAmt;
-	cpnDcSumAmt		= goodsCpnDcSumAmt + cartCpnDcSumAmt;
+// 	goodsDcSumAmt	= listSumAmt - currSumAmt;
+// 	tmtbDcSumAmt	= tmtb1DcSumAmt + tmtb2DcSumAmt;
+// 	cpnDcSumAmt		= goodsCpnDcSumAmt + cartCpnDcSumAmt;
+	
+// 	for (j=0 ; j<orderDeliveryFeeInfo.length ; j++) {
+// 		delvSumAmt		+= parseInt(orderDeliveryFeeInfo[j].delvFee);
+// 		delvCpnDcAmt	+= parseInt(orderDeliveryFeeInfo[j].delvCpnDcAmt);
+// 		delvGfcdUseAmt	+= parseInt(orderDeliveryFeeInfo[j].delvGfcdUseAmt);
+// 	}
+	
+// 	realDelvSumAmt	= delvSumAmt - delvCpnDcAmt - delvGfcdUseAmt;
+// 	realOrdSumAmt	= realOrdSumAmt + realDelvSumAmt; 
+// 	//gfcdUseSumAmt	= gfcdUseSumAmt + delvGfcdUseAmt;
+	
+// 	for (k=0 ; k<orderPaymentInfo.length ; k++) {
+// 		allianceDcAmt	+= parseInt(orderPaymentInfo[k].pgCpnAmt);
+// 		mileageDcAmt	+= parseInt(orderPaymentInfo[k].npayPntAmt);
+// 	}
+	
+// 	pgDcSumAmt		= allianceDcAmt + mileageDcAmt;
+// 	totalPayAmt		= (realOrdSumAmt + pntDcSumAmt + gfcdUseSumAmt) - pgDcSumAmt;
+	
+// 	$(".listSumAmt").text(listSumAmt.addComma() + "원");
+// 	$(".delvSumAmt").text(delvSumAmt.addComma() + "원");
+// 	$(".delvCpnDcAmt").text(getZeroMinusDelAmt(delvCpnDcAmt) + "원");
+// 	$(".realDelvSumAmt").text(realDelvSumAmt.addComma() + "원");
+// 	$(".goodsDcSumAmt").text(getZeroMinusDelAmt(goodsDcSumAmt) + "원");
+// 	$(".cpn1DcSumAmt").text(getZeroMinusDelAmt(cpn1DcSumAmt) + "원");
+// 	$(".tmtb1DcSumAmt").text(getZeroMinusDelAmt(tmtb1DcSumAmt) + "원");
+// 	$(".tmtb2DcSumAmt").text(getZeroMinusDelAmt(tmtb2DcSumAmt) + "원");
+// 	$(".tmtbDcSumAmt").text(getZeroMinusDelAmt(tmtbDcSumAmt) + "원");
+// 	$(".goodsCpnDcSumAmt").text(getZeroMinusDelAmt(goodsCpnDcSumAmt) + "원");
+// 	$(".cartCpnDcSumAmt").text(getZeroMinusDelAmt(cartCpnDcSumAmt) + "원");
+// 	$(".cpnDcSumAmt").text(getZeroMinusDelAmt(cpnDcSumAmt) + "원");
+// 	$(".prePntDcSumAmt").text(getZeroMinusDelAmt(prePntDcSumAmt) + "원");
+
+// 	$(".totalPayAmt").text(totalPayAmt.addComma() + "원");
+// 	$(".realOrdSumAmt").text(realOrdSumAmt.addComma() + "원");
+// 	$(".allianceDcAmt").text(getZeroMinusDelAmt(allianceDcAmt) + "원");
+// 	$(".mileageDcAmt").text(getZeroMinusDelAmt(mileageDcAmt) + "원");
+// 	$(".pgDcSumAmt").text(getZeroMinusDelAmt(pgDcSumAmt) + "원");
+// 	$(".pntDcSumAmt").text(pntDcSumAmt.addComma() + "원");
+// 	$(".gfcdUseSumAmt").text(gfcdUseSumAmt.addComma() + "원");
+	
+// 	$(".savePntSumAmt").text(savePntSumAmt.addComma() + "P 적립");
+	
+// 	var pgGbNm		= "";
+// 	var cardGbNm	= "";
+	
+// 	if (pgGb == 'KCP') {
+// 		pgGbNm		= payMeansNm;
+// 		cardGbNm	= "(" + cardNm + ")";
+// 	} else if (pgGb == 'NAVER') {
+// 		pgGbNm	= "네이버페이";
+// 	} else if (pgGb == 'NAVER_ORDER') {
+// 		pgGbNm	= "네이버페이주문형";
+// 		cardNm	= "";
+// 	} else if (pgGb == 'KAKAO') {
+// 		pgGbNm	= "카카오페이";
+// 		cardNm	= "";
+// 	} else if (pgGb == 'PAYCO') {
+// 		pgGbNm	= "페이코";
+// 		cardNm	= "";
+// 	} else if (pgGb == 'ISTYLE') {
+// 		pgGbNm	= "상품권";
+// 		cardNm	= "";
+// 	} else {
+// 		pgGbNm	= "외부몰입금";
+// 		cardNm	= "";
+// 	}
+	
+// 	$(".pgGbNm").text(pgGbNm);
+// 	$(".cardNm").text(cardGbNm);
+	
+	// 원주문 결제내역 정보
+	$('.totPayAmt').text(orginalOrdPayInfo.totPayAmt.addComma() + '원');
+	$('.ordCurrAmt').text(orginalOrdPayInfo.ordCurrAmt.addComma() + '원');
+	$('.payMeansNm').text(orginalOrdPayInfo.payMeansNm);
+	$('.mainPayAmt').text((orginalOrdPayInfo.realOrdAmt - orginalOrdPayInfo.pgCpnAmt - orginalOrdPayInfo.npayPntAmt).addComma() + '원');
+	$('.payMeansDesc').text(orginalOrdPayInfo.payMeansDesc);
+	$('.realDelvAmt').text(orginalOrdPayInfo.realDelvAmt.addComma() + '원');
+	
+	var delvFeeDesc = '';
+	if (!gagajf.isNull(orginalOrdPayInfo.delvFeeDesc)) delvFeeDesc += '<li>배송비 : ' + orginalOrdPayInfo.delvFeeDesc + '</li>';
+	if (!gagajf.isNull(orginalOrdPayInfo.delvFeeCpnDesc)) delvFeeDesc += '<li>배송비 쿠폰 : ' + orginalOrdPayInfo.delvFeeCpnDesc + '</li>';
+	$('.delvFeeDesc').html(delvFeeDesc);
+	
+	$('.gfcdUseAmt').html('<a href="javascript:void(0);" onclick="fnOrderGiftcardHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.gfcdUseAmt.addComma() + '원</u></a>');
 	
-	for (j=0 ; j<orderDeliveryFeeInfo.length ; j++) {
-		delvSumAmt		+= parseInt(orderDeliveryFeeInfo[j].delvFee);
-		delvCpnDcAmt	+= parseInt(orderDeliveryFeeInfo[j].delvCpnDcAmt);
-		delvGfcdUseAmt	+= parseInt(orderDeliveryFeeInfo[j].delvGfcdUseAmt);
+	var gfcdUseDesc = '';
+	if (parseInt(orginalOrdPayInfo.gfcdUseAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.gfcdUseDesc)) {
+		if (orginalOrdPayInfo.gfcdUseDesc.indexOf('!@!') > -1) {
+			var arrGfcdUseDesc = orginalOrdPayInfo.gfcdUseDesc.split('!@!');
+			for (var j = 0; j < arrGfcdUseDesc.length; j++) {
+				gfcdUseDesc += '<li>' + arrGfcdUseDesc[j] + '</li>\n';
+			}
+		} else {
+			gfcdUseDesc += '<li>' + orginalOrdPayInfo.gfcdUseDesc + '</li>\n';
+		}
 	}
+	$('.gfcdUseDesc').html(gfcdUseDesc);
 	
-	realDelvSumAmt	= delvSumAmt - delvCpnDcAmt - delvGfcdUseAmt;
-	realOrdSumAmt	= realOrdSumAmt + realDelvSumAmt; 
-	//gfcdUseSumAmt	= gfcdUseSumAmt + delvGfcdUseAmt;
+	$('.totDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.totDcAmt) + '원');
+	$('.pntDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.pntDcAmt.addComma() + '원</u></a>');
+	$('.cpn1DcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.cpn1DcAmt) + '원');
 	
-	for (k=0 ; k<orderPaymentInfo.length ; k++) {
-		allianceDcAmt	+= parseInt(orderPaymentInfo[k].pgCpnAmt);
-		mileageDcAmt	+= parseInt(orderPaymentInfo[k].npayPntAmt);
+	var cpn1CpnDcDesc = '';
+	if (parseInt(orginalOrdPayInfo.cpn1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cpn1CpnDcDesc)) {
+		if (orginalOrdPayInfo.cpn1CpnDcDesc.indexOf('!@!') > -1) {
+			var arrCpn1CpnDcDesc = orginalOrdPayInfo.cpn1CpnDcDesc.split('!@!');
+			for (var j = 0; j < arrCpn1CpnDcDesc.length; j++) {
+				cpn1CpnDcDesc += '<li>' + arrCpn1CpnDcDesc[j] + '</li>\n';
+			}
+		} else {
+			cpn1CpnDcDesc += '<li>' + orginalOrdPayInfo.cpn1CpnDcDesc + '</li>\n';
+		}
 	}
+	$('.cpn1CpnDcDesc').html(cpn1CpnDcDesc);
 	
-	pgDcSumAmt		= allianceDcAmt + mileageDcAmt;
-	totalPayAmt		= (realOrdSumAmt + pntDcSumAmt + gfcdUseSumAmt) - pgDcSumAmt;
+	$('.pgCpnAmt').text(orginalOrdPayInfo.pgCpnAmt.addComma() + '원');
+	$('.tmtbDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderTmtbHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtbDcAmt) + '원</u></span></a>');
+	if (parseInt(orginalOrdPayInfo.tmtbDcAmt) > 0) {
+		var tmtb1Desc = '';
+		if (parseInt(orginalOrdPayInfo.tmtb1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb1Desc)) {
+			if (orginalOrdPayInfo.tmtb1Desc.indexOf('!@!') > -1) {
+				var arrTmtb1Desc = orginalOrdPayInfo.tmtb1Desc.split('!@!');
+				for (var j = 0; j < arrTmtb1Desc.length; j++) {
+					tmtb1Desc += arrTmtb1Desc[j];
+				}
+			} else {
+				tmtb1Desc += orginalOrdPayInfo.tmtb1Desc;
+			}
+		}
+		var tmtb2Desc = '';
+		if (parseInt(orginalOrdPayInfo.tmtb2DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb2Desc)) {
+			if (orginalOrdPayInfo.tmtb2Desc.indexOf('!@!') > -1) {
+				var arrTmtb2Desc = orginalOrdPayInfo.tmtb2Desc.split('!@!');
+				for (var j = 0; j < arrTmtb2Desc.length; j++) {
+					tmtb2Desc += arrTmtb2Desc[j];
+				}
+			} else {
+				tmtb2Desc += orginalOrdPayInfo.tmtb2Desc;
+			}
+		}
+		var tmtbDcDesc = '<li>수량 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb1DcAmt) + '원' + (!gagajf.isNull(tmtb1Desc) ? " (" : "") + tmtb1Desc + (!gagajf.isNull(tmtb1Desc) ? ")" : "") + '</li>';
+		tmtbDcDesc += '<li>금액 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb2DcAmt) + '원' + (!gagajf.isNull(tmtb2Desc) ? " (" : "") + tmtb2Desc + (!gagajf.isNull(tmtb2Desc) ? ")" : "") + '</li>';
+		$(".tmtbDcDesc").html(tmtbDcDesc);
+	}
 	
-	$(".listSumAmt").text(listSumAmt.addComma() + "원");
-	$(".delvSumAmt").text(delvSumAmt.addComma() + "원");
-	$(".delvCpnDcAmt").text(getZeroMinusDelAmt(delvCpnDcAmt) + "원");
-	$(".realDelvSumAmt").text(realDelvSumAmt.addComma() + "원");
-	$(".goodsDcSumAmt").text(getZeroMinusDelAmt(goodsDcSumAmt) + "원");
-	$(".cpn1DcSumAmt").text(getZeroMinusDelAmt(cpn1DcSumAmt) + "원");
-	$(".tmtb1DcSumAmt").text(getZeroMinusDelAmt(tmtb1DcSumAmt) + "원");
-	$(".tmtb2DcSumAmt").text(getZeroMinusDelAmt(tmtb2DcSumAmt) + "원");
-	$(".tmtbDcSumAmt").text(getZeroMinusDelAmt(tmtbDcSumAmt) + "원");
-	$(".goodsCpnDcSumAmt").text(getZeroMinusDelAmt(goodsCpnDcSumAmt) + "원");
-	$(".cartCpnDcSumAmt").text(getZeroMinusDelAmt(cartCpnDcSumAmt) + "원");
-	$(".cpnDcSumAmt").text(getZeroMinusDelAmt(cpnDcSumAmt) + "원");
-	$(".prePntDcSumAmt").text(getZeroMinusDelAmt(prePntDcSumAmt) + "원");
-
-	$(".totalPayAmt").text(totalPayAmt.addComma() + "원");
-	$(".realOrdSumAmt").text(realOrdSumAmt.addComma() + "원");
-	$(".allianceDcAmt").text(getZeroMinusDelAmt(allianceDcAmt) + "원");
-	$(".mileageDcAmt").text(getZeroMinusDelAmt(mileageDcAmt) + "원");
-	$(".pgDcSumAmt").text(getZeroMinusDelAmt(pgDcSumAmt) + "원");
-	$(".pntDcSumAmt").text(pntDcSumAmt.addComma() + "원");
-	$(".gfcdUseSumAmt").text(gfcdUseSumAmt.addComma() + "원");
+	$('.npayPntAmt').text(orginalOrdPayInfo.npayPntAmt.addComma() + '원');
+	$('.npayPntDesc').text(orginalOrdPayInfo.npayPntDesc);
+	$('.goodsCpnDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderCouponHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.goodsCpnDcAmt) + '원</u></span></a>');
 	
-	$(".savePntSumAmt").text(savePntSumAmt.addComma() + "P 적립");
+	var goodsCpnDcDesc = '';
+	if (parseInt(orginalOrdPayInfo.goodsCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.goodsCpnDcDesc)) {
+		if (orginalOrdPayInfo.goodsCpnDcDesc.indexOf('!@!') > -1) {
+			var arrGoodsCpnDcDesc = orginalOrdPayInfo.goodsCpnDcDesc.split('!@!');
+			for (var j = 0; j < arrGoodsCpnDcDesc.length; j++) {
+				goodsCpnDcDesc += '<li>' + arrGoodsCpnDcDesc[j] + '</li>\n';
+			}
+		} else {
+			goodsCpnDcDesc += '<li>' + orginalOrdPayInfo.goodsCpnDcDesc + '</li>\n';
+		}
+	}
+	$('.goodsCpnDcDesc').html(goodsCpnDcDesc);
 	
-	var pgGbNm		= "";
-	var cardGbNm	= "";
+	$('.savePntAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.savePntAmt.addComma() + '</u>원</a>');
+	$('.cartCpnDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderCouponHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.cartCpnDcAmt) + '원</u></span></a>');
 	
-	if (pgGb == 'KCP') {
-		pgGbNm		= payMeansNm;
-		cardGbNm	= "(" + cardNm + ")";
-	} else if (pgGb == 'NAVER') {
-		pgGbNm	= "네이버페이";
-	} else if (pgGb == 'NAVER_ORDER') {
-		pgGbNm	= "네이버페이주문형";
-		cardNm	= "";
-	} else if (pgGb == 'KAKAO') {
-		pgGbNm	= "카카오페이";
-		cardNm	= "";
-	} else if (pgGb == 'PAYCO') {
-		pgGbNm	= "페이코";
-		cardNm	= "";
-	} else if (pgGb == 'ISTYLE') {
-		pgGbNm	= "상품권";
-		cardNm	= "";
-	} else {
-		pgGbNm	= "외부몰입금";
-		cardNm	= "";
+	var cartCpnDcDesc = '';
+	if (parseInt(orginalOrdPayInfo.cartCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cartCpnDcDesc)) {
+		if (orginalOrdPayInfo.cartCpnDcDesc.indexOf('!@!') > -1) {
+			var arrCartCpnDcDesc = orginalOrdPayInfo.cartCpnDcDesc.split('!@!');
+			for (var j = 0; j < arrCartCpnDcDesc.length; j++) {
+				cartCpnDcDesc += '<li>' + arrCartCpnDcDesc[j] + '</li>\n';
+			}
+		} else {
+			cartCpnDcDesc += '<li>' + orginalOrdPayInfo.cartCpnDcDesc + '</li>\n';
+		}
 	}
+	$('.cartCpnDcDesc').html(cartCpnDcDesc);
 	
-	$(".pgGbNm").text(pgGbNm);
-	$(".cardNm").text(cardGbNm);
+	$('.cashReceipReqYn').text(orginalOrdPayInfo.cashReceipReqYn);
+	$('.prePntDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.prePntDcAmt) + '원');
 });
 </script>
 

src/main/webapp/WEB-INF/views/order/OrderWithdrawConfirmForm.html

@@ -2,7 +2,7 @@
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <!--
  *******************************************************************************
- * @source  : CancelRequestForm.html
+ * @source  : OrderWithdrawConfirmForm.html
  * @desc    : 입점업체 회수컨펌 화면
  *============================================================================
  * STYLE24
@@ -115,6 +115,11 @@ var orderWithdrawList 	= [[${orderWithdrawList}]];		// 회수대상목록
 var sessRoleCd 			= [[${sessionInfo.roleCd}]];	// 권한코드
 var chgReason			= [[${chgReason}]];				// 사유코드
 var chgGb				= [[${chgGb}]];					// 요천구분
+var orderInfoList 		= [[${orderInfoList}]];			// 주문기본정보
+var ordNo				= orderInfoList[0].ordNo;		// 주문번호
+var payGb 				= orderInfoList[0].payGb;		// 결제수단
+var payMeans 			= orderInfoList[0].payMeans;	// 결제방법
+var payStat				= orderInfoList[0].payStat;		// 결제상태
 
 var columnWidthdrawList = [
 	{headerName: "입점업체",			field:"supplyCompNm",		width:120, cellClass: 'text-center'	, hide: true},
@@ -140,6 +145,105 @@ var columnWidthdrawList = [
 	{headerName: "교환옵션1",			field:"optCd11",			width:100, cellClass: 'text-center'},
 	{headerName: "교환옵션2",			field:"optCd12",			width:100, cellClass: 'text-center'},
 	{headerName: "물류메모",			field:"whMemo",				width:200, cellClass: 'text-left'	, editable:true},
+	{
+		headerName		: "주문"
+		, field			: "ordAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "취소"
+		, field			: "cnclRtnAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "즉시할인"
+		, field			: "cpn1DcAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "다다익선1"
+		, field			: "tmtb1DcAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "다다익선2"
+		, field			: "tmtb2DcAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "상품쿠폰"
+		, field			: "goodsCpnDcAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "장바구니쿠폰"
+		, field			: "cartCpnDcAmt"
+		, width			: 100
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "포인트"
+		, field			: "pntDcAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "선포인트"
+		, field			: "prePntDcAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "상품권"
+		, field			: "gfcdUseAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
+	{
+		headerName		: "실결제금액"
+		, field			: "realOrdAmt"
+		, width			: 100
+		, cellClass		: 'text-right'
+		, cellRenderer	: function (params) {
+			return params.value.addComma();
+		}
+	},
 	{headerName: "주문자명",			field:"ordNm",				width:120, cellClass: 'text-left'	, hide: true},
 	{headerName: "주문자핸드폰번호",	field:"ordPhnno",			width:120, cellClass: 'text-left'	, hide: true},
 ];
@@ -171,6 +275,77 @@ var fnChangeChgReason = function(reasonCd) {
 	$('#cancelRequestFrm input[name=chgReason]').val(reasonCd);
 }
 
+//환불예상금액계산
+var fnCalculateRefundAmt = function (obj) {
+	
+	// 2021.05.25 수정
+	var ordDtlNoArr 		= [];
+	var cnclRtnReqQtyArr 	= [];
+	
+	// 1. 반품신청수량 체크
+	for (i=0 ; i<orderWithdrawList.length ; i++) {
+		if (orderWithdrawList[i].chgQty > 0) {
+			// 반품신청값설정
+			ordDtlNoArr.push(orderWithdrawList[i].ordDtlNo);
+			cnclRtnReqQtyArr.push(orderWithdrawList[i].chgQty);
+		}
+	}
+	
+	// 2. 추가정보설정
+	var chgerNm 	= orderInfoList[0].ordNm;
+	var chgerEmail 	= orderInfoList[0].ordEmail;
+	var chgerPhnno 	= orderInfoList[0].ordPhnno;
+	var chgerTelno 	= orderInfoList[0].ordTelno;
+	var custNo		= orderInfoList[0].custNo;
+	var delvFeeCd	= orderInfoList[0].delvFeeCd;
+	
+	// 환불금액계산호출
+	var jsonObj = {
+		"ordNo"					: ordNo
+		,"ordDtlNoArr"			: ordDtlNoArr
+		,"cnclRtnReqQtyArr"		: cnclRtnReqQtyArr
+		,"isCustomer" 			: isCustomer
+		,"chgerNm"				: chgerNm
+		,"chgerEmail"			: chgerEmail
+		,"chgerPhnno"			: chgerPhnno
+		,"custNo"				: custNo
+		,"ordNm"				: chgerNm
+		,"ordPhnno"				: chgerPhnno
+		,"delvFeeCd"			: delvFeeCd
+	}
+	
+	var jsonData = JSON.stringify(jsonObj);
+	
+	gagajf.ajaxJsonSubmit(
+		'/orderChange/cancel/refundAmt'
+		, jsonData
+		, function(result) {
+			// 2021.12.01 취소금액설정
+			if (result.cancelOrderRefundList != null && result.cancelOrderRefundList.length > 0) {
+				for (i=0 ; i<result.cancelOrderRefundList.length ; i++) {
+					for (j=0 ; j<orderWithdrawList.length ; j++) {
+						if (result.cancelOrderRefundList[i].ordDtlNo == orderWithdrawList[j].ordDtlNo) {
+							orderWithdrawList[j].cnclRtnAmt 	= result.cancelOrderRefundList[i].cnclRtnAmt;		// 취소금액
+							orderWithdrawList[j].cpn1DcAmt 		= result.cancelOrderRefundList[i].cpn1DcAmt;		// 즉시할인쿠폰금액
+							orderWithdrawList[j].tmtb1DcAmt 	= result.cancelOrderRefundList[i].tmtb1DcAmt;		// 수량할인다다익선금액
+							orderWithdrawList[j].tmtb2DcAmt 	= result.cancelOrderRefundList[i].tmtb2DcAmt;		// 금액할인다다익선금액
+							orderWithdrawList[j].goodsCpnDcAmt 	= result.cancelOrderRefundList[i].goodsCpnDcAmt;	// 상품쿠폰금액
+							orderWithdrawList[j].cartCpnDcAmt 	= result.cancelOrderRefundList[i].cartCpnDcAmt;		// 장바구니쿠폰금액
+							orderWithdrawList[j].pntDcAmt 		= result.cancelOrderRefundList[i].pntDcAmt;			// 포인트금액
+							orderWithdrawList[j].prePntDcAmt 	= result.cancelOrderRefundList[i].prePntDcAmt;		// 선포인트금액
+							orderWithdrawList[j].gfcdUseAmt 	= result.cancelOrderRefundList[i].gfcdUseAmt;		// 상품권적용금액
+							orderWithdrawList[j].realOrdAmt 	= result.cancelOrderRefundList[i].realOrdAmt;		// 실결제금액
+						}
+					}
+				}
+				
+				// 주문변경대상정보 재설정
+				gridOptionsWidthdrawList.api.setRowData(orderWithdrawList);
+			}
+		}
+	);
+}
+
 $(document).ready(function() {
 	// 1. 그리드생성
 	gagaAgGrid.createGrid('gridOrderWithdrawList', gridOptionsWidthdrawList);
@@ -181,6 +356,9 @@ $(document).ready(function() {
 	
 	// 사유체크실행
 	fnChangeChgReason(chgReason);
+	
+	// 2021.12.10 취소금액계산
+	fnCalculateRefundAmt(null);
 });
 
 

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -531,7 +531,11 @@ var columnCancelReqList = [
 		, width			: 80		
 		, cellClass		: 'text-right'
 		, cellRenderer	: function (params) {
-			return params.value.addComma();
+			if (params.data.delvFeeCrite == 'G078_30') {
+				return 0;
+			} else {
+				return params.value.addComma();
+			}
 		}
 		, hide			: temp1
 	},
@@ -782,7 +786,11 @@ var columnCancelReqToBeList = [
 				, width			: 80		
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},
@@ -877,7 +885,11 @@ var columnDelvInfoList = [
 				, width			: 100		
 				, cellClass		: 'text-right'
 				, cellRenderer	: function (params) {
-					return params.value.addComma();
+					if (params.data.delvFeeCrite == 'G078_30') {
+						return 0;
+					} else {
+						return params.value.addComma();
+					}
 				}
 				, hide			: temp2
 			},

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -219,21 +219,21 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
-	var ordChgSq 		= [[${ordChgSq}]];	// 주문변경번호
-	var ordNo    		= [[${ordNo}]];	// 주문번호 
-	var userNo   		= [[${userNo}]]; 
+	var ordChgSq 		= [[${ordChgSq}]];				// 주문변경번호
+	var ordNo    		= [[${ordNo}]];					// 주문번호 
+	var userNo   		= [[${userNo}]]; 				// 회원번호
 
-	var ordChgCnt 		= 0;	//회수신청건수
-	var chgGb 			= "반품";
+	var ordChgCnt 		= 0;							// 회수신청건수
+	var chgGb 			= "반품";						// 변경구분값
 	
-	var toTalOrdQty 	= 0;	// 주문 총수량 
-	var ordInQty  		= 0;	// 반품 입고총수량 
-	var ordChgQty		= 0;	// 반품 신청총수량 
-	var delvExpnYn  	= "";   // 출고예외(확정후 품절,불량)여부
-	var wdGb        	= "";
-	var mallGb      	= "";
-	var reFundInfo  	= [[${refundConfirmPreInfo}]]; // 환불컨펌 정보
-	var temp1			= true;
+	var toTalOrdQty 	= 0;							// 주문 총수량 
+	var ordInQty  		= 0;							// 반품 입고총수량 
+	var ordChgQty		= 0;							// 반품 신청총수량 
+	var delvExpnYn  	= "";							// 출고예외(확정후 품절,불량)여부
+	var wdGb        	= "";							// 회수요청구분
+	var mallGb      	= "";							// 몰구분
+	var reFundInfo  	= [[${refundConfirmPreInfo}]];	// 환불컨펌 정보
+	var temp1			= false;
 
 	var returnOrderInfo;
 	var columnDefsDetail = [
@@ -569,7 +569,7 @@
 
 		addDeliveryFee			= 0;
 		addDeliveryFeeYn		= "N";
-			`
+			
 		codFeeAmt				= 0;
 		codFeeYn				= "N";
 		enCloseFeeAmt			= Number(enCloseFee);