마이페이지 취교반 교환상세 임시 커밋

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -171,25 +171,26 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav = orderRefundService.cnclRtnRefundAmt(cnclReqList);
 		
 		// 3. 주문변경 기본정보 설정
-		mav.set("ordNo"			, cnclReq.getOrdNo());				// 주문번호
-		mav.set("ordChgSq"		, cnclReq.getOrdChgSq());			// 주문변경번호
-		mav.set("chgReason"		, cnclReq.getChgReason());			// 변경사유
-		mav.set("chgMemo"		, cnclReq.getChgMemo());			// 변경메모
+		mav.set("ordNo"					, cnclReq.getOrdNo());					// 주문번호
+		mav.set("ordChgSq"				, cnclReq.getOrdChgSq());				// 주문변경번호
+		mav.set("chgReason"				, cnclReq.getChgReason());				// 변경사유
+		mav.set("chgMemo"				, cnclReq.getChgMemo());				// 변경메모
 		
-		mav.set("accountNo"		, cnclReq.getAccountNo());			// 환불계좌번호
-		mav.set("accountNm"		, cnclReq.getAccountNm());			// 환불계좌예금주명
-		mav.set("bankCd"		, cnclReq.getBankCd());				// 환불계좌은행코드
+		mav.set("accountNo"				, cnclReq.getAccountNo());				// 환불계좌번호
+		mav.set("accountNm"				, cnclReq.getAccountNm());				// 환불계좌예금주명
+		mav.set("bankCd"				, cnclReq.getBankCd());					// 환불계좌은행코드
 		
-		mav.set("allCanYn"		, cnclReq.getAllCanYn());			// 무통장입금전 전체취소 여부
-		mav.set("isCustomer"	, cnclReq.getIsCustomer());			// 변경사유 (고객, 회사)
+		mav.set("allCanYnBeforePayment"	, cnclReq.getAllCanYnBeforePayment());	// 무통장입금전 전체취소 여부
+		mav.set("allCanYn"				, cnclReq.getAllCanYn());				// 전체취소 여부
+		mav.set("isCustomer"			, cnclReq.getIsCustomer());				// 변경사유 (고객, 회사)
 		
 		// 4. 주문변경 회수지정보 추가
-		mav.set("chgerNm"		, cnclReq.getChgerNm());			// 변경자명
-		mav.set("chgerEmail"	, cnclReq.getChgerEmail());			// 변경자이메일주소
-		mav.set("chgerPhnno"	, cnclReq.getChgerPhnno());			// 변경자핸드폰번호
-		mav.set("chgerTelno"	, cnclReq.getChgerTelno());			// 변경자전화번호
+		mav.set("chgerNm"				, cnclReq.getChgerNm());				// 변경자명
+		mav.set("chgerEmail"			, cnclReq.getChgerEmail());				// 변경자이메일주소
+		mav.set("chgerPhnno"			, cnclReq.getChgerPhnno());				// 변경자핸드폰번호
+		mav.set("chgerTelno"			, cnclReq.getChgerTelno());				// 변경자전화번호
 		
-		mav.set("reqGbn"		, cnclReq.getReqGbn());				// 신청구분
+		mav.set("reqGbn"				, cnclReq.getReqGbn());					// 신청구분
 				
 		// 5. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL)
 		orderChangeService.cnclComplete(mav, userNo);

src/main/webapp/WEB-INF/views/order/CnclReqForm.html

@@ -909,17 +909,18 @@ var fnChangeChgReason = function(reasonCd){
 
 // 취소신청/완료
 var fnCnclReq = function (reqGbn) {
-	var temp 		= false;
-	var ordDtlStat	= cancelRequestTargetList[0].ordDtlStat;
-	var allCanYn 	= "N";
+	var temp 					= false;
+	var ordDtlStat				= cancelRequestTargetList[0].ordDtlStat;
+	var allCanYn 				= "N";
+	var allCanYnBeforePayment	= "N";
 	
-	var accountNo 	= "";
-	var accountNm 	= "";
-	var bankCd 		= "";
+	var accountNo 				= "";
+	var accountNm 				= "";
+	var bankCd 					= "";
 	
 	if (reqGbn == "cnclReq" || reqGbn == "cnclComplete") {
 		// 1. 취소수량 체크
-		for (i=0 ; i<cancelRequestTargetList.length ; i++) {		
+		for (i=0 ; i<cancelRequestTargetList.length ; i++) {
 			if (cancelRequestTargetList[i].ordCanChgQty > 0) {
 				temp = true;
 			}
@@ -938,7 +939,11 @@ var fnCnclReq = function (reqGbn) {
 		
 		// 2.1 전체취소 여부 적용
 		if (ordDtlStat == "G013_10" && $("#spanPayAmt").text() == $("#spanRefundAmt").text()) {
-			allCanYn = "Y";	
+			if (ordDtlStat == "G013_10") {
+				allCanYnBeforePayment = "Y";
+			} else {
+				allCanYn = "Y";
+			}
 		}
 		
 		// 3. 취소사유 체크
@@ -997,24 +1002,25 @@ var fnCnclReq = function (reqGbn) {
 	}
 
 	var jsonObj = {
-		"ordNo"				: $('#cancelRequestFrm input[name=ordNo]').val()
-		,"chgReason" 		: $('#cancelRequestFrm input[name=chgReason]').val()
-		,"chgMemo"			: $('#chgMemo').val()
-		,"cancelReqList" 	: cancelRequestTargetList
-		,"accountNo" 		: accountNo
-		,"accountNm" 		: accountNm
-		,"bankCd" 			: bankCd
-		,"allCanYn" 		: allCanYn
-		,"isCustomer" 		: isCustomer
-		,"chgerNm"			: chgerNm
-		,"chgerEmail"		: chgerEmail
-		,"chgerZipcode"		: ""
-		,"chgerBaseAddr"	: ""
-		,"chgerDtlAddr"		: ""
-		,"chgerPhnno"		: chgerPhnno
-		,"chgerTelno"		: chgerTelno
-		,"reqGbn"			: reqGbn
-		,"ordChgSq"			: ordChgSq
+		"ordNo"						: $('#cancelRequestFrm input[name=ordNo]').val()
+		,"chgReason" 				: $('#cancelRequestFrm input[name=chgReason]').val()
+		,"chgMemo"					: $('#chgMemo').val()
+		,"cancelReqList" 			: cancelRequestTargetList
+		,"accountNo" 				: accountNo
+		,"accountNm" 				: accountNm
+		,"bankCd" 					: bankCd
+		,"allCanYn"					: allCanYn
+		,"allCanYnBeforePayment"	: allCanYnBeforePayment
+		,"isCustomer" 				: isCustomer
+		,"chgerNm"					: chgerNm
+		,"chgerEmail"				: chgerEmail
+		,"chgerZipcode"				: ""
+		,"chgerBaseAddr"			: ""
+		,"chgerDtlAddr"				: ""
+		,"chgerPhnno"				: chgerPhnno
+		,"chgerTelno"				: chgerTelno
+		,"reqGbn"					: reqGbn
+		,"ordChgSq"					: ordChgSq
 	}
 
 	// 주문번호, 취소사유, 취소메모, (취소, 반품, 교환 신청 정보 목록), 환불계좌