원주문 결제정보 내역 추가

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/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="6%"/>
+						<col width="14%"/>
+						<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].ordNo}"></td>
+							<td th:text="${orderInfo[0].extmallOrderId}"></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,213 @@
 				<h4>주문결제내역</h4>
 				<table class="frmStyle">
 					<colgroup>
-						<col width="">
-						<col width="">
-						<col width="">
-						<col width="">
+						<col width="10%"/>
+						<col width="10%"/>
+						<col width="20%"/>
+						<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="realOrdAmt"></td>
+							<td class="payMeansDesc"></td>
+							<th>배송비 합산(B)</th>
+							<td class="realDelvAmt"></td>
+							<td>
+								<ul class="notice">
+									<li>배송비 : <span class="delvFeeDesc"></span></li>
+									<li>배송비 쿠폰 : <span class="delvFeeCpnDesc"></span></li>
+								</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>
+							<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="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>KCP쿠폰</th>
+							<td class="pgCpnAmt"></td>
+							<td></td>
+							<th><i class="fa fa-level-up fa-rotate-90" aria-hidden="true"></i>&nbsp;다다익선할인</th>
+							<td class="tmtbDcAmt"></td>
+							<td>
+								<ul class="notice tmtbDcDesc">
+								</ul>
 							</td>
 						</tr>
 						<tr>
-							<td>선포인트할인</td>
-							<td class="prePntDcSumAmt">-60,000원</td>
+							<th>마일리지</th>
+							<td class="npayPntAmt"></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;상품쿠폰&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+							<td class="cRed goodsCpnDcAmt"></td>
 							<td>
-								<span class="pgGbNm">신용카드</span><span class="cardNm">(현대)</span>
+								<ul class="notice goodsCpnDcDesc">
+								</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="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="pntDcSumAmt">70,000P</td>
+							<th>현금영수증신청여부</th>
+							<td class="cashReceipReqYn"></td>
 							<td></td>
-						</tr>
-						<tr>
-							<td style="height:25px;">상품권 결제액</td>
-							<td class="gfcdUseSumAmt">70,000원</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 +351,7 @@ var ordNo 					= [[${ordNo}]];							// 주문번호
 var userNo 					= [[${userNo}]];						// 관리자번호
 
 var orderInfo 				= [[${orderInfo}]];						// 기본정보
+var orginalOrdPayInfo 		= [[${orginalOrdPayInfo}]];				// 원주문결제내역정보
 var orderGoodsInfo 			= [[${orderGoodsInfo}]];				// 주문상세정보
 var orderFreeGiftInfo 		= [[${orderFreeGiftInfo}]];				// 주문사은품정보
 var orderDeliveryAddrInfo	= [[${orderDeliveryAddrInfo}]];			// 배송정보
@@ -1097,7 +1207,7 @@ var fnSetGridHeightInit = function () {
 <script th:inline="javascript">
 var pgGb 			= orderInfo[0].pgGb;
 var payMeans 		= orderInfo[0].payMeans;
-var payMeansNm		= orderInfo[0].payMeansNm;
+// var payMeansNm		= orderInfo[0].payMeansNm;
 var cardNm			= orderInfo[0].cardNm;
 var custNo			= orderInfo[0].custNo;
 
@@ -1219,49 +1329,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 +1424,184 @@ $(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);
+// 	}
 	
-	for (j=0 ; j<orderDeliveryFeeInfo.length ; j++) {
-		delvSumAmt		+= parseInt(orderDeliveryFeeInfo[j].delvFee);
-		delvCpnDcAmt	+= parseInt(orderDeliveryFeeInfo[j].delvCpnDcAmt);
-		delvGfcdUseAmt	+= parseInt(orderDeliveryFeeInfo[j].delvGfcdUseAmt);
+// 	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);
+	$('.realOrdAmt').text(orginalOrdPayInfo.realOrdAmt.addComma() + '원');
+	$('.payMeansDesc').text(orginalOrdPayInfo.payMeansDesc);
+	$('.realDelvAmt').text(orginalOrdPayInfo.realDelvAmt.addComma() + '원');
+	$('.delvFeeDesc').text(orginalOrdPayInfo.delvFeeDesc);
+	if (!gagajf.isNull(orginalOrdPayInfo.delvFeeCpnDesc)) $('.delvFeeCpnDesc').text(orginalOrdPayInfo.delvFeeCpnDesc);
+	$('.gfcdUseAmt').html('<a href="javascript:void(0);" onclick="fnOrderGiftcardHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.gfcdUseAmt.addComma() + '원</u></a>');
+	
+	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);
+	
+	$('.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>');
 	
-	pgDcSumAmt		= allianceDcAmt + mileageDcAmt;
-	totalPayAmt		= (realOrdSumAmt + pntDcSumAmt + gfcdUseSumAmt) - pgDcSumAmt;
+	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() + '원');
+	$('.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>