주문금액수정

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -247,7 +247,8 @@ public class TsfOrderController extends TsfBaseController {
 
 		// 4.2 할인정보(상품금액, 즉시할인, 다다익선, 선포인트, 적립예정포인트) 
 		mav.addObject("listSumAmt"			, goodsDcAmtMap.get("listSumAmt"));			// 상품금액합계(정상가)
-		mav.addObject("orgGoodsSumAmt"		, goodsDcAmtMap.get("orgGoodsSumAmt"));		// 상품금액합계
+		mav.addObject("orgGoodsSumAmt"		, goodsDcAmtMap.get("orgGoodsSumAmt"));		// 상품금액합계(판매가)
+		mav.addObject("goodsDcSumAmt"		, goodsDcAmtMap.get("goodsDcSumAmt"));		// 상품할인금액(정상가-판매가)
 		mav.addObject("cpn1DcSumAmt"		, goodsDcAmtMap.get("cpn1DcSumAmt"));		// 즉시할인금액합계
 		mav.addObject("tmtbDcSumAmt"		, goodsDcAmtMap.get("tmtbDcSumAmt"));		// 다다익선할인금액합계
 		mav.addObject("prePntDcAmt"			, goodsDcAmtMap.get("prePntDcAmt"));		// 선포인트사용가능금액
@@ -512,6 +513,7 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 4.2 할인정보(상품금액, 즉시할인, 다다익선, 선포인트, 적립예정포인트) 
 		mav.addObject("orgGoodsSumAmt"		, goodsDcAmtMap.get("orgGoodsSumAmt"));		// 상품금액합계
+		mav.addObject("goodsDcSumAmt"		, goodsDcAmtMap.get("goodsDcSumAmt"));		// 상품할인금액(정상가-판매가)
 		mav.addObject("cpn1DcSumAmt"		, goodsDcAmtMap.get("cpn1DcSumAmt"));		// 즉시할인금액합계
 		mav.addObject("tmtbDcSumAmt"		, goodsDcAmtMap.get("tmtbDcSumAmt"));		// 다다익선할인금액합계
 		mav.addObject("prePntDcAmt"			, goodsDcAmtMap.get("prePntDcAmt"));		// 선포인트사용가능금액
@@ -890,6 +892,7 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("realOrdSumAmt"		, realOrdSumAmt);						// 결제금액합계
 		mav.addObject("listSumAmt"			, resultMap.get("listSumAmt"));			// 상품금액합계(정상가)
 		mav.addObject("goodsSumAmt"			, resultMap.get("goodsSumAmt"));		// 상품금액합계(판매가)
+		mav.addObject("goodsDcSumAmt"		, resultMap.get("goodsDcSumAmt"));		// 상품금액합계(정상가 - 판매가)
 		mav.addObject("delvFeeSumAmt"		, resultMap.get("delvFeeSumAmt"));		// 배송비합계
 		mav.addObject("cpn1DcSumAmt"		, resultMap.get("cpn1DcSumAmt"));		// 즉시할인합계
 		mav.addObject("tmtbSumAmt"			, resultMap.get("tmtbSumAmt"));			// 다다익선합계

src/main/webapp/WEB-INF/views/mob/order/OrderCompleteMob.html

@@ -216,7 +216,16 @@
 									</div>
 									<!-- //210330 : 태그 분할 -->
 									<div>
-										<dt>상품할인(즉시할인)</dt>
+										<dt>상품할인</dt>
+										<th:block th:if="${goodsDcSumAmt}>0">
+											<dd><div><span th:text="|- ${#numbers.formatInteger(goodsDcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
+										</th:block>
+										<th:block th:if="${goodsDcSumAmt}<1">
+											<dd><div><span>0</span>원<div></dd>
+										</th:block>
+									</div>
+									<div>
+										<dt>즉시할인</dt>
 										<th:block th:if="${cpn1DcSumAmt}>0">
 											<dd><div><span th:text="|- ${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}|"></span>원</div></dd>
 										</th:block>
@@ -300,13 +309,19 @@
 									</div>
 									<div>
 										<dt>결제방법</dt>
-										<!-- kcp 신용카드 -->
+										<dd th:if="${orderInfo.pgGb == 'NAVER'}"><div><span>네이버 페이</span></div></dd>
+										<dd th:if="${orderInfo.pgGb == 'KAKAO'}"><div><span>카카오 페이</span></div></dd>
+										<dd th:if="${orderInfo.pgGb == 'PAYCO'}"><div><span>PAYCO</span></div></dd>
+										<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_10'}"><div><span>실시간계좌이체</span></div></dd>
+										<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_20'}"><div><span>무통장입금</span></div></dd>
+										<dd><div><span th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_30'}" th:text="|${orderInfo.cardNm}/${orderInfo.cardMips}|"></span></div></dd>
+										<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_60'}"><div><span>휴대폰결제</span></div></dd>
+													
+										<!-- kcp 신용카드 
 										<th:block th:if="${orderInfo.payMeans} == 'G014_30'">
-											<!--  체크카드 -->
 											<th:block th:if="${orderInfo.cardType} == 'Y'">
 												<dd><div><span th:text="|체크카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></span></div></dd>
 											</th:block>
-											<!--  신용카드 -->
 											<th:block th:if="${orderInfo.cardType} == 'N'">
 												<dd><div><span th:text="|체크카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></span></div></dd>
 											</th:block>
@@ -314,6 +329,7 @@
 										<th:block th:if="${orderInfo.payMeans} != 'G014_30'">
 											<dd><div><span th:text="${orderInfo.payType}"></span></div></dd>
 										</th:block>
+										-->
 									</div>
 								</dl>
 							</td>

src/main/webapp/WEB-INF/views/mob/order/OrderListInfoMob.html

@@ -128,7 +128,16 @@
 							<dd><em id="delvSumAmt" th:text="${#numbers.formatInteger(sumDelvFee, 1, 'COMMA')}"></em>원</dd>
 						</div>
 						<div>
-							<dt>상품할인(즉시할인)</dt>
+							<dt>상품할인</dt>
+							<th:block th:if="${goodsDcSumAmt} > 0">
+								<dd><span class="disc_amount" th:text="|-${#numbers.formatInteger(goodsDcSumAmt, 1, 'COMMA')}원|"></span></dd>
+							</th:block>
+							<th:block th:if="${cpn1DcSumAmt} < 1">
+								<dd><span class="disc_amount" th:text="|${#numbers.formatInteger(goodsDcSumAmt, 1, 'COMMA')}원|"></span></dd>
+							</th:block>
+						</div>
+						<div>
+							<dt>즉시할인</dt>
 							<th:block th:if="${cpn1DcSumAmt} > 0">
 								<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|-${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}원|"></span></dd>
 							</th:block>

src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -128,7 +128,16 @@
 													<dd><em th:text="${#numbers.formatInteger(delvFeeSumAmt, 1, 'COMMA')}"></em>원</dd>	
 												</div>
 												<div>
-													<dt>상품할인(즉시할인)</dt>
+													<dt>상품할인</dt>
+													<th:block th:if="${goodsDcSumAmt}>0">
+														<dd><em th:text="|- ${#numbers.formatInteger(goodsDcSumAmt, 1, 'COMMA')}|"></em>원</dd>
+													</th:block>
+													<th:block th:if="${goodsDcSumAmt}<1">
+														<dd><em>0</em>원</dd>
+													</th:block>
+												</div>
+												<div>
+													<dt>즉시할인</dt>
 													<th:block th:if="${cpn1DcSumAmt}>0">
 														<dd><em th:text="|- ${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')}|"></em>원</dd>
 													</th:block>
@@ -218,14 +227,20 @@
 												</div>
 												<!-- 신용카드 일때 -->
 												<div>
-													<dt class="sr-only">결제방법</dt>
-													<!-- kcp 신용카드 -->
+													<dt>결제방법</dt>
+													<dd th:if="${orderInfo.pgGb == 'NAVER'}">네이버 페이</dd>
+													<dd th:if="${orderInfo.pgGb == 'KAKAO'}">카카오 페이</dd>
+													<dd th:if="${orderInfo.pgGb == 'PAYCO'}">PAYCO</dd>
+													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_10'}">실시간계좌이체</dd>
+													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_20'}">무통장입금</dd>
+													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_30'}" th:text="|${orderInfo.cardNm}/${orderInfo.cardMips}|"></dd>
+													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_60'}">휴대폰결제</dd>
+																										
+													<!-- kcp 신용카드
 													<th:block th:if="${orderInfo.payMeans} == 'G014_30'">
-														<!--  체크카드 -->
 														<th:block th:if="${orderInfo.cardType} == 'Y'">
 															<dd th:text="|체크카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></dd>
 														</th:block>
-														<!--  신용카드 -->
 														<th:block th:if="${orderInfo.cardType} == 'N'">
 															<dd th:text="|신용카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></dd>
 														</th:block>
@@ -233,6 +248,7 @@
 													<th:block th:if="${orderInfo.payMeans} != 'G014_30'">
 														<dd th:text="${orderInfo.payType}"></dd>
 													</th:block>
+													-->
 												</div>
 												<!-- //신용카드 일때 -->
 											</dl>

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -395,7 +395,16 @@
 									<dd id="delvSumAmt" th:text="|${#numbers.formatInteger(sumDelvFee, 1, 'COMMA')} 원|"></dd>
 								</div>
 								<div>
-									<dt>할인금액</dt>
+									<dt>상품할인금액</dt>
+									<th:block th:if="${goodsDcSumAmt} > 0">
+										<dd><span class="disc_amount" th:text="|-${#numbers.formatInteger(goodsDcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+									</th:block>
+									<th:block th:if="${goodsDcSumAmt} < 1">
+										<dd><span class="disc_amount" th:text="|${#numbers.formatInteger(goodsDcSumAmt, 1, 'COMMA')} 원|"></span></dd>
+									</th:block>
+								</div>
+								<div>
+									<dt>즉시할인금액</dt>
 									<th:block th:if="${cpn1DcSumAmt} > 0">
 										<dd><span class="disc_amount" id="cpn1DcSumAmt" th:text="|-${#numbers.formatInteger(cpn1DcSumAmt, 1, 'COMMA')} 원|"></span></dd>
 									</th:block>