마이페이지 단테 수정 임시 커밋

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

@@ -1437,6 +1437,7 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("orderAddPayGoodsList"	, orderAddPayGoodsList);					// 주문목록정보
 		mav.addObject("ordNo"					, resultMap.get("ordNo"));					// 주문번호
 		mav.addObject("ordNm"					, resultMap.get("ordNm"));					// 주문자명
+		mav.addObject("ordPhnno"				, resultMap.get("ordPhnno"));				// 주문자핸드폰번호
 		mav.addObject("refundAmt"				, resultMap.get("refundAmt"));				// 상품환불금액
 		mav.addObject("addPayCost"				, resultMap.get("addPayCost"));				// 추가결제금액
 		mav.addObject("ordChgSq"				, resultMap.get("ordChgSq"));				// 주문취소신청번호
@@ -1474,8 +1475,8 @@ public class TsfOrderController extends TsfBaseController {
 		}
 		
 		order.setPayAmt(order.getAddPayCost());
-		order.setOrdNm(order.getChgerNm());
-		order.setOrdPhnno(order.getChgerPhnno());
+		// order.setOrdNm(order.getChgerNm());
+		// order.setOrdPhnno(order.getChgerPhnno());
 		
 		// 2. 결제정보설정
 		Payment payment = orderService.setPgDataInfo(order);
@@ -1535,6 +1536,8 @@ public class TsfOrderController extends TsfBaseController {
 		mav.addObject("ordChgSq", resultMap.get("ordChgSq"));					// 주문취소신청번호
 		mav.addObject("chgerNm", resultMap.get("chgerNm"));						// 변경신청인
 		mav.addObject("chgerPhnno", resultMap.get("chgerPhnno"));				// 변경신청핸드폰번호
+		mav.addObject("ordNm", resultMap.get("ordNm"));							// 주문자명
+		mav.addObject("ordPhnno", resultMap.get("ordPhnno"));					// 주문자핸드폰번호
 
 		// TODO 3. 주문정보 업데이트
 		coreOrderService.updateOrderChangeDetail(order);

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

@@ -347,6 +347,15 @@
 	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 	let oneData = [[${oneData}]];
 	let isLogin = [[${isLogin}]];
+	
+	// 추가배송비 전표 데이터 설정
+	let paymentInfo = {};
+	paymentInfo.pgTid = oneData.pgTid;
+	paymentInfo.ordChgSq = oneData.ordChgSq;
+
+	let orderAmtInfo = {};
+	orderAmtInfo.realOrdAmt = oneData.addPayCost;
+	orderAmtInfo.realDelvAmt = 0;
 
 	$(document).ready(function() {
 		// 타이틀명

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

@@ -333,6 +333,15 @@
 	let addrGb = '';
 	let memoGb = '';
 
+	// 추가배송비 전표 데이터 설정
+	let paymentInfo = {};
+	paymentInfo.pgTid = oneData.pgTid;
+	paymentInfo.ordChgSq = oneData.ordChgSq;
+
+	let orderAmtInfo = {};
+	orderAmtInfo.realOrdAmt = oneData.addPayCost;
+	orderAmtInfo.realDelvAmt = 0;
+
 	$(document).ready(function() {
 		// 타이틀명
 		$('#htopTitle').text('교환상세');

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

@@ -301,6 +301,8 @@
 	// 추가배송비 전표 데이터 설정
 	let paymentInfo = {};
 	paymentInfo.pgTid = oneData.pgTid;
+	paymentInfo.ordChgSq = oneData.ordChgSq;
+
 	let orderAmtInfo = {};
 	orderAmtInfo.realOrdAmt = oneData.addPayCost;
 	orderAmtInfo.realDelvAmt = 0;

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

@@ -298,6 +298,8 @@
 	// 추가배송비 전표 데이터 설정
 	let paymentInfo = {};
 	paymentInfo.pgTid = oneData.pgTid;
+	paymentInfo.ordChgSq = oneData.ordChgSq;
+
 	let orderAmtInfo = {};
 	orderAmtInfo.realOrdAmt = oneData.addPayCost;
 	orderAmtInfo.realDelvAmt = 0;

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

@@ -28,6 +28,7 @@
 	<input type="hidden" name="refundAmt" th:value="${refundAmt}">
 	<input type="hidden" name="ordNo" th:value="${ordNo}">
 	<input type="hidden" name="ordNm" th:value="${ordNm}">
+	<input type="hidden" name="ordPhnno" th:value="${ordPhnno}">
 	<input type="hidden" name="addPayCost" th:value="${addPayCost}">
 	<input type="hidden" name="ordChgSq" th:value="${ordChgSq}">
 	
@@ -239,6 +240,7 @@ $("#btn_payment").on("click", function(){
 		,"payMeans"				: payMeans // 네이버페이, 카카오페이
 		,"ordNo"				: $("#addPayForm input[name=ordNo]").val()
 		,"ordNm"				: $("#addPayForm input[name=ordNm]").val()
+		,"ordPhnno"				: $("#addPayForm input[name=ordPhnno]").val()
 		,"addPayCost"			: $("#addPayForm input[name=addPayCost]").val()
 		,"ordChgSq"				: $("#addPayForm input[name=ordChgSq]").val()
 		,"chgGb"				: $("#addPayForm input[name=chgGb]").val()

src/main/webapp/biz/mypage.js

@@ -362,10 +362,15 @@ var fnReceipt = function(param) {
 	let receiptWin = kcpReceiptUrl;
 	let option = '';
 	if (param == 'card') {
+		let order_no = ordNo;
+		if (!gagajf.isNull(paymentInfo.ordChgSq)) {
+			order_no = 'C' + paymentInfo.ordChgSq;
+		}
+		
 		// URL 설정
 		receiptWin += '?cmd=card_bill';
 		receiptWin += '&tno=' + paymentInfo.pgTid;
-		receiptWin += '&order_no=' + ordNo;
+		receiptWin += '&order_no=' + order_no;
 		receiptWin += '&trade_mony=' + (orderAmtInfo.realOrdAmt + orderAmtInfo.realDelvAmt);
 
 		// 팝업 크기 설정
@@ -403,7 +408,7 @@ var fnReceipt = function(param) {
 		// 팝업 크기 설정
 		option = 'width=455, height=815';
 	}
-
+console.log(receiptWin);
 	// 팝업 생성
 	window.open(receiptWin, "", option);
 }