Przeglądaj źródła

취/반/교 알림톡 및 메일발송 try/catch 수정

card007 4 lat temu
rodzic
commit
9e29fc403b

+ 17 - 5
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -535,7 +535,11 @@ public class TsfMypageController extends TsfBaseController {
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderExchangeRequest(orderChange, custNo);
 				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 
+			try {
 				// 교환배송비 있을 시 추가결제완료 로직에서 메일 발송
 				if (addPayCost == 0) {
 					// 교환 안내 메일 정보 조회
@@ -547,7 +551,7 @@ public class TsfMypageController extends TsfBaseController {
 					}
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 
@@ -765,12 +769,16 @@ public class TsfMypageController extends TsfBaseController {
 			try {
 				// 반품 알림톡 관련 정보 조회
 				orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
-				
+
 				// 반품 알림톡 발송
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderReturnRequest(orderChange, custNo);
 				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 
+			try {
 				// 반품배송비 있을 시 추가결제완료 로직에서 메일 전송
 				if (addPayCost == 0) {
 					// 반품 안내 메일 정보 조회
@@ -782,7 +790,7 @@ public class TsfMypageController extends TsfBaseController {
 					}
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 
@@ -907,7 +915,11 @@ public class TsfMypageController extends TsfBaseController {
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
 				}
-
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			
+			try {
 				// 취소 안내 메일 정보 조회
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
@@ -916,7 +928,7 @@ public class TsfMypageController extends TsfBaseController {
 					mailService.sendOrderCancel(replaceInfo, custNo);
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 

+ 16 - 4
src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -589,7 +589,11 @@ public class TsfNoMemberController extends TsfBaseController {
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderCancelComplete(orderChange, 0);
 				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 
+			try {
 				// 취소 안내 메일 정보 조회
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
@@ -598,7 +602,7 @@ public class TsfNoMemberController extends TsfBaseController {
 					mailService.sendOrderCancel(replaceInfo, 0);
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 
@@ -756,12 +760,16 @@ public class TsfNoMemberController extends TsfBaseController {
 			try {
 				// 반품 알림톡 관련 정보 조회
 				orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
-				
+
 				// 반품 알림톡 발송
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderReturnRequest(orderChange, 0);
 				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 
+			try {
 				// 반품배송비 있을 시 추가결제완료 로직에서 메일 전송
 				if (addPayCost == 0) {
 					// 반품 안내 메일 정보 조회
@@ -773,7 +781,7 @@ public class TsfNoMemberController extends TsfBaseController {
 					}
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 
@@ -970,7 +978,11 @@ public class TsfNoMemberController extends TsfBaseController {
 				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 					coreKakaotalkService.sendOrderExchangeRequest(orderChange, 0);
 				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
 
+			try {
 				// 교환배송비 있을 시 추가결제완료 로직에서 메일 발송
 				if (addPayCost == 0) {
 					// 교환 안내 메일 정보 조회
@@ -982,7 +994,7 @@ public class TsfNoMemberController extends TsfBaseController {
 					}
 				}
 			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+				e.printStackTrace();
 			}
 		}
 

+ 22 - 10
src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1645,38 +1645,50 @@ public class TsfOrderController extends TsfBaseController {
 				chgGb = list.iterator().next().getChgGb();
 			}
 
-			try {
-				OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
+			OrderChange orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
 
-				if (TscConstants.OrderChangeGb.RETURN.value().equals(chgGb)) {
-					// 반품 알림톡 발송
+			if (TscConstants.OrderChangeGb.RETURN.value().equals(chgGb)) {
+				// 반품 알림톡 발송
+				try {
 					if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 						kakaotalkService.sendOrderReturnRequest(orderChange, custNo);
 					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 
-					// 반품 안내 메일 정보 조회
+				// 반품 안내 메일 정보 조회
+				try {
 					GagaMap replaceInfo = coreOrderChangeService.getMailOrderReturnReplaceInfo(orderChange);
 
 					// 반품 안내 메일 발송
 					if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
 						mailService.sendOrderReturn(replaceInfo, custNo);
 					}
-				} else if (TscConstants.OrderChangeGb.EXCHANGE.value().equals(chgGb)) {
-					// 교환 알림톡 발송
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			} else if (TscConstants.OrderChangeGb.EXCHANGE.value().equals(chgGb)) {
+				// 교환 알림톡 발송
+				try {
 					if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
 						kakaotalkService.sendOrderExchangeRequest(orderChange, custNo);
 					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 
-					// 교환 안내 메일 정보 조회
+				// 교환 안내 메일 정보 조회
+				try {
 					GagaMap replaceInfo = coreOrderChangeService.getMailOrderExchangeReplaceInfo(orderChange);
 
 					// 교환 안내 메일 발송
 					if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
 						mailService.sendOrderExchange(replaceInfo, custNo);
 					}
+				} catch (Exception e) {
+					e.printStackTrace();
 				}
-			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
 			}
 		}
 

+ 4 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -351,6 +351,7 @@
 		     , SUM(OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT + OD.CART_CPN_DC_AMT + OD.GOODS_CPN_DC_AMT + OD.PRE_PNT_DC_AMT + OD.PNT_DC_AMT + OD.GFCD_USE_AMT) AS TOTAL_DC_AMT
 		     , SUM(OD.REAL_ORD_AMT)     AS REAL_ORD_AMT
 		     , SUM(OD.SAVE_PNT_AMT)     AS SAVE_PNT_AMT
+		     , DF.DELV_FEE
 		     , DF.DELV_CPN_DC_AMT
 		     , DF.REAL_DELV_AMT
 		     , P.PAY_AMT
@@ -359,10 +360,12 @@
 		  FROM TB_ORDER_DETAIL OD
 		  LEFT OUTER JOIN (
 		      SELECT ORD_NO
+		           , SUM(DELV_FEE)        AS DELV_FEE
 		           , SUM(DELV_CPN_DC_AMT) AS DELV_CPN_DC_AMT
 		           , SUM(REAL_DELV_AMT)   AS REAL_DELV_AMT
 		        FROM TB_DELIVERY_FEE
 		       WHERE ORD_NO = #{ordNo}
+		         AND DELV_FEE_GB = 'G018_10'
 		       GROUP BY ORD_NO
 		  ) DF
 		    ON OD.ORD_NO = DF.ORD_NO
@@ -378,7 +381,7 @@
 		    ON OD.ORD_NO = P.ORD_NO
 		 WHERE OD.ORD_NO = #{ordNo}
 		   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
-		 GROUP BY DF.DELV_CPN_DC_AMT, DF.REAL_DELV_AMT, P.PAY_AMT, P.NPAY_PNT_AMT, P.PG_CPN_AMT
+		 GROUP BY DF.DELV_FEE, DF.DELV_CPN_DC_AMT, DF.REAL_DELV_AMT, P.PAY_AMT, P.NPAY_PNT_AMT, P.PG_CPN_AMT
 	</select>
 
 	<!-- 마이페이지 주문상세 결제정보 조회 -->

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

@@ -390,92 +390,94 @@
 									<col width="50%">
 									<col width="50%">
 								</colgroup>
-								<tbody><tr>
-									<td>
-										<dl>
-											<div>
-												<dt>총 주문금액 (상품금액+배송비+추가비용)</dt>
-												<dd>
-													<div class="price">
-														<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>
-											<div class="include_item" th:if="${orderAmtInfo.cpn1DcAmt > 0}"> <!-- 할인항목 표기 class명 include_item -->
-												<dt>즉시할인</dt>
-												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cpn1DcAmt, 1, 'COMMA')}|"></em>원</dd>
-											</div>
-											<div class="include_item" th:if="${orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt > 0}">
-												<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}">
-												<dt>쿠폰할인</dt>
-												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt, 1, 'COMMA')}|"></em>원</dd>
-											</div>
-											<div class="include_item" th:if="${orderAmtInfo.prePntDcAmt > 0}">
-												<dt>선포인트 할인</dt>
-												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.prePntDcAmt, 1, 'COMMA')}|"></em>P</dd>
-											</div>
-											<div class="include_item" th:if="${orderAmtInfo.pntDcAmt > 0}">
-												<dt>포인트 사용</dt>
-												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.pntDcAmt, 1, 'COMMA')}|"></em>P</dd>
-											</div>
-											<div class="include_item" th:if="${orderAmtInfo.gfcdUseAmt > 0}">
-												<dt>상품권 사용</dt>
-												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}|"></em>원</dd>
-											</div>
-											<div class="include_item" th:if="${paymentInfo.npayPntAmt > 0}">
-												<dt>마일리지 사용</dt>
-												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.npayPntAmt, 1, 'COMMA')}|"></em>원</dd>
-											</div>
-											<div class="include_item" th:if="${orderAmtInfo.pgCpnAmt > 0}">
-												<dt>제휴할인</dt>
-												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.pgCpnAmt, 1, 'COMMA')}|"></em>원</dd>
-											</div>
-										</dl>
-									</td>
-									<td>
-										<dl>
-											<div>
-												<dt>결제 금액</dt>
-												<dd>
-													<div class="price">
-														<span class="pay_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.payAmt - orderAmtInfo.npayPntAmt - orderAmtInfo.pgCpnAmt, 1, 'COMMA')}"></em>원</span>
-													</div>
-												</dd>
-											</div>
-											<div>
-												<dt class="sr-only">결제방법</dt>
-												<!-- TODO -->
-												<!-- Style24 간편결제 처리 (STYLE24 간편결제 : STYLE24 간편결제명 / 카드사명 / 할부개월(일시불)) -->
-												<dd th:if="${paymentInfo.pgGb == 'NAVER'}">네이버 페이</dd>
-												<dd th:if="${paymentInfo.pgGb == 'KAKAO'}">카카오 페이</dd>
-												<dd th:if="${paymentInfo.pgGb == 'PAYCO'}">PAYCO</dd>
-												<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_10'}">실시간계좌이체</dd>
-												<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_20'}">무통장입금</dd>
-												<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_30'}" th:text="|${paymentInfo.cardNm}/${paymentInfo.cardMips}|"></dd>
-												<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_60'}">휴대폰결제</dd>
-											</div>
-											<div>
-												<dt class="sr-only">영수증 확인</dt>
-												<dd>
-													<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_30'}" onclick="fnReceipt('card')"><span>신용카드 전표</span></button>
-													<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and not #strings.isEmpty(paymentInfo.cashAuthNo) and (paymentInfo.payMeans == 'G014_10' or paymentInfo.payMeans == 'G014_20')}" onclick="fnReceipt('cash')"><span>현금 영수증</span></button>
-													<button type="button" class="btn btn_default btn_sm" th:if="${orderAmtInfo.gfcdUseAmt > 0 and (cashReceiptsInfo == null or #strings.isEmpty(cashReceiptsInfo.authNo))}" th:attr="ordNo=${ordNo}" onclick="fnRequestCashReceipt(this);"><span>상품권 현금 영수증 신청</span></button>
-												</dd>
-											</div>
-										</dl>
-										<dl>
-											<div>
-												<dt>적립 예정 포인트</dt>
-												<dd>
-													<span class="save_point"><em th:text="|${#numbers.formatInteger(orderAmtInfo.savePntAmt, 1, 'COMMA')}P|"></em></span>
-												</dd>
-											</div>
-										</dl>
-									</td>
-								</tr>
+								<tbody>
+									<tr>
+										<td>
+											<dl>
+												<div>
+													<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>
+														</div>
+													</dd>
+												</div>
+												<div class="include_item" th:if="${orderAmtInfo.cpn1DcAmt > 0}"> <!-- 할인항목 표기 class명 include_item -->
+													<dt>즉시할인</dt>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cpn1DcAmt, 1, 'COMMA')}|"></em>원</dd>
+												</div>
+												<div class="include_item" th:if="${orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt > 0}">
+													<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}">
+													<dt>쿠폰할인</dt>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt + orderAmtInfo.delvCpnDcAmt, 1, 'COMMA')}|"></em>원</dd>
+												</div>
+												<div class="include_item" th:if="${orderAmtInfo.prePntDcAmt > 0}">
+													<dt>선포인트 할인</dt>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.prePntDcAmt, 1, 'COMMA')}|"></em>P</dd>
+												</div>
+												<div class="include_item" th:if="${orderAmtInfo.pntDcAmt > 0}">
+													<dt>포인트 사용</dt>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.pntDcAmt, 1, 'COMMA')}|"></em>P</dd>
+												</div>
+												<div class="include_item" th:if="${orderAmtInfo.gfcdUseAmt > 0}">
+													<dt>상품권 사용</dt>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}|"></em>원</dd>
+												</div>
+												<div class="include_item" th:if="${paymentInfo.npayPntAmt > 0}">
+													<dt>마일리지 사용</dt>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.npayPntAmt, 1, 'COMMA')}|"></em>원</dd>
+												</div>
+												<div class="include_item" th:if="${orderAmtInfo.pgCpnAmt > 0}">
+													<dt>제휴할인</dt>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.pgCpnAmt, 1, 'COMMA')}|"></em>원</dd>
+												</div>
+											</dl>
+										</td>
+										<td>
+											<dl>
+												<div>
+													<dt>결제 금액</dt>
+													<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>
+												<div>
+													<dt class="sr-only">결제방법</dt>
+													<!-- TODO -->
+													<!-- Style24 간편결제 처리 (STYLE24 간편결제 : STYLE24 간편결제명 / 카드사명 / 할부개월(일시불)) -->
+													<dd th:if="${paymentInfo.pgGb == 'NAVER'}">네이버 페이</dd>
+													<dd th:if="${paymentInfo.pgGb == 'KAKAO'}">카카오 페이</dd>
+													<dd th:if="${paymentInfo.pgGb == 'PAYCO'}">PAYCO</dd>
+													<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_10'}">실시간계좌이체</dd>
+													<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_20'}">무통장입금</dd>
+													<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_30'}" th:text="|${paymentInfo.cardNm}/${paymentInfo.cardMips}|"></dd>
+													<dd th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_60'}">휴대폰결제</dd>
+												</div>
+												<div>
+													<dt class="sr-only">영수증 확인</dt>
+													<dd>
+														<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and paymentInfo.payMeans == 'G014_30'}" onclick="fnReceipt('card')"><span>신용카드 전표</span></button>
+														<button type="button" class="btn btn_default btn_sm" th:if="${paymentInfo.pgGb == 'KCP' and not #strings.isEmpty(paymentInfo.cashAuthNo) and (paymentInfo.payMeans == 'G014_10' or paymentInfo.payMeans == 'G014_20')}" onclick="fnReceipt('cash')"><span>현금 영수증</span></button>
+														<button type="button" class="btn btn_default btn_sm" th:if="${orderAmtInfo.gfcdUseAmt > 0 and (cashReceiptsInfo == null or #strings.isEmpty(cashReceiptsInfo.authNo))}" th:attr="ordNo=${ordNo}" onclick="fnRequestCashReceipt(this);"><span>상품권 현금 영수증 신청</span></button>
+													</dd>
+												</div>
+											</dl>
+											<dl>
+												<div>
+													<dt>적립 예정 포인트</dt>
+													<dd>
+														<span class="save_point"><em th:text="|${#numbers.formatInteger(orderAmtInfo.savePntAmt, 1, 'COMMA')}P|"></em></span>
+													</dd>
+												</div>
+											</dl>
+										</td>
+									</tr>
 								</tbody>
 							</table>
 							<p class="t_help">※ NPAY등의 대체결제수단으로 결제 시 해당 결제 플랫폼에서 영수증 확인이 가능합니다.</p>

+ 1 - 1
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.realDelvAmt, 1, 'COMMA')}"></em>원</span>
+															<span class="order_total_price"><em th:text="${#numbers.formatInteger((orderAmtInfo.ordAmt + orderAmtInfo.cpn1DcAmt) - orderAmtInfo.cnclRtnAmt + orderAmtInfo.delvFee, 1, 'COMMA')}"></em>원</span>
 														</div>
 													</dd>
 												</div>