마이페이지 배송지, 회수지 팝업 처리

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

@@ -28,6 +28,7 @@ import com.style24.core.biz.service.TscOrderService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.biz.service.TsfCartService;
+import com.style24.front.biz.service.TsfCommonService;
 import com.style24.front.biz.service.TsfCouponService;
 import com.style24.front.biz.service.TsfCustomerService;
 import com.style24.front.biz.service.TsfGiftcardService;
@@ -119,6 +120,9 @@ public class TsfMypageController extends TsfBaseController {
 	
 	@Autowired
 	private TsfCartService cartService;
+	
+	@Autowired
+	private TsfCommonService commonService;
 
 	/**
 	 * 마이페이지 메인 화면
@@ -193,6 +197,9 @@ public class TsfMypageController extends TsfBaseController {
 
 		mav.addObject("customerInfo", customer);
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		// 주문번호 설정
 		mav.addObject("ordNo", ordNo);
 
@@ -209,7 +216,7 @@ public class TsfMypageController extends TsfBaseController {
 		}
 
 		mav.addObject("orderList", orderList);
-
+		mav.addObject("oneData", orderList.iterator().next().get("oneData"));
 		mav.addObject("allCanYn", orderList.iterator().next().get("allCanYn"));
 
 		// 주문정보 조회
@@ -355,7 +362,10 @@ public class TsfMypageController extends TsfBaseController {
 
 		mav.addObject("customerInfo", customer);
 
-		// 반품 가능 리스트 조회
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
+		// 교환 가능 리스트 조회
 		GagaMap map = orderChangeService.getReturnListForMypage(order);
 		Order oneData = (Order) map.get("oneData");
 		mav.addObject("exchangeList", map);
@@ -515,6 +525,9 @@ public class TsfMypageController extends TsfBaseController {
 
 		mav.addObject("customerInfo", customer);
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		// 반품 가능 리스트 조회
 		GagaMap map = orderChangeService.getReturnListForMypage(order);
 		Order oneData = (Order) map.get("oneData");
@@ -811,6 +824,65 @@ public class TsfMypageController extends TsfBaseController {
 		return coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
 	}
 
+	/**
+	 * 마이페이지 배송지 정보 수정
+	 * 
+	 * @param Order
+	 * @return GagaMap
+	 * @author card007
+	 * @since 2021. 04. 04
+	 */
+	@PostMapping("/change/delvery/addr")
+	@ResponseBody
+	public GagaMap changeDelveryAddr(@RequestBody Order order) {
+		GagaMap result = new GagaMap();
+
+		try {
+			commonService.updateDeliverAddr(order);
+			commonService.updateDeliverAddrDelvMemo(order);
+		} catch (Exception e) {
+			result.set("status", GagaResponseStatus.FAIL.getCode());
+			result.set("message", "배송지 수정에 실패했습니다.");
+		}
+		
+		result.set("status", GagaResponseStatus.SUCCESS.getCode());
+		result.set("message", "정상적으로 배송지가 수정되었습니다.");
+		
+		return result;
+	}
+
+	/**
+	 * 마이페이지 배송 메모 수정
+	 *
+	 * @param Order
+	 * @return GagaMap
+	 * @author card007
+	 * @since 2021. 04. 04
+	 */
+	@PostMapping("/change/delvery/memo")
+	@ResponseBody
+	public GagaMap changeDelveryAddrDelvMemo(@RequestBody Order order) {
+		GagaMap result = new GagaMap();
+
+		if (TsfSession.isLogin()) {
+			order.setCustNo(TsfSession.getInfo().getCustNo());
+		} else {
+			order.setCustNo(0);
+		}
+
+		try {
+			commonService.updateDeliverAddrDelvMemo(order);
+		} catch (Exception e) {
+			result.set("status", GagaResponseStatus.FAIL.getCode());
+			result.set("message", "배송메모 수정에 실패했습니다.");
+		}
+
+		result.set("status", GagaResponseStatus.SUCCESS.getCode());
+		result.set("message", "정상적으로 배송메모가 수정되었습니다.");
+
+		return result;
+	}
+
 	/**
 	 * 위시리스트 등록처리
 	 *
@@ -1314,11 +1386,17 @@ public class TsfMypageController extends TsfBaseController {
 	 */
 	@RequestMapping("/account/check")
 	@ResponseBody
-	public GagaMap getAccountCheck(CustAccount custAccount) throws Exception {
+	public GagaMap getAccountCheck(@RequestBody CustAccount custAccount) throws Exception {
 		custAccount.setIpAddress(TsfSession.getIpAddress());
 
 		GagaMap result = coreCustomerService.checkAccount(custAccount);
-		log.info("result >>> {}", result);
+		
+		if("0000".equals(result.get("recCd"))) {
+			result.set("status", GagaResponseStatus.SUCCESS.getCode());
+			result.set("isValid", true);
+		} else {
+			throw new IllegalStateException(message.getMessage("FAIL_0004"));
+		}
 
 		return result;
 	}

src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -66,6 +66,7 @@
 		     , Z.BANK_CD
 		     , Z.ACCOUNT_NO
 		     , Z.ACCOUNT_NM
+		     , Z.DELV_ADDR_SQ
 		  FROM (SELECT O.ORD_NO
 					 , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
 					 , CASE OD.GIFT_PACK_YN WHEN 'Y' THEN DATE_FORMAT(O.ORD_DT + INTERVAL 3 DAY, '%Y.%m.%d')
@@ -121,6 +122,7 @@
 					 , CA.BANK_CD
 					 , CA.ACCOUNT_NO
 					 , CA.ACCOUNT_NM
+					 , DA.DELV_ADDR_SQ
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
 				    ON O.ORD_NO = OD.ORD_NO
@@ -197,7 +199,7 @@
 				, Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM, Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT
 				, Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.SHIP_COMP_CD, Z.GIFT_PACK_YN, Z.SHIP_COMP_NM, Z.INVOICE_NO
 				, Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.ORD_DTL_STAT_NM, Z.REVIEW_SQ
-				, Z.REVIEWABLE_YN, Z.PURCHASE_CONFIRM_DAY, Z.DELV_RES_DT, Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.BANK_CD, Z.ACCOUNT_NO, Z.ACCOUNT_NM
+				, Z.REVIEWABLE_YN, Z.PURCHASE_CONFIRM_DAY, Z.DELV_RES_DT, Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.BANK_CD, Z.ACCOUNT_NO, Z.ACCOUNT_NM, Z.DELV_ADDR_SQ
 		ORDER BY Z.ORD_NO DESC, Z.ORD_DTL_STAT, Z.SELF_GOODS_YN DESC, Z.SHOT_DELV_YN DESC, Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD
 	</select>
 

src/main/webapp/WEB-INF/views/web/common/layout/MypageLayoutWeb.html

@@ -36,47 +36,6 @@
 <!-- Footer -->
 <footer id="footer" th:replace="~{web/common/fragments/FooterWeb :: footer}"></footer>
 
-<!---------------------------------------- 팝업영역 -------------------------------->
-<!-- 배송지변경 팝업 -->
-<div class="modal fade adrsChange_pop" id="adrsChangePop" tabindex="-1" role="dialog" aria-labelledby="adrsChangeLabel" aria-hidden="true">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<!-- 배송지변경 팝업 내용 -->
-		</div>
-	</div>
-	<a href="#close-modal" rel="modal:close" id="adrsChangePop_close" class="close-modal">Close</a>
-</div>
-<!-- //배송지변경 팝업 -->
-<!-- 배송지추가 팝업 -->
-<div class="modal fade adrsAdd_pop" id="adrsAddPop" tabindex="-1" role="dialog" aria-labelledby="adrsAddLabel" aria-hidden="true">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<!-- 배송지추가 팝업 내용 -->
-		</div>
-	</div>
-	<a href="#close-modal" rel="modal:close" id="adrsAddPop_close" class="close-modal">Close</a>
-</div>
-<!-- //배송지추가 팝업 -->
-<!-- 배송지수정 팝업 -->
-<div class="modal fade adrsModify_pop" id="adrsModifyPop" tabindex="-1" role="dialog" aria-labelledby="adrsModifyLabel" aria-hidden="true">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<!-- 배송지수정 팝업 내용 -->
-		</div>
-	</div>
-	<a href="#close-modal" rel="modal:close" id="adrsModifyPop_close" class="close-modal">Close</a>
-</div>
-<!-- //배송지수정 팝업 -->
-<!-- 배송요청사항수정 팝업 -->
-<div class="modal fade rqstModify_pop" id="rqstModifyPop" tabindex="-1" role="dialog" aria-labelledby="rqstModifyLabel" aria-hidden="true">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<!-- 배송요청사항수정 팝업 내용 -->
-		</div>
-	</div>
-	<a href="#close-modal" rel="modal:close" id="rqstModifyPop_close" class="close-modal">Close</a>
-</div>
-<!-- //배송요청사항수정 팝업 -->
 <!--교환상품 옵션변경 팝업 -->
 <div class="modal fade exchange_pop" id="exchangePop" tabindex="-1" role="dialog" aria-labelledby="exchangeLabel" aria-hidden="true">
 	<div class="modal-dialog" role="document">

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

@@ -353,13 +353,18 @@
 			return;
 		}
 		let custInfo = {};
+		custInfo.accountNm = $('input[name=accountNm]').val();
+		custInfo.accountNo = $('input[name=accountNo]').val();
+		custInfo.bankCd = $('input[name=bankCd]').val();
 		let jsonData = JSON.stringify(custInfo)
+		console.log(jsonData);
 		gagajf.ajaxJsonSubmit('/mypage/account/check', jsonData, fnAccountCheckCallback);
 		//ajaxSubmit('/mypage/account/check','html','accountHolder')
 	});
 
 	// 계좌인증 콜백
 	var fnAccountCheckCallback = function (result) {
+		console.log(result);
 		let msg = '계좌인증에 성공했습니다.'
 		if (result.isValid) { // 유효하면 true
 			accountCheck = true;

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

@@ -190,14 +190,14 @@
 									</tr>
 									<tr>
 										<th>주소</th>
-										<td>
-											<th:block  th:id="chgerAddr" th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
+										<td id="chgerAddr">
+											<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
 											<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr('chger');"><span>회수지 변경</span></button>
 										</td>
-										<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.chgerZipcode}">
+										<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
 										<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
 										<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-										<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.chgerRtnMemo}">
+										<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 									</tr>
 								</tbody>
 							</table>
@@ -252,14 +252,14 @@
 										<div class="block_line">
 											<ul>
 												<li>
-													<span th:text="${deliveryAddrInfo.recipNm}"></span>
+													<span id="recipNm" th:text="${deliveryAddrInfo.recipNm}"></span>
 												</li>
 												<li>
-													<span th:text="${deliveryAddrInfo.recipPhnno}"></span>
+													<span id="recipPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></span>
 												</li>
 												<li>
-													<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></span>
-													<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr()"><span>배송지 변경</span></button>
+													<span id="recipAddr" th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></span>
+													<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr('recip')"><span>배송지 변경</span></button>
 												</li>
 												<li>
 													배송요청 사항&nbsp;:&nbsp;<span id="delvMemo" th:text="${deliveryAddrInfo.delvMemo}"></span>
@@ -268,6 +268,12 @@
 											</ul>
 										</div>
 									</td>
+									<input type="hidden" name="recipNm" th:value="${deliveryAddrInfo.recipNm}">
+									<input type="hidden" name="recipPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
+									<input type="hidden" name="recipZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
+									<input type="hidden" name="recipBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+									<input type="hidden" name="recipDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+									<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
 								</tr>
 							</tbody>
 						</table>
@@ -289,6 +295,9 @@
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
+	var isLogin = [[${isLogin}]];
+	let addrGb = '';
+
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정
 		fnSetMypageLnbList(2);
@@ -351,18 +360,7 @@
 		let chgOptionList = [];
 		let chgOptDisp = [];
 		$.each(param, function(idx, item) {
-			ordDtlNo = item.ordDtlNo;
-
-			//let chgOption = {};
-			//chgOption.ordDtlItemSq = item.ordDtlItemSq;
-			//chgOption.chgQty = item.chgQty;
-			//chgOption.itemNm = item.itemNm;
-			//chgOption.optCd1 = item.optCd1;
-			//chgOption.chgOptCd2Arr = item.chgOptCd2Arr;
-			//
-			//chgOptionList.push(chgOption);
 			chgOptionList.push(item);
-			
 			chgOptDisp.push(item.chgOptCd2Arr);
 		});
 
@@ -384,7 +382,6 @@
 				}
 			});
 		});
-		console.log(html);
 
 		$.each($('.exchangeOption'), function(idx, item) {
 			if (ordDtlNo == $(item).attr('ordDtlNo')) {
@@ -455,6 +452,51 @@
 			$(param).parent().parent().find('input[name=chgQty]').val($(param).attr('qty'));
 		}
 	}
+
+	// 배송지 정보 설정
+	var delvAddrSet = function(delvObj) {
+		let recipNm = delvObj.recipNm;
+		let recipPhnno = delvObj.recipPhnno;
+		let recipZipcode = delvObj.recipZipcode;
+		let recipBaseAddr = delvObj.recipBaseAddr;
+		let recipDtlAddr = delvObj.recipDtlAddr;
+		let delvMemo = delvObj.delvMemo;
+		
+		if (addrGb == 'recip') {
+			$('#recipNm').text(recipNm);
+			$('#recipPhnno').text(recipPhnno);
+			$('#recipAddr').text(recipBaseAddr + ' ' + recipDtlAddr);
+			$('#delvMemo').text(delvMemo);
+			
+			$('input[name=recipNm]').val(recipNm);
+			$('input[name=recipPhnno]').val(recipPhnno);
+			$('input[name=recipZipcode]').val(recipZipcode);
+			$('input[name=recipBaseAddr]').val(recipBaseAddr);
+			$('input[name=recipDtlAddr]').val(recipDtlAddr);
+			$('input[name=delvMemo]').val(delvMemo);
+		} else {
+			let chgerAddr = chgerBaseAddr + ' ' + chgerDtlAddr + '\n';
+			chgerAddr += '<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr(\'chger\');"><span>회수지 변경</span></button>';
+			
+			$('input[name=chgerNm]').val(recipNm);
+			$('input[name=chgerPhnno]').val(recipPhnno);
+			$('input[name=chgerZipcode]').val(recipZipcode);
+			$('input[name=chgerBaseAddr]').val(recipBaseAddr);
+			$('input[name=chgerDtlAddr]').val(recipDtlAddr);
+			$('input[name=chgerRtnMemo]').val(delvMemo);
+			
+			$('#chgerNm').text(chgerNm);
+			$('#chgerPhnno').text(chgerPhnno);
+			$('#chgerAddr').html(chgerAddr);
+		}
+	}
+
+	// 배송메모 설정
+	var delvMemoSet = function(delvMemoObj) {
+		let delvMemo = delvMemoObj.delvMemo;
+		$('input[name=delvMemo]').val(delvMemo);
+		$("#delvMemo").text(delvMemo);
+	}
 </script>
 
 </th:block>

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

@@ -306,13 +306,13 @@
 										<div class="block_line">
 											<ul>
 												<li>
-													<span th:text="${deliveryAddrInfo.recipNm}"></span>
+													<span th:text="${deliveryAddrInfo.recipNm}" id="recipNm"></span>
 												</li>
 												<li>
-													<span th:text="${deliveryAddrInfo.recipPhnno}"></span>
+													<span th:text="${deliveryAddrInfo.recipPhnno}" id="recipPhnno"></span>
 												</li>
 												<li>
-													<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></span>
+													<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|" id="recipAddr"></span>
 													<button type="button" class="btn btn_default btn_sm" th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryAddr()"><span>배송지 변경</span></button>
 												</li>
 												<li>
@@ -446,7 +446,9 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
 	let orderList = [[${orderList}]];
+	let oneData = [[${oneData}]];
 	let paymentInfo = [[${paymentInfo}]];
 	let orderAmtInfo = [[${orderAmtInfo}]];
 	let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
@@ -513,6 +515,54 @@
 			}
 		});
 	}
+
+	// 배송지 정보 설정
+	var delvAddrSet = function(delvObj) {
+		let custDelvAddrSq = delvObj.custDelvAddrSq;
+		let recipNm = delvObj.recipNm;
+		let recipPhnno = delvObj.recipPhnno;
+		let recipZipcode = delvObj.recipZipcode;
+		let recipBaseAddr = delvObj.recipBaseAddr;
+		let recipDtlAddr = delvObj.recipDtlAddr;
+		let delvMemo = delvObj.delvMemo;
+		
+		$('#recipNm').text(recipNm);
+		$('#recipPhnno').text(recipPhnno);
+		$('#recipAddr').text(recipBaseAddr + ' ' + recipDtlAddr);
+		$('#delvMemo').text(delvMemo);
+		
+		let url = '/mypage/change/delvery/addr';
+		let data = {};
+		data.custDelvAddrSq = custDelvAddrSq;
+		data.recipNm = recipNm;
+		data.recipPhnno = recipPhnno;
+		data.recipZipcode = recipZipcode;
+		data.recipBaseAddr = recipBaseAddr;
+		data.recipDtlAddr = recipDtlAddr;
+		data.delvMemo = delvMemo;
+		
+		let jsonData = JSON.stringify(data);
+		
+		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+		})
+	}
+	
+	// 배송메모 설정
+	var delvMemoSet = function(delvMemoObj) {
+		let url = '/mypage/change/delvery/memo';
+		let delvMemo = delvMemoObj.delvMemo;
+
+		let data = {};
+		data.delvMemo = delvMemo;
+		data.delvAddrSq = oneData.delvAddrSq;
+
+		let jsonData = JSON.stringify(data);
+
+		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+		})
+
+		$("#delvMemo").text(delvMemo);
+	}
 </script>
 
 </th:block>

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

@@ -191,8 +191,8 @@
 									</tr>
 									<tr>
 										<th>주소</th>
-										<td>
-											<th:block  th:id="chgerAddr" th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
+										<td id="chgerAddr">
+											<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
 											<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr('chger');"><span>회수지 변경</span></button>
 										</td>
 										<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.chgerZipcode}">
@@ -328,6 +328,7 @@
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
+	var isLogin = [[${isLogin}]];
 	let returnList = [[${returnList.returnList}]];
 	let oneData = [[${oneData}]];
 	let paymentInfo = [[${paymentInfo}]];
@@ -602,6 +603,28 @@
 
 		return refundGiftCard;
 	}
+
+	// 회수지 정보 설정
+	var delvAddrSet = function(delvObj) {
+		let chgerNm = delvObj.recipNm;
+		let chgerPhnno = delvObj.recipPhnno;
+		let chgerZipcode = delvObj.recipZipcode;
+		let chgerBaseAddr = delvObj.recipBaseAddr;
+		let chgerDtlAddr = delvObj.recipDtlAddr;
+		let delvMemo = delvObj.delvMemo;
+		let chgerAddr = chgerBaseAddr + ' ' + chgerDtlAddr + '\n';
+		chgerAddr += '<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr(\'chger\');"><span>회수지 변경</span></button>';
+
+		$('input[name=chgerNm]').val(chgerNm);
+		$('input[name=chgerPhnno]').val(chgerPhnno);
+		$('input[name=chgerZipcode]').val(chgerZipcode);
+		$('input[name=chgerBaseAddr]').val(chgerBaseAddr);
+		$('input[name=chgerDtlAddr]').val(chgerDtlAddr);
+		
+		$('#chgerNm').text(chgerNm);
+		$('#chgerPhnno').text(chgerPhnno);
+		$('#chgerAddr').html(chgerAddr);
+	}
 </script>
 
 </th:block>

src/main/webapp/biz/mypage.js

@@ -199,79 +199,111 @@ var fnDeleteOrder = function() {
 
 // 회수지, 교환지, 배송지 설정 팝업
 var fnChangeDeliveryAddr = function(param) {
-	// TODO
-	// 회수지, 교환지, 배송지 설정 팝업
 	let data = {};
-	
+
 	let jsonData = JSON.stringify(data);
-	
-	$.ajax( {
-		type		: "POST",
-		url 		: '/order/delvAddrChangePop',
-		data		: JSON.stringify(jsonData),
-		dataType 	: 'html',
-		beforeSend : function(xhr, settings) {
-			xhr.setRequestHeader("AJAX"			, "true");
-			xhr.setRequestHeader('Accept'		, 'application/json');
-			xhr.setRequestHeader('Content-Type'	, 'application/json');
-			gagajf.showProgressbar(true);
-		},
-		success 	: function(result) {
-			$("#adrsAddPop .modal-dialog .modal-content").html(result);
-			$("#adrsAddPop").modal("show");
-		}
-	});
+
+	// 회원인경우
+	if (isLogin == true) {
+		$.ajax( {
+			type		: "POST",
+			url 		: '/common/delvAddrChangePop',
+			data		: JSON.stringify(jsonData),
+			dataType 	: 'html',
+			beforeSend : function(xhr, settings) {
+				xhr.setRequestHeader("AJAX"			, "true");
+				xhr.setRequestHeader('Accept'		, 'application/json');
+				xhr.setRequestHeader('Content-Type'	, 'application/json');
+				gagajf.showProgressbar(true);
+			},
+			success 	: function(result) {
+				$("#adrsChangePop .modal-dialog .modal-content").html(result);
+				$("#adrsChangePop").modal("show");
+			}
+		});
+	}
+	// 비회원인경우
+	else {
+		$.ajax( {
+			type		: "POST",
+			url 		: '/common/delvAddrAddPop',
+			data		: JSON.stringify(jsonData),
+			dataType 	: 'html',
+			beforeSend : function(xhr, settings) {
+				xhr.setRequestHeader("AJAX"			, "true");
+				xhr.setRequestHeader('Accept'		, 'application/json');
+				xhr.setRequestHeader('Content-Type'	, 'application/json');
+				gagajf.showProgressbar(true);
+			},
+			success 	: function(result) {
+				$("#adrsAddPop .modal-dialog .modal-content").html(result);
+				$("#adrsAddPop").modal("show");
+			}
+		});
+	}
 }
 
 // 배송지추가 팝업열기
-$(document).on('click','#btn_addrAdd_pop',function(e){
-	$("#adrsAddPop").modal("show");
-	return false;
-});
+//$(document).on('click','#btn_addrAdd_pop',function(e){
+//	$("#adrsAddPop").modal("show");
+//	return false;
+//});
 
 // 배송지수정 팝업열기
-$(document).on('click','#btn_addrModify_pop',function(e){
-	$("#adrsModifyPop").modal("show");
-	return false;
-});
+//$(document).on('click','#btn_addrModify_pop',function(e){
+//	$("#adrsModifyPop").modal("show");
+//	return false;
+//});
 
 // 배송요청사항 팝업열기
-$("#btn_rqstModify_pop").on("click", function(e){
-	let data = {};
-	data.delvMemo = $("input[name='delvMemo']").val();
-
-	$.ajax({
-		type		: "POST",
-		url 		: "/order/delvMemoChangePop",
-		data		: data,
-		dataType 	: "html",
-		success 	: function(result) {
-			if (result != null) {
-				$("#rqstModifyPop .modal-dialog .modal-content").html(result);
-				$("#rqstModifyPop").modal("show");
-			}
-		}
-	});
-});
+//$("#btn_rqstModify_pop").on("click", function(e){
+//	let data = {};
+//	data.delvMemo = $("input[name='delvMemo']").val();
+//
+//	$.ajax({
+//		type		: "POST",
+//		url 		: "/common/delvMemoChangePop",
+//		data		: JSON.stringify(data),
+//		dataType 	: "html",
+//		beforeSend 	: function(xhr, settings) {
+//			xhr.setRequestHeader("AJAX"			, "true");
+//			xhr.setRequestHeader('Accept'		, 'application/json');
+//			xhr.setRequestHeader('Content-Type'	, 'application/json');
+//			gagajf.showProgressbar(true);
+//		},
+//		success 	: function(result) {
+//			if (result != null) {
+//				$("#rqstModifyPop .modal-dialog .modal-content").html(result);
+//				$("#rqstModifyPop").modal("show");
+//			}
+//		}
+//	});
+//});
 
 // 회수지, 교환지, 배송지 선택 처리
-var deliveryAddrInfoSet = function(temp) {
-	// TODO
-	// 배송지 변경 처리
-	
-}
+//var deliveryAddrInfoSet = function(temp) {
+//	// TODO
+//	// 배송지 변경 처리
+//	
+//}
 
 // 배송메모 설정 팝업
 var fnChangeDeliveryMemo = function() {
-	var jsonObj = {};
-	jsonObj.delvMemo = $("input[name='delvMemo']").val();
-	jsonObj.ordNo = ordNo;
+	var data = {};
+	data.delvMemo = $('input[name=delvMemo]').val();
+	data.ordNo = ordNo;
 	
 	$.ajax({
 		type		: "POST",
-		url 		: "/order/delvMemoChangePop",
-		data		: jsonObj,
+		url 		: "/common/delvMemoChangePop",
+		data		: JSON.stringify(data),
 		dataType 	: "html",
+		beforeSend 	: function(xhr, settings) {
+			xhr.setRequestHeader("AJAX"			, "true");
+			xhr.setRequestHeader('Accept'		, 'application/json');
+			xhr.setRequestHeader('Content-Type'	, 'application/json');
+			gagajf.showProgressbar(true);
+		},
 		success 	: function(result) {
 			if (result != null) {
 				$("#rqstModifyPop .modal-dialog .modal-content").html(result);
@@ -282,11 +314,11 @@ var fnChangeDeliveryMemo = function() {
 }
 
 // 배송메모 선택 처리
-var fnChangeDelvMemo = function(delvMemo) {
-	// TODO
-	// 배송메모 변경 처리
-	console.log(delvMemo);
-}
+//var fnChangeDelvMemo = function(delvMemo) {
+//	// TODO
+//	// 배송메모 변경 처리
+//	console.log(delvMemo);
+//}
 
 // 신용카드 전표 및 현금영수증 버튼 클릭 이벤트
 var fnReceipt = function(param) {