jsh77b преди 4 години
родител
ревизия
b9469ba3c6
променени са 2 файла, в които са добавени 125 реда и са изтрити 0 реда
  1. 37 0
      src/main/java/com/style24/admin/biz/web/TsaOrderController.java
  2. 88 0
      src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

+ 37 - 0
src/main/java/com/style24/admin/biz/web/TsaOrderController.java

@@ -224,6 +224,43 @@ public class TsaOrderController extends TsaBaseController {
 		
 		// 2021.05.11 배송비수정여부추가
 		Collection<Order> orderDetailList = orderService.getOrderDetailList(order);
+		
+		/*
+		// 2021.07.29 결제금액관련정보
+		int listSumAmt 			= 0; // 상품금액합계(정상가)
+		int goodsSumAmt 		= 0; // 상품금액합계(판매가)
+		int goodsDcSumAmt		= 0; // 상품할인금액(정상가 - 판매가)
+		int delvFeeSumAmt 		= 0; // 배송비합계
+		int realDelvSumAmt		= 0; // 실제배송비합계
+		int cpn11DcSumAmt 		= 0; // 즉시할인합계(실결제금액계산용)
+		int tmtbSumAmt 			= 0; // 다다익선합계
+		int cpnDcSumAmt 		= 0; // 쿠폰할인합계
+		int prePntDcSumAmt 		= 0; // 선포인트할인합계
+		int pntDcSumAmt 		= 0; // 포인트사용합계
+		int gfcdUseSumAmt 		= 0; // 상품권사용합계
+		int mileageDcAmt 		= 0; // 마일리지사용합계
+		int allianceDcAmt 		= 0; // 제휴할인합계
+		int savePntSumAmt 		= 0; // 적립예정포인트합계
+		
+		int listPriceSum 		= 0; 	// 총상품금액 (정상가)
+		int currPriceSum		= 0;	// 상품할인금액 (
+		int tmtbDcAmtSum 		= 0; 	// 다다익선할인금액
+		int prePntDcAmtSum 		= 0; 	// 선포인트할인금액
+		int cpn1DcAmtSum		= 0;	// 즉시할인쿠폰금액
+		int goodspCnDcAmtSum	= 0;	// 상품쿠폰할인금액
+		int cartpCnDcAmtSum		= 0;	// 장바구니쿠폰할인금액
+		int delvFeeSum			= 0;	// 배송비
+		int delvCpnDcAmtSum		= 0;	// 배송비쿠폰할인금액
+		
+		int totalAmtSum			= 0;	// 총매출액 (실결제액 + 제휴할인결제액 + 포인트결제액 + 상품권결제액)
+		int realOrdAmtSum		= 0;	// 실결제액 ((실결제액 + 배송비합계) - 제휴할인결제액)
+		int pgCpnAmtSum			= 0;	// 제휴쿠폰 할인금액 (PG)
+		int npayPntAmt			= 0;	// 마일리지 할인금액 (네이버)
+		int pntDcAmtSum			= 0;	// 포인트결제액
+		int gfcdUseAmtSum		= 0;	// 상품권결제액
+		int savePntAmtSum		= 0;	// 적립금액
+		*/
+		
 		String allCanYn = "Y";
 		for (Order orderDetail : orderDetailList) {
 			if ("Y".equals(allCanYn)

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

@@ -13,6 +13,7 @@
  * 1.0  2020.11.16   jsh77b       최초 작성
  *******************************************************************************
  -->
+ 
 <div class="modalPopup" data-width="1500" data-height="700"> <!-- data-width="1500" data-height="870" -->
 	<div class="panelStyle">
 		<div class="panelTitle">
@@ -88,6 +89,93 @@
 					</tbody>
 				</table>
 				<!-- //TABLE -->
+				
+				<!-- 
+				<h4>주문결제내역</h4>
+				<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>15,000원</td>
+							<td></td>
+						</tr>
+						<tr>
+							<td rowspan="2">할인 내역</td>
+							<td>상품할인</td>
+							<td>-60,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>다다익선 할인 : </span><span>-60,000원</span></div>
+								<div style="height:25px;"><span>선포인트 할인 : </span><span>-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td>쿠폰할인</td>
+							<td>-60,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>즉시할인쿠폰 : </span><span>-60,000원</span></div>
+								<div style="height:25px;"><span>주문서상품쿠폰 : </span><span>-60,000원</span></div>
+								<div style="height:25px;"><span>장바구니쿠폰 : </span><span>-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td>배송비</td>
+							<td>배송비합계</td>
+							<td>+ 6,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>배송비 : </span><span>-60,000원</span></div>
+								<div style="height:25px;"><span>배송비쿠폰 : </span><span>-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td rowspan="5">총 결제 금액</td>
+							<td style="height:25px;">총 매출액</td>
+							<td>70,000원</td>
+							<td>15,000P 적립</td>
+						</tr>
+						<tr>
+							<td style="height:25px;">실 결제액</td>
+							<td>70,000원</td>
+							<td>신용카드(현대)</td>
+						</tr>
+						<tr>
+							<td style="line-height:25px;">
+								<div style="height:25px;">제휴할인결제액</div>
+								<div style="height:25px;">(KCP쿠폰+포인트)</div>
+							</td>
+							<td>70,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>제휴쿠폰 : </span><span>-60,000원</span></div>
+								<div style="height:25px;"><span>마일리지 : </span><span>-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td style="height:25px;">포인트 결제액</td>
+							<td>70,000P</td>
+							<td></td>
+						</tr>
+						<tr>
+							<td style="height:25px;">상품권 결제액</td>
+							<td>70,000P</td>
+							<td></td>
+						</tr>
+					</tbody>
+				</table>
+				 -->
 									
 				<h4>주문상품정보</h4>
 				<div id="gridOrderGoodsInfo" style="width:100%; height:200px;" class="ag-theme-balham"></div>