마이페이지 금액 수정 커밋

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -696,10 +696,10 @@
 											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt, 1, 'COMMA')}|"></span>원</div></dd>
 										</div>
 									</th:block>
-									<th:block th:if="${orderAmtInfo.cartCpnDcAmt} + ${orderAmtInfo.goodsCpnDcAmt} + ${orderAmtInfo.delvCpnDcAmt} > 0">
+									<th:block th:if="${orderAmtInfo.cartCpnDcAmt} + ${orderAmtInfo.goodsCpnDcAmt} > 0">
 										<div>
 											<dt>쿠폰할인</dt>
-											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt, 1, 'COMMA')}|"></span>원</div></dd>
 										</div>
 									</th:block>
 									<th:block th:if="${orderAmtInfo.prePntDcAmt} > 0">

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderDetailFormMob.html

@@ -529,10 +529,10 @@
 											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt, 1, 'COMMA')}|"></span>원</div></dd>
 										</div>
 									</th:block>
-									<th:block th:if="${orderAmtInfo.cartCpnDcAmt} + ${orderAmtInfo.goodsCpnDcAmt} + ${orderAmtInfo.delvCpnDcAmt} > 0">
+									<th:block th:if="${orderAmtInfo.cartCpnDcAmt} + ${orderAmtInfo.goodsCpnDcAmt} > 0">
 										<div>
 											<dt>쿠폰할인</dt>
-											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt, 1, 'COMMA')}|"></span>원</div></dd>
 										</div>
 									</th:block>
 									<th:block th:if="${orderAmtInfo.prePntDcAmt} > 0">

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -398,7 +398,7 @@
 													<dt>총 주문금액 (상품금액+배송비+추가비용)</dt>
 													<dd>
 														<div class="price">
-															<span class="order_total_price"><em th:text="${#numbers.formatInteger((orderAmtInfo.ordAmt + orderAmtInfo.cpn1DcAmt) - orderAmtInfo.cnclRtnAmt + orderAmtInfo.delvFee, 1, 'COMMA')}"></em>원</span>
+															<span class="order_total_price"><em th:text="${#numbers.formatInteger((orderAmtInfo.ordAmt + orderAmtInfo.cpn1DcAmt) - orderAmtInfo.cnclRtnAmt + orderAmtInfo.realDelvAmt, 1, 'COMMA')}"></em>원</span>
 														</div>
 													</dd>
 												</div>
@@ -410,9 +410,9 @@
 													<dt>다다익선 할인</dt>
 													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt, 1, 'COMMA')}|"></em>원</dd>
 												</div>
-												<div class="include_item" th:if="${orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt > 0}">
+												<div class="include_item" th:if="${orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt > 0}">
 													<dt>쿠폰할인</dt>
-													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt, 1, 'COMMA')}|"></em>원</dd>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt, 1, 'COMMA')}|"></em>원</dd>
 												</div>
 												<div class="include_item" th:if="${orderAmtInfo.prePntDcAmt > 0}">
 													<dt>선포인트 할인</dt>
@@ -443,7 +443,6 @@
 													<dd>
 														<div class="price">
 															<span class="pay_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.payAmt - orderAmtInfo.npayPntAmt - orderAmtInfo.pgCpnAmt, 1, 'COMMA')}"></em>원</span>
-<!--															<span class="pay_total_price"><em th:text="${#numbers.formatInteger((orderAmtInfo.ordAmt + orderAmtInfo.cpn1DcAmt) - orderAmtInfo.cnclRtnAmt + orderAmtInfo.delvFee - orderAmtInfo.totalDcAmt - orderAmtInfo.delvCpnDcAmt - orderAmtInfo.npayPntAmt - orderAmtInfo.pgCpnAmt, 1, 'COMMA')}"></em>원</span>-->
 														</div>
 													</dd>
 												</div>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderDetailFormWeb.html

@@ -282,7 +282,7 @@
 													<dt>총 주문금액 (상품금액+배송비+추가비용)</dt>
 													<dd>
 														<div class="price">
-															<span class="order_total_price"><em th:text="${#numbers.formatInteger((orderAmtInfo.ordAmt + orderAmtInfo.cpn1DcAmt) - orderAmtInfo.cnclRtnAmt + orderAmtInfo.delvFee, 1, 'COMMA')}"></em>원</span>
+															<span class="order_total_price"><em th:text="${#numbers.formatInteger((orderAmtInfo.ordAmt + orderAmtInfo.cpn1DcAmt) - orderAmtInfo.cnclRtnAmt + orderAmtInfo.realDelvAmt, 1, 'COMMA')}"></em>원</span>
 														</div>
 													</dd>
 												</div>
@@ -306,7 +306,7 @@
 													<dt>결제 금액</dt>
 													<dd>
 														<div class="price">
-															<span class="pay_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.payAmt - orderAmtInfo.npayPntAmt, 1, 'COMMA')}"></em>원</span>
+															<span class="pay_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.payAmt - orderAmtInfo.npayPntAmt - paymentInfo.pgCpnAmt, 1, 'COMMA')}"></em>원</span>
 														</div>
 													</dd>
 												</div>