Merge branch 'develop' into bin2107

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

@@ -6,6 +6,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.gagaframework.web.parameter.GagaMap;
@@ -2292,8 +2295,6 @@ public class TsfMypageController extends TsfBaseController {
 			log.error(e.getMessage());
 		}
 
-		TsfSession.invalidate(request);
-
 		// RememberMe 쿠키가 있으면
 		String ckRememberMe = GagaCookieUtil.getCookie(request, TsfConstants.CK_PREFIX + "_remember-me");
 
@@ -2305,6 +2306,10 @@ public class TsfMypageController extends TsfBaseController {
 			GagaCookieUtil.deleteCookie(response, TsfConstants.CK_PREFIX + "_remember-me");
 		}
 
+		//sessionInfo
+		TsfSession.invalidate(request);
+		mav.addObject("sessionInfo", null);
+
 		mav.setViewName(super.getDeviceViewName("mypage/MypageCustSecedeCompleteForm"));
 
 		return mav;

src/main/webapp/WEB-INF/views/mob/customer/JoinFormMob.html

@@ -432,12 +432,13 @@
 			let msg = '';
 			if (result.custStat === 'G104_30') {
 				msg = "탈퇴한 회원입니다. 탈퇴 후 60일 동안 재가입이 불가능합니다.";
+				$dupPhnnoDiv.hide();
 			} else {
 				msg = result.maskingCustId+"로 가입된 이력이 있습니다.";
+				$dupPhnnoDiv.show();
 			}
-			$dupPhnno.html(msg);
 			$dupPhnno.show();
-			$dupPhnnoDiv.show();
+			$dupPhnno.html(msg);
 			authCheck = false;
 		} else {
 			$dupPhnno.hide();

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

@@ -102,7 +102,7 @@
 			<div class="goods_btn_wrap btn_group_flex">
 				<div>
 					<button type="button" id="btnConfirm" class="btn btn_dark" onclick="cfnGoToPage(_PAGE_MAIN);">
-						<span>확인</span>
+						<span>메인이동</span>
 					</button>
 				</div>
 			</div>

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

@@ -280,7 +280,7 @@
 		if (result.isMatch) {
 			$("#secedeCustForm").submit();
 		} else {
-			mcxDialog.alertC('비밀번호를 다시 입력해주세요.',{
+			mcxDialog.alertC('비밀번호를 다시 확인해주세요.',{
 				sureBtnText: "확인",
 				sureBtnClick: function() {
 					$('#secedeCustForm input[name=passwd]').focus();

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

@@ -465,10 +465,11 @@ var fnExchange = function() {
 	}
 
 	// 교환 필요 데이터 설정
+	let wdGb			= $('#exchangeForm input[name=wdGb]:radio:checked').val();
 	let data 			= {};
 	data.ordNo 			= oneData.ordNo;
 	data.isCustomer 	= isCustomer;
-	data.wdGb 			= $('#exchangeForm input[name=wdGb]:radio:checked').val();
+	data.wdGb 			= wdGb;
 	data.wdInvoiceNo 	= $('#exchangeForm input[name=wdInvoiceNo]').val();
 	data.recipNm 		= $('#exchangeForm input[name=recipNm]').val();
 	data.recipPhnno 	= $('#exchangeForm input[name=recipPhnno]').val();
@@ -479,14 +480,14 @@ var fnExchange = function() {
 	data.delvMemo 		= $('#exchangeForm input[name=delvMemo]').val();
 	data.chgReason 		= $('#exchangeForm input[name=chgReason]').val();
 	data.chgMemo 		= $('#exchangeForm textarea[name=chgMemo]').val();
-	data.chgerNm 		= $('#exchangeForm input[name=chgerNm]').val();
-	data.chgerPhnno 	= $('#exchangeForm input[name=chgerPhnno]').val();
-	data.chgerTelno 	= $('#exchangeForm input[name=chgerTelno]').val();
-	data.chgerEmail 	= $('#exchangeForm input[name=chgerEmail]').val();
-	data.chgerZipcode 	= $('#exchangeForm input[name=chgerZipcode]').val();
-	data.chgerBaseAddr 	= $('#exchangeForm input[name=chgerBaseAddr]').val();
-	data.chgerDtlAddr 	= $('#exchangeForm input[name=chgerDtlAddr]').val();
-	data.chgerRtnMemo 	= $('#exchangeForm input[name=chgerRtnMemo]').val();
+	data.chgerNm 		= wdGb == 'W' ? $('#exchangeForm input[name=chgerNm]').val() : '';
+	data.chgerPhnno 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerPhnno]').val() : '';
+	data.chgerTelno 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerTelno]').val() : '';
+	data.chgerEmail 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerEmail]').val() : '';
+	data.chgerZipcode 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerZipcode]').val() : '';
+	data.chgerBaseAddr 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerBaseAddr]').val() : '';
+	data.chgerDtlAddr 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerDtlAddr]').val() : '';
+	data.chgerRtnMemo 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerRtnMemo]').val() : '';
 	data.addPayCost 	= addPayCost;
 	data.addPayAmt 		= 0;
 	data.cancelReqList 	= cancelReqList;

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

@@ -577,6 +577,7 @@ var fnReturn = function() {
 
 	// 추가배송비 PG 처리
 	let addPayCost 			= $('#returnForm input[name=addPayCost]').val();
+	let wdGb				= $('#returnForm input[name=wdGb]:radio:checked').val();
 
 	let data 				= {};
 	data.ordNo 				= oneData.ordNo;
@@ -587,13 +588,13 @@ var fnReturn = function() {
 	data.accountNm 			= $('#returnForm input[name=accountNm]').val();
 	data.bankCd 			= $('#returnForm input[name=bankCd]').val();
 	data.isCustomer 		= isCustomer;
-	data.wdGb 				= $('#returnForm input[name=wdGb]:radio:checked').val();
-	data.chgerNm 			= $('#returnForm input[name=chgerNm]').val();
-	data.chgerZipcode 		= $('#returnForm input[name=chgerZipcode]').val();
-	data.chgerBaseAddr 		= $('#returnForm input[name=chgerBaseAddr]').val();
-	data.chgerDtlAddr 		= $('#returnForm input[name=chgerDtlAddr]').val();
-	data.chgerPhnno 		= $('#returnForm input[name=chgerPhnno]').val();
-	data.chgerRtnMemo 		= $('#returnForm input[name=chgerRtnMemo]').val();
+	data.wdGb 				= wdGb;
+	data.chgerNm 			= wdGb == 'W' ? $('#returnForm input[name=chgerNm]').val() : '';
+	data.chgerZipcode 		= wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+	data.chgerBaseAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+	data.chgerDtlAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+	data.chgerPhnno 		= wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+	data.chgerRtnMemo 		= wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
 	data.ordDtlNoArr 		= ordDtlNoArr;
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
 	data.addPayCost 		= addPayCost;

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

@@ -467,10 +467,11 @@ var fnExchange = function() {
 	}
 
 	// 교환 필요 데이터 설정
+	let wdGb			= $('#exchangeForm input[name=wdGb]:radio:checked').val();
 	let data 			= {};
 	data.ordNo 			= oneData.ordNo;
 	data.isCustomer 	= isCustomer;
-	data.wdGb 			= $('#exchangeForm input[name=wdGb]:radio:checked').val();
+	data.wdGb 			= wdGb;
 	data.wdInvoiceNo 	= $('#exchangeForm input[name=wdInvoiceNo]').val();
 	data.recipNm 		= $('#exchangeForm input[name=recipNm]').val();
 	data.recipPhnno 	= $('#exchangeForm input[name=recipPhnno]').val();
@@ -481,14 +482,14 @@ var fnExchange = function() {
 	data.delvMemo 		= $('#exchangeForm input[name=delvMemo]').val();
 	data.chgReason 		= $('#exchangeForm input[name=chgReason]').val();
 	data.chgMemo 		= $('#exchangeForm textarea[name=chgMemo]').val();
-	data.chgerNm 		= $('#exchangeForm input[name=chgerNm]').val();
-	data.chgerPhnno 	= $('#exchangeForm input[name=chgerPhnno]').val();
-	data.chgerTelno 	= $('#exchangeForm input[name=chgerTelno]').val();
-	data.chgerEmail 	= $('#exchangeForm input[name=chgerEmail]').val();
-	data.chgerZipcode 	= $('#exchangeForm input[name=chgerZipcode]').val();
-	data.chgerBaseAddr 	= $('#exchangeForm input[name=chgerBaseAddr]').val();
-	data.chgerDtlAddr 	= $('#exchangeForm input[name=chgerDtlAddr]').val();
-	data.chgerRtnMemo 	= $('#exchangeForm input[name=chgerRtnMemo]').val();
+	data.chgerNm 		= wdGb == 'W' ? $('#exchangeForm input[name=chgerNm]').val() : '';
+	data.chgerPhnno 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerPhnno]').val() : '';
+	data.chgerTelno 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerTelno]').val() : '';
+	data.chgerEmail 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerEmail]').val() : '';
+	data.chgerZipcode 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerZipcode]').val() : '';
+	data.chgerBaseAddr 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerBaseAddr]').val() : '';
+	data.chgerDtlAddr 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerDtlAddr]').val() : '';
+	data.chgerRtnMemo 	= wdGb == 'W' ? $('#exchangeForm input[name=chgerRtnMemo]').val() : '';
 	data.addPayCost 	= addPayCost;
 	data.addPayAmt 		= 0;
 	data.cancelReqList 	= cancelReqList;

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

@@ -582,6 +582,7 @@ var fnReturn = function() {
 
 	// 추가배송비 PG 처리
 	let addPayCost 			= $('#returnForm input[name=addPayCost]').val();
+	let wdGb				= $('#returnForm input[name=wdGb]:radio:checked').val();
 
 	let data 				= {};
 	data.ordNo 				= oneData.ordNo;
@@ -592,13 +593,13 @@ var fnReturn = function() {
 	data.accountNm 			= $('#returnForm input[name=accountNm]').val();
 	data.bankCd 			= $('#returnForm input[name=bankCd]').val();
 	data.isCustomer 		= isCustomer;
-	data.wdGb 				= $('#returnForm input[name=wdGb]:radio:checked').val();
-	data.chgerNm 			= $('#returnForm input[name=chgerNm]').val();
-	data.chgerZipcode 		= $('#returnForm input[name=chgerZipcode]').val();
-	data.chgerBaseAddr 		= $('#returnForm input[name=chgerBaseAddr]').val();
-	data.chgerDtlAddr 		= $('#returnForm input[name=chgerDtlAddr]').val();
-	data.chgerPhnno 		= $('#returnForm input[name=chgerPhnno]').val();
-	data.chgerRtnMemo 		= $('#returnForm input[name=chgerRtnMemo]').val();
+	data.wdGb 				= wdGb;
+	data.chgerNm 			= wdGb == 'W' ? $('#returnForm input[name=chgerNm]').val() : '';
+	data.chgerZipcode 		= wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+	data.chgerBaseAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+	data.chgerDtlAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+	data.chgerPhnno 		= wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+	data.chgerRtnMemo 		= wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
 	data.ordDtlNoArr 		= ordDtlNoArr;
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
 	data.addPayCost 		= addPayCost;

src/main/webapp/WEB-INF/views/web/customer/JoinFormWeb.html

@@ -401,12 +401,13 @@
 			let msg = '';
 			if (result.custStat === 'G104_30') {
 				msg = "탈퇴한 회원입니다. 탈퇴 후 60일 동안 재가입이 불가능합니다.";
+				$dupPhnnoDiv.hide();
 			} else {
 				msg = result.maskingCustId+"로 가입된 이력이 있습니다.";
+				$dupPhnnoDiv.show();
 			}
-			$dupPhnno.html(msg);
 			$dupPhnno.show();
-			$dupPhnnoDiv.show();
+			$dupPhnno.html(msg);
 			authCheck = false;
 		} else {
 			$dupPhnno.hide();

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

@@ -97,8 +97,8 @@
 					</div>
 				</div>
 				<div class="btn_footer_area">
-					<button type="button" id="btnConfirm" class="btn btn_dark btn_md hide" onclick="cfnGoToPage(_PAGE_MAIN);">
-						<span>확인</span>
+					<button type="button" id="btnConfirm" class="btn btn_dark btn_md" onclick="cfnGoToPage(_PAGE_MAIN);">
+						<span>메인이동</span>
 					</button>
 				</div>
 			</div>

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

@@ -269,7 +269,7 @@
 		if (result.isMatch) {
 			$("#secedeCustForm").submit();
 		} else {
-			mcxDialog.alertC('비밀번호를 다시 입력해주세요.',{
+			mcxDialog.alertC('비밀번호를 다시 확인해주세요.',{
 				sureBtnText: "확인",
 				sureBtnClick: function() {
 					$('#secedeCustForm input[name=passwd]').focus();

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

@@ -459,10 +459,11 @@
 		}
 
 		// 교환 필요 데이터 설정
+		let wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
 		let data = {};
 		data.ordNo = oneData.ordNo;
 		data.isCustomer = isCustomer;
-		data.wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
+		data.wdGb = wdGb;
 		data.wdInvoiceNo = $('#exchangeForm input[name=wdInvoiceNo]').val();
 		data.recipNm = $('#exchangeForm input[name=recipNm]').val();
 		data.recipPhnno = $('#exchangeForm input[name=recipPhnno]').val();
@@ -473,14 +474,14 @@
 		data.delvMemo = $('#exchangeForm input[name=delvMemo]').val();
 		data.chgReason = $('#exchangeForm input[name=chgReason]').val();
 		data.chgMemo = $('#exchangeForm textarea[name=chgMemo]').val();
-		data.chgerNm = $('#exchangeForm input[name=chgerNm]').val();
-		data.chgerPhnno = $('#exchangeForm input[name=chgerPhnno]').val();
-		data.chgerTelno = $('#exchangeForm input[name=chgerTelno]').val();
-		data.chgerEmail = $('#exchangeForm input[name=chgerEmail]').val();
-		data.chgerZipcode = $('#exchangeForm input[name=chgerZipcode]').val();
-		data.chgerBaseAddr = $('#exchangeForm input[name=chgerBaseAddr]').val();
-		data.chgerDtlAddr = $('#exchangeForm input[name=chgerDtlAddr]').val();
-		data.chgerRtnMemo = $('#exchangeForm input[name=chgerRtnMemo]').val();
+		data.chgerNm = wdGb == 'W' ? $('#exchangeForm input[name=chgerNm]').val() : '';
+		data.chgerPhnno = wdGb == 'W' ? $('#exchangeForm input[name=chgerPhnno]').val() : '';
+		data.chgerTelno = wdGb == 'W' ? $('#exchangeForm input[name=chgerTelno]').val() : '';
+		data.chgerEmail = wdGb == 'W' ? $('#exchangeForm input[name=chgerEmail]').val() : '';
+		data.chgerZipcode = wdGb == 'W' ? $('#exchangeForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr = wdGb == 'W' ? $('#exchangeForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr = wdGb == 'W' ? $('#exchangeForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerRtnMemo = wdGb == 'W' ? $('#exchangeForm input[name=chgerRtnMemo]').val() : '';
 		data.addPayCost = addPayCost;
 		data.addPayAmt = 0;
 		data.cancelReqList = cancelReqList;

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

@@ -431,6 +431,7 @@
 
 		// 추가배송비 PG 처리
 		let addPayCost = $('#returnForm input[name=addPayCost]').val();
+		let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
 
 		let data = {};
 		data.ordNo = oneData.ordNo;
@@ -441,13 +442,13 @@
 		data.accountNm = $('#returnForm input[name=accountNm]').val();
 		data.bankCd = $('#returnForm input[name=bankCd]').val();
 		data.isCustomer = isCustomer;
-		data.wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
-		data.chgerNm = $('#chgerNm').text();
-		data.chgerZipcode = $('#returnForm input[name=chgerZipcode]').val();
-		data.chgerBaseAddr = $('#returnForm input[name=chgerBaseAddr]').val();
-		data.chgerDtlAddr = $('#returnForm input[name=chgerDtlAddr]').val();
-		data.chgerPhnno = $('#returnForm input[name=chgerPhnno]').val();
-		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
+		data.wdGb = wdGb;
+		data.chgerNm = wdGb == 'W' ? $('#chgerNm').text() : '';
+		data.chgerZipcode = wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr = wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr = wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerPhnno = wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+		data.chgerRtnMemo = wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
 		data.ordDtlNoArr = ordDtlNoArr;
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
 		data.addPayCost = addPayCost;

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

@@ -457,12 +457,13 @@
 		}
 
 		// 교환 필요 데이터 설정
+		let wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
 		let data = {};
 		data.ordNo = oneData.ordNo;
 		data.ordNm = oneData.ordNm;
 		data.ordPhnno = oneData.ordPhnno;
 		data.isCustomer = isCustomer;
-		data.wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
+		data.wdGb = wdGb;
 		data.wdInvoiceNo = $('#exchangeForm input[name=wdInvoiceNo]').val();
 		data.recipNm = $('#exchangeForm input[name=recipNm]').val();
 		data.recipPhnno = $('#exchangeForm input[name=recipPhnno]').val();
@@ -473,14 +474,14 @@
 		data.delvMemo = $('#exchangeForm input[name=delvMemo]').val();
 		data.chgReason = $('#exchangeForm input[name=chgReason]').val();
 		data.chgMemo = $('#exchangeForm textarea[name=chgMemo]').val();
-		data.chgerNm = $('#exchangeForm input[name=chgerNm]').val();
-		data.chgerPhnno = $('#exchangeForm input[name=chgerPhnno]').val();
-		data.chgerTelno = $('#exchangeForm input[name=chgerTelno]').val();
-		data.chgerEmail = $('#exchangeForm input[name=chgerEmail]').val();
-		data.chgerZipcode = $('#exchangeForm input[name=chgerZipcode]').val();
-		data.chgerBaseAddr = $('#exchangeForm input[name=chgerBaseAddr]').val();
-		data.chgerDtlAddr = $('#exchangeForm input[name=chgerDtlAddr]').val();
-		data.chgerRtnMemo = $('#exchangeForm input[name=chgerRtnMemo]').val();
+		data.chgerNm = wdGb == 'W' ? $('#exchangeForm input[name=chgerNm]').val() : '';
+		data.chgerPhnno = wdGb == 'W' ? $('#exchangeForm input[name=chgerPhnno]').val() : '';
+		data.chgerTelno = wdGb == 'W' ? $('#exchangeForm input[name=chgerTelno]').val() : '';
+		data.chgerEmail = wdGb == 'W' ? $('#exchangeForm input[name=chgerEmail]').val() : '';
+		data.chgerZipcode = wdGb == 'W' ? $('#exchangeForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr = wdGb == 'W' ? $('#exchangeForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr = wdGb == 'W' ? $('#exchangeForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerRtnMemo = wdGb == 'W' ? $('#exchangeForm input[name=chgerRtnMemo]').val() : '';
 		data.addPayCost = addPayCost;
 		data.addPayAmt = 0;
 		data.cancelReqList = cancelReqList;

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

@@ -429,6 +429,7 @@
 
 		// 추가배송비 PG 처리
 		let addPayCost = $('#returnForm input[name=addPayCost]').val();
+		let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
 
 		let data = {};
 		data.ordNo = oneData.ordNo;
@@ -441,13 +442,13 @@
 		data.accountNm = $('#returnForm input[name=accountNm]').val();
 		data.bankCd = $('#returnForm input[name=bankCd]').val();
 		data.isCustomer = isCustomer;
-		data.wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
-		data.chgerNm = $('#chgerNm').text();
-		data.chgerZipcode = $('#returnForm input[name=chgerZipcode]').val();
-		data.chgerBaseAddr = $('#returnForm input[name=chgerBaseAddr]').val();
-		data.chgerDtlAddr = $('#returnForm input[name=chgerDtlAddr]').val();
-		data.chgerPhnno = $('#returnForm input[name=chgerPhnno]').val();
-		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
+		data.wdGb = wdGb;
+		data.chgerNm = wdGb == 'W' ? $('#chgerNm').text() : '';
+		data.chgerZipcode = wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr = wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr = wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerPhnno = wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+		data.chgerRtnMemo = wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
 		data.ordDtlNoArr = ordDtlNoArr;
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
 		data.addPayCost = addPayCost;