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

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -456,6 +456,9 @@ public class TsfOrderService {
 				coreKakaoPayService.kakaoPayRollBack(payment);
 
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
+			} else {
+				// TODO
+				// 배송비 pay_sq update 처리
 			}
 		} catch(Exception e) {
 			e.printStackTrace();
@@ -494,6 +497,9 @@ public class TsfOrderService {
 				coreNaverPayService.naverPayRollBack(payment);
 
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
+			} else {
+				// TODO
+				// 배송비 pay_sq update 처리
 			}
 		} catch(Exception e) {
 			e.printStackTrace();

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

@@ -26,6 +26,7 @@ import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.service.TscCouponService;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscEnvsetService;
+import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.biz.service.TscKcpService;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
@@ -150,6 +151,9 @@ public class TsfMypageController extends TsfBaseController {
 	@Autowired
 	private TscEnvsetService eventService;
 
+	@Autowired
+	private TscKakaotalkService coreKakaotalkService;
+
 	/**
 	 * 마이페이지 메인 화면
 	 *
@@ -2446,7 +2450,7 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("orderList"		, 	orderList);
 		mav.addObject("orderListCnt"	, 	orderList.size());
 		mav.addObject("pageNo"			, 	order.getPageNo());
-		
+
 		mav.setViewName(super.getDeviceViewName("mypage/MypageOrderListInfo"));
 
 		return mav;
@@ -2490,7 +2494,7 @@ public class TsfMypageController extends TsfBaseController {
 	}
 
 	/**
-	 * 마이페이지 주문목록 사전 정보 조회 (모바일)
+	 * 마이페이지 취반교목록 사전 정보 조회 (모바일)
 	 *
 	 * @param Order
 	 * @return ModelAndView
@@ -2516,7 +2520,7 @@ public class TsfMypageController extends TsfBaseController {
 	}
 
 	/**
-	 * 마이페이지 주문목록 조회 (모바일)
+	 * 마이페이지 취반교목록 조회 (모바일)
 	 *
 	 * @param Order
 	 * @return ModelAndView
@@ -2542,4 +2546,33 @@ public class TsfMypageController extends TsfBaseController {
 		return mav;
 	}
 
+	/**
+	 * 선물하기 알림톡 재전송
+	 * 
+	 * @param order
+	 * @return GagaResponse
+	 * @author card007
+	 * @since 2021. 06. 03
+	 */
+	@ResponseBody
+	@PostMapping("/gift/kakao/resend")
+	public GagaResponse resendGiftKakao(@RequestBody Order order) {
+		// TODO
+		// 선물하기 알림톡 이전 발송이력 조회
+		
+		// 선물하기 알림톡 전송 관련 정보 조회
+		GagaMap resultMap = coreOrderService.getOrderCompleteInfo(order);
+		Order orderInfo = (Order) resultMap.get("orderInfo");
+		orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
+		orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
+		
+		try {
+			// 선물하기 알림톡 전송
+			coreKakaotalkService.sendOrderGiftComplete(orderInfo, TsfSession.getInfo().getCustNo());
+		} catch (Exception e) {
+			return super.error(e.getMessage());
+		}
+		
+		return super.ok();
+	}
 }

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

@@ -67,6 +67,7 @@
 		     , Z.ACCOUNT_NO
 		     , Z.ACCOUNT_NM
 		     , Z.DELV_ADDR_SQ
+		     , Z.RECIP_NM
 		     , Z.PAY_STAT
 		  FROM (SELECT O.ORD_NO
 					 , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
@@ -126,6 +127,7 @@
 					 , CA.ACCOUNT_NO
 					 , IFNULL(CA.ACCOUNT_NM, O.ORD_NM)                                  AS ACCOUNT_NM
 					 , DA.DELV_ADDR_SQ
+					 , DA.RECIP_NM
 					 , P.PAY_STAT
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
@@ -221,7 +223,8 @@
 				, 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.DELV_ADDR_SQ, Z.PAY_STAT
+				, 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, Z.RECIP_NM, Z.PAY_STAT
 		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, Z.PAY_STAT
 	</select>
 
@@ -449,10 +452,14 @@
 		 INNER JOIN TB_ORDER_DETAIL OD
 		    ON OD.DELV_ADDR_SQ = DA.DELV_ADDR_SQ
 		   AND OD.ORD_NO = #{ordNo}
-		   AND OD.ORD_EXCH_GB = 'O'
-		<if test="ordDtlNo != null and ordDtlNo != ''">
+		<choose>
+			<when test="ordDtlNo != null and ordDtlNo != ''">
 		   AND OD.ORD_DTL_NO = #{ordDtlNo}
-		</if>
+			</when>
+			<otherwise>
+		   AND OD.ORD_EXCH_GB = 'O'
+			</otherwise>
+		</choose>
 		<if test="supplyCompCd != null and supplyCompCd != ''">
 		   AND OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>

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

@@ -586,15 +586,22 @@ $('#btn_bank_return').click(function() {
 
 //팝업_닫기
 $('.popup_close').on("click",function(){
-	$('.popup_box').hide().removeClass('active');
-	$("body").css({"overflow":"visible"});
+	let id = $(this).parent().parent().attr('id');
+	$(this).parent().parent().hide().removeClass('active');
+	
+	if (id != 'refundBankPop') {
+		$("body").css({"overflow": "visible"});
+	}
 });
 </script>
 
 <script>
 // 버튼 색
 $(document).on('click','.popup_box .button_list button',function(){
-	$('.popup_box .button_list button').removeClass('on');
+	//$('.popup_box .button_list button').removeClass('on');
+	$.each($(this).parent().find('button'), function(idx, item) {
+		$(item).removeClass('on');
+	});
 	$(this).addClass('on');
 });
 
@@ -618,17 +625,6 @@ $(document).on("click","#refundAccountPop .select_bank",function(e){
 	$("body").css({"overflow":"hidden"});
 });
 
-//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
-$('.refundAccountPop .popup_close').on("click",function(){
-	$('.refundAccountPop').hide().removeClass('active');
-	$("body").css({"overflow":"visible"});
-});
-
-//210408_ 추가 : 은행선택 팝업 스크립트 닫기
-$('.refundBankPop .popup_close').on("click",function(){
-	$('.refundBankPop').hide().removeClass('active');
-});
-
 //210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
 $(document).on('click','.popup_box.refundBankPop .button_list button',function(){
 	let bankCd = $(this).attr('bankCd');
@@ -640,94 +636,6 @@ $(document).on('click','.popup_box.refundBankPop .button_list button',function()
 	$(this).parents('.popup_box.refundBankPop').hide().removeClass('active');
 	$("body").css({"overflow":"visible"});
 });
-
-
-$(document).ready(function(){
-	/*
-	// 세부 사유 글자 수 제한
-	$('.doc_return').keyup(function(e){
-		var content = $(this).val();
-		$('#return_cnt').html(content.length);
-		if (content.length > 200){
-			mcxDialog.alert("최대 200자까지 입력 가능합니다."); //210420_수정 : 시스템 alert -> dialog 변경.
-			$(this).val(content.substring(0, 200));
-			$('#return_cnt').html("200");
-		}
-	});
-
-	//210408_추가 : 스크립트 추가.
-	//반품회수방법 선택 스크립트 추가
-	$(document).on('change','.my_return .retrieve_method #rdi_retrieve_visit',function(e){
-		$('.my_return .retrieve_box.direct').hide();
-		$('.my_return .retrieve_box.visit').show();
-		return false;
-	}).on('change','.my_return .retrieve_method #rdi_retrieve_direct',function(e){
-		$('.my_return .retrieve_box.visit').hide();
-		$('.my_return .retrieve_box.direct').show();
-		return false;
-	});
-
-	//버튼 색
-	$(document).on('click','.popup_box .button_list button',function(){
-		$('.popup_box .button_list button').removeClass('on');
-		$(this).addClass('on');
-	});
-
-	// 반품 수량 선택 팝업
-	//$(document).on("click",".select_custom.select_count",function(e){
-		//$('#returnCountPop').show().addClass("active");
-		//$("body").css({"overflow":"hidden"});
-	//});
-
-	//반품 사유 선택 팝업
-	$(document).on("click",".select_custom.select_return",function(e){
-		$('#returnReasonPop').show().addClass("active");
-		$("body").css({"overflow":"hidden"});
-	});
-
-	//팝업_닫기
-	$('.popup_close').on("click",function(){
-		$('.popup_box').hide().removeClass('active');
-		$("body").css({"overflow":"visible"});
-	});
-
-	//배송지추가_팝업
-	$(document).on('click','#btn_adrsAdd_pop',function(e){
-		$("#adrsAddPop").modal("show");
-		return false;
-	});      
-	$("#adrsAddPop_close").click(function() {
-		$("#adrsAddPop").modal("hide");
-	});
-
-	//배송지정보_팝업
-	$(document).on('click','#btn_adrsChange_pop',function(e){
-		$("#adrsChangePop").modal("show");
-		return false;
-	});
-	$("#adrsChangePop_close").click(function() {
-		$("#adrsChangePop").modal("hide");
-	});
-
-	//배송지수정_팝업
-	$(document).on('click','#btn_addrModify_pop',function(e){
-		$("#adrsModifyPop").modal("show");
-		return false;
-	});
-	$("#adrsModifyPop_close").click(function() {
-		$("#adrsModifyPop").modal("hide");
-	});
-
-	$(document).on("click", "#btn_order_return", function(){
-		mcxDialog.alert("반품 신청이 접수되었습니다.", {
-				//alert("반품하실 상품의 수량을 선택해주세요.") : 클릭 시 반품 수량을 모두 0개로 선택한 경우
-				//alert("반품 사유를 선택해주세요.") : 반품 사유를 선택하지 않는 경우
-			sureBtnText: "확인",  // Confirmation button text
-		});
-	});
-	*/
-
-});
 </script>
 
 </th:block>

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

@@ -126,20 +126,47 @@
 									<span>결제하기</span>
 								</button>
 							</div>
+							<div th:if="${exchangeDtl.chgStat == 'G685_40' and exchangeDtl.chgOrdDtlStat == 'G013_50'}">
+								<button type="button" class="btn btn_default" th:attr="ordNo=${exchangeDtl.ordNo}, ordDtlNo=${exchangeDtl.ordDtlNo}, shipCompCd=${exchangeDtl.exchangeShipCompCd}, invoiceNo=${exchangeDtl.exchangeInvoiceNo}" onclick="fnGoToDelivery(this);">
+									<span>배송조회</span>
+								</button>
+							</div>
 							<div>
 								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
 									<span>1:1 문의</span>
 								</button>
 							</div>
 						</div>
-						<div class="goods_txt">
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_20'}">교환 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_31' and exchangeDtl.chgGb == 'G680_40'}">고객님이 교환하신 상품을 검수 중에 있습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_40' and (exchangeDtl.chgOrdDtlStat == 'G013_60' or exchangeDtl.chgOrdDtlStat == 'G013_70')}">교환이 완료되었습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_49'}">요청하신 교환을 취소하였습니다.</p>
-						</div>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_20'}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">교환 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_30'}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_31' and exchangeDtl.chgGb == 'G680_40'}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">고객님이 교환하신 상품을 검수 중에 있습니다.</p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_40' and (exchangeDtl.chgOrdDtlStat == 'G013_60' or exchangeDtl.chgOrdDtlStat == 'G013_70')}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">교환이 완료되었습니다.</p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_49'}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">요청하신 교환을 취소하였습니다.</p>
+							</div>
+						</th:block>
 					</div>
 				</th:block>
 			</div>

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

@@ -141,11 +141,15 @@
 							<!-- //결제하기 -->
 							<!-- 배송조회 -->
 							<th:block th:if="${cre.chgStat} == 'G685_40'">
-								<div>
-									<button type="button" class="btn btn_default" th:attr="ordNo=${cre.ordNo}, ordDtlNo=${cre.ordDtlNo}, shipCompCd=${cre.exchangeShipCompCd}, invoiceNo=${cre.exchangeInvoiceNo}" onclick="fnGoToDelivery(this);">
-										<span>배송조회</span>
-									</button>
-								</div>
+								<th:block th:each="exchange, index : ${creList.exchangeOptionList}">
+									<th:block th:if="${cre.chgOrdDtlNo} == ${exchange.ordDtlNo} and ${exchange.ordDtlStat} == 'G013_50'">
+										<div>
+											<button type="button" class="btn btn_default" th:attr="ordNo=${cre.ordNo}, ordDtlNo=${cre.ordDtlNo}, shipCompCd=${exchange.shipCompCd}, invoiceNo=${exchange.invoiceNo}" onclick="fnGoToDelivery(this);">
+												<span>배송조회</span>
+											</button>
+										</div>
+									</th:block>
+								</th:block>
 							</th:block>
 							<!-- //배송조회 -->
 							<div><button type="button" class="btn btn_default" onclick="fnGoToOneToOnePage()"><span>1:1 문의</span></button></div>
@@ -182,8 +186,8 @@
 						</th:block>
 						<!-- //결제대기(교환) -->
 						<!-- 교환완료 -->
-						<th:block th:if="${cre.chgStat} == 'G680_40'">
-							<th:block th:each="exchange, index , ${creList.exchangeOptionList}">
+						<th:block th:if="${cre.chgStat} == 'G685_40'">
+							<th:block th:each="exchange, index : ${creList.exchangeOptionList}">
 								<th:block th:if="${cre.chgOrdDtlNo} == ${exchange.ordDtlNo} and (${exchange.ordDtlStat} == 'G013_60' or ${exchange.ordDtlStat} == 'G013_70')">
 									<div class="goods_txt">
 										<p class="cf_txt cf_desc">교환이 완료되었습니다.</p>

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

@@ -111,7 +111,7 @@
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_50'}">반품 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_30'}">고객님이 반품하신 상품을 검수 중에 있습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_33'}">환불을 진행하고 있습니다(영업일 최대 3일 내 환불 예정)</p>
+							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_33'}">환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_60'}">반품이 완료되었습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_69'}">요청하신 반품을 취소하였습니다.</p>
 						</div>

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

@@ -17,7 +17,7 @@
 
 <th:block layout:fragment="content">
 <main role="" id="mypageOrderDetailForm" class="container my">
-	<section class="content my_order">
+	<section class="content my_order my_gift">
 		<div class="inner wide bg_beige">
 			<div class="order_number">
 				<dl class="clear">
@@ -88,6 +88,7 @@
 												<!-- 세트상품 -->
 												<th:block th:if="${ordDtl.goodsType == 'G056_S'}">
 													<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+														<em th:text="${ordDtl.itemNmArr[status.index]}"></em>
 														<em th:text="${option}"></em>
 														<em th:text="${ordDtl.optCd2Arr[status.index]}"></em>
 													</th:block>
@@ -218,91 +219,6 @@
 										</th:block>
 										<!-- //리뷰사용가능, 리뷰등록전일때 -->
 									</div>
-
-
-
-
-
-
-
-
-
-<!--									&lt;!&ndash; 버튼 4개 &ndash;&gt;-->
-<!--									<th:block th:unless="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'N'">-->
-<!--										<div class="goods_btn_wrap btn_group_flex type1">-->
-<!--											&lt;!&ndash; 교환불가 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.changeableYn} == 'N'">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
-<!--														<span>1:1 문의</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //교환불가 &ndash;&gt;-->
-<!--											&lt;!&ndash; 교환가능 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.changeableYn} == 'Y'">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_default btn_exch_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange');">-->
-<!--														<span>교환 신청</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //교환가능 &ndash;&gt;-->
-<!--											&lt;!&ndash; 반품가능 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.returnableYn} == 'Y'">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_default btn_rtn_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return');">-->
-<!--														<span>반품 신청</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; 반품가능 &ndash;&gt;-->
-<!--											&lt;!&ndash; 반품불가 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.returnableYn} == 'N'">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
-<!--														<span>1:1 문의</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //반품불가 &ndash;&gt;-->
-
-<!--											<div><button type="button" class="btn btn_default btn_delv_sch" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, shipCompCd=${ordDtl.shipCompCd}, invoiceNo=${ordDtl.invoiceNo}" onclick="fnGoToDelivery(this);"><span>배송 조회</span></button></div>-->
-
-<!--											&lt;!&ndash; 리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">-->
-<!--												<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
-<!--										</div>-->
-<!--										&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
-<!--									</th:block>-->
-<!--									&lt;!&ndash; //버튼 4개 &ndash;&gt;-->
-<!--									&lt;!&ndash; 버튼 3개 &ndash;&gt;-->
-<!--									<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'N'">-->
-<!--										<div class="goods_btn_wrap btn_group_flex">-->
-<!--											<div>-->
-<!--												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
-<!--													<span>1:1 문의</span>-->
-<!--												</button>-->
-<!--											</div>-->
-<!--											<div>-->
-<!--												<button type="button" th:id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">-->
-<!--													<span>구매 확정</span>-->
-<!--												</button>-->
-<!--											</div>-->
-<!--											&lt;!&ndash; 리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_primary btn_review_write" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">-->
-<!--														<span>리뷰 쓰기</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
-<!--										</div>-->
-<!--									</th:block>-->
-<!--									&lt;!&ndash; //버튼 3개 &ndash;&gt;-->
 								</th:block>
 								<!-- //배송중 (교환가능, 반품가능) -->
 
@@ -375,98 +291,6 @@
 										</th:block>
 										<!-- //리뷰사용가능, 리뷰등록전일때 -->
 									</div>
-
-
-
-
-
-
-
-
-
-
-
-									<!-- 버튼4개 -->
-<!--									<th:block th:unless="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'N'">-->
-<!--										<div class="goods_btn_wrap btn_group_flex type1">-->
-<!--											&lt;!&ndash; 교환불가 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.changeableYn} == 'N'">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
-<!--														<span>1:1 문의</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //교환불가 &ndash;&gt;-->
-<!--											&lt;!&ndash; 교환가능 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.changeableYn} == 'Y'">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_default btn_exch_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange');">-->
-<!--														<span>교환 신청</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //교환가능 &ndash;&gt;-->
-<!--											&lt;!&ndash; 반품가능 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.returnableYn} == 'Y'">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_default btn_rtn_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return');">-->
-<!--														<span>반품 신청</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //반품가능 &ndash;&gt;-->
-<!--											&lt;!&ndash; 반품불가 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.returnableYn} == 'N'">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
-<!--														<span>1:1 문의</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //반품불가 &ndash;&gt;-->
-<!--											<div>-->
-<!--												<button type="button" th:id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">-->
-<!--													<span>구매 확정</span>-->
-<!--												</button>-->
-<!--											</div>-->
-<!--											&lt;!&ndash; 리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_primary btn_review_write" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">-->
-<!--														<span>리뷰 쓰기</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
-<!--										</div>-->
-<!--									</th:block>-->
-									<!-- //버튼 4개 -->
-									<!-- 버튼 3개 -->
-<!--									<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'N'">-->
-<!--										<div class="goods_btn_wrap btn_group_flex">-->
-<!--											<div>-->
-<!--												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
-<!--													<span>1:1 문의</span>-->
-<!--												</button>-->
-<!--											</div>-->
-<!--											<div>-->
-<!--												<button type="button" th:id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">-->
-<!--													<span>구매 확정</span>-->
-<!--												</button>-->
-<!--											</div>-->
-<!--											&lt;!&ndash; 리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
-<!--											<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">-->
-<!--												<div>-->
-<!--													<button type="button" class="btn btn_primary btn_review_write" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">-->
-<!--														<span>리뷰 쓰기</span>-->
-<!--													</button>-->
-<!--												</div>-->
-<!--											</th:block>-->
-<!--											&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
-<!--										</div>-->
-<!--									</th:block>-->
-									<!-- //버튼 3개 -->
 								</th:block>
 								<!-- //배송완료 (교환가능, 반품가능) -->
 								
@@ -493,30 +317,32 @@
 							<!-- //일반주문 -->
 							<!-- 선물주문 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
-								<!-- 배송지등록전 -->
-								<th:block th:if="${ordDtl.recipBaseAddr == ''} and ${ordDtl.giftLimitDay} >= 0">
-									<div><button type="button" class="btn btn_primary btn_sms_send" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></div>
-								</th:block>
-								<!-- //배송지등록전 -->
-								
-								<!-- 배송지등록후 (입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_10' or ${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
-									<div><button type="button" class="btn btn_default btn_cncl_complete" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></div>
-								</th:block>
-								<!-- //배송지등록후 (입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
-								
-								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-									<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
-										<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
-										<!-- 리뷰사용가능, 리뷰등록전일때 -->
-										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null and ${ordDtl.ordDtlStat} == 'G013_70'">
-											<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>
+								<div class="goods_btn_wrap btn_group_flex">
+									<!-- 배송지등록전 -->
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+										<div><button type="button" class="btn btn_default btn_sms_send" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></div>
+									</th:block>
+									<!-- //배송지등록전 -->
+									
+									<!-- 배송지등록후 (입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
+									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_10' or ${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
+										<div><button type="button" class="btn btn_default btn_cncl_complete" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></div>
+									</th:block>
+									<!-- //배송지등록후 (입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
+									
+									<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
+										<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+											<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
+											<!-- 리뷰사용가능, 리뷰등록전일때 -->
+											<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null and ${ordDtl.ordDtlStat} == 'G013_70'">
+												<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>
+											</th:block>
+											<!-- //리뷰사용가능, 리뷰등록전일때 -->
 										</th:block>
-										<!-- //리뷰사용가능, 리뷰등록전일때 -->
 									</th:block>
-								</th:block>
-								<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+									<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								</div>
 							</th:block>
 							<!-- //선물주문 -->
 							<!-- //주문상태별 버튼기능 정의 -->
@@ -616,16 +442,16 @@
 							<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
 								<div class="goods_txt">
 									<!-- 배송지등록전 -->
-									<th:block th:if="${ordDtl.recipBaseAddr == ''} and ${ordDtl.giftLimitDay} >= 0">
-										<p class="cf_txt cf_desc"><span th:text="|‘${ordDtl.recipNm}’|"></span>님 주소를 입력하기 전입니다.</p>
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+										<p class="cf_txt cf_desc"><span th:text="|‘${deliveryAddrInfo.recipNm}’|"></span>님 주소를 입력하기 전입니다.</p>
 										<p class="period">입력기한 <span th:text="${ordDtl.giftLimitDt}"></span></p>
 									</th:block>
 									<!-- //배송지등록전 -->
 									
 									<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
 									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-										<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
-											<p class="cf_txt cf_desc"><span th:text="|‘${ordDtl.recipNm}’|"></span>님께 선물이 발송되었습니다.</p>
+										<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+											<p class="cf_txt cf_desc"><span th:text="|‘${deliveryAddrInfo.recipNm}’|"></span>님께 선물이 발송되었습니다.</p>
 										</th:block>
 									</th:block>
 									<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
@@ -746,7 +572,7 @@
 			<!-- 폴딩리스트 -->
 		</div>
 		
-		<div class="inner wide">
+		<div class="inner wide" th:if="${oneData.giftPackYn == 'N'}">
 			<!-- 폴딩리스트 -->
 			<div class="ui_row">
 				<div class="foldGroup shipfold">
@@ -805,19 +631,18 @@
 			</div>
 			<!-- 폴딩리스트 -->
 		</div>
-		
-		<th:block th:if="${orderInfo.giftPackYn} == 'Y'">
+		<th:block th:if="${oneData.giftPackYn} == 'Y'">
 			<div class="inner">
 				<div class="gift_wrap">
 					<h3>선물 받으실 분</h3>
 					<div class="gift_con">
 						<div class="gift_info">
-							<span th:text="${orderInfo.recipNm}"></span> / <span th:text="${orderInfo.recipPhnno}"></span>
+							<span th:text="${deliveryAddrInfo.recipNm}"></span> / <span th:text="${deliveryAddrInfo.recipPhnno}"></span>
 						</div>
 						<div class="message">
 							<p class="gift_tit">선물 메세지</p>
 							<div class="content">
-								<p th:text="${orderInfo.giftMsg}" id="giftMsg"></p>
+								<p th:text="${deliveryAddrInfo.giftMsg}" id="giftMsg"></p>
 							</div> 
 						</div>
 					</div>
@@ -938,7 +763,7 @@
 
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
-	let giftMsg				= [[${orderInfo.giftMsg}]];		// 선물메세지
+	let giftMsg				= [[${deliveryAddrInfo.giftMsg}]];		// 선물메세지
 	let ordNo 				= [[${ordNo}]];
 	var isLogin 			= [[${isLogin}]];
 	let orderList 			= [[${orderList}]];

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

@@ -280,6 +280,15 @@ var fnGetInfiniteScrollDataList = function() {
 							$("#listBox").append(result);
 						} else {
 							gagaInfiniteScroll.draw(result);
+							
+							// 2021.06.03 첫페이지 버튼 클래스 처리가 안되어 여기서 처리 진행
+							if (pageNo == 1) {
+								$.each($('.btn_count'), function(idx, item) {
+									if ($(item).children().length > 3 && !$(item).hasClass('col2')) {
+										$(item).addClass('col2');
+									}
+								});
+							}
 						}
 					}
 				}

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

@@ -23,27 +23,25 @@
 						<div class="goods_status">
 							<!-- 선물배송일때 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
-								<div class="goods_txt">
-									<!-- 배송지등록전 -->
-									<th:block th:if="${ordDtl.recipBaseAddr == ''} and ${ordDtl.giftLimitDay} >= 0">
-										<p class="dlvr_staus">주소 입력 대기 중</p>
-									</th:block>
-									<!-- //배송지등록전 -->
-									
-									<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-										<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
-											<p class="dlvr_staus">선물 완료</p>
-										</th:block>
-									</th:block>
-									<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									
-									<!-- 선물 취소 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
-										<p class="dlvr_staus">선물 취소</p>
+								<!-- 배송지등록전 -->
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+									<p class="dlvr_staus">주소 입력 대기 중</p>
+								</th:block>
+								<!-- //배송지등록전 -->
+								
+								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+										<p class="dlvr_staus">선물 완료</p>
 									</th:block>
-									<!-- //선물 취소 -->
-								</div>
+								</th:block>
+								<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								
+								<!-- 선물 취소 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+									<p class="dlvr_staus">선물 취소</p>
+								</th:block>
+								<!-- //선물 취소 -->
 							</th:block>
 							<!-- //선물배송일때 -->
 							
@@ -339,9 +337,9 @@
 							<!-- 선물배송, 배송미입력 -->
 							<div class="goods_btn_wrap btn_group_flex">
 								<!-- 배송지등록전 -->
-								<th:block th:if="${ordDtl.recipBaseAddr == ''} and ${ordDtl.giftLimitDay} >= 0">
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
 									<div>
-										<button type="button" class="btn btn_primary btn_sms_send">
+										<button type="button" class="btn btn_default btn_sms_send">
 											<span>SMS 재발송</span>
 										</button>
 									</div>
@@ -360,7 +358,7 @@
 								
 								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-									<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'}">
 										<div><button type="button" class="btn btn_default btn_cart_save"><span>쇼핑백 담기</span></button></div>
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null and ${ordDtl.ordDtlStat} == 'G013_70'">
@@ -467,28 +465,32 @@
 						
 						<!-- 선물배송일때 -->
 						<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
-							<div class="goods_txt">
-								<!-- 배송지등록전 -->
-								<th:block th:if="${ordDtl.recipBaseAddr == ''} and ${ordDtl.giftLimitDay} >= 0">
+							<!-- 배송지등록전 -->
+							<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+								<div class="goods_txt">
 									<p class="cf_txt cf_desc"><span th:text="|‘${ordDtl.recipNm}’|"></span>님 주소를 입력하기 전입니다.</p>
 									<p class="period">입력기한 <span th:text="${ordDtl.giftLimitDt}"></span></p>
-								</th:block>
-								<!-- //배송지등록전 -->
-								
-								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-									<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+								</div>
+							</th:block>
+							<!-- //배송지등록전 -->
+							
+							<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									<div class="goods_txt">
 										<p class="cf_txt cf_desc"><span th:text="|‘${ordDtl.recipNm}’|"></span>님께 선물이 발송되었습니다.</p>
-									</th:block>
+									</div>
 								</th:block>
-								<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-								
-								<!-- 선물 취소 -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+							</th:block>
+							<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+							
+							<!-- 선물 취소 -->
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+								<div class="goods_txt">
 									<p class="cf_txt cf_desc">주소 입력 기한이 경과되어 선물이 취소 되었습니다.</p>
-								</th:block>
-								<!-- //선물 취소 -->
-							</div>
+								</div>
+							</th:block>
+							<!-- //선물 취소 -->
 						</th:block>
 						<!-- //선물배송일때 -->
 						<!-- //상태문구정리 -->

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

@@ -338,7 +338,7 @@
 
 <!-- 210408_반품 수량 선택 팝업 -->
 <th:block th:if="${returnList.returnList}" th:each="return, status : ${returnList.returnList}">
-	<div class="popup_box returnCountPop">
+	<div id="returnCountPop" class="popup_box returnCountPop">
 		<div class="lap">
 			<div class="popup_close">카테고리닫기</div>
 			<div class="popup_head sr-only">
@@ -600,19 +600,19 @@ var fnReturn = function() {
 
 	let jsonData = JSON.stringify(data);
 
-	gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-		if (addPayCost > 0) {
-			let ordChgSq = result.ordChgSq;
-			let ordNo = result.ordNo;
-
-			$('#addPaymentForm input[name=ordChgSq]').val(ordChgSq);
-			$('#addPaymentForm input[name=ordNo]').val(ordNo);
-
-			document.addPaymentForm.submit();
-		} else {
-			cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
-		}
-	}, true);
+	//gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+	//	if (addPayCost > 0) {
+	//		let ordChgSq = result.ordChgSq;
+	//		let ordNo = result.ordNo;
+	//
+	//		$('#addPaymentForm input[name=ordChgSq]').val(ordChgSq);
+	//		$('#addPaymentForm input[name=ordNo]').val(ordNo);
+	//
+	//		document.addPaymentForm.submit();
+	//	} else {
+	//		cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
+	//	}
+	//}, true);
 }
 
 // 반품 수량 변경 이벤트 처리
@@ -718,7 +718,7 @@ var fnChangeReturnQty = function(param) {
 	}
 
 	// 팝업 닫기
-	$(".popup_close").trigger("click");
+	$(".returnCountPop .popup_close").trigger("click");
 }
 
 // 반품 사유 변경 이벤트
@@ -735,6 +735,9 @@ var fnChangeReturnReason = function(param) {
 
 	// 환불금액 계산
 	fnChangeReturnQty();
+	
+	// 팝업 닫기
+	$(".returnReasonPop .popup_close").trigger("click");
 }
 
 // 회수지 정보 설정
@@ -874,13 +877,20 @@ $(document).on("click",".select_custom.select_return",function(e){
 
 // 팝업_닫기
 $('.popup_close').on("click",function(){
-	$('.popup_box').hide().removeClass('active');
-	$("body").css({"overflow":"visible"});
+	let id = $(this).parent().parent().attr('id');
+	$(this).parent().parent().hide().removeClass('active');
+	
+	if (id != 'refundBankPop') {
+		$("body").css({"overflow": "visible"});
+	}
 });
 
 // 버튼 색
 $(document).on('click','.popup_box .button_list button',function(){
-	$('.popup_box .button_list button').removeClass('on');
+	//$('.popup_box .button_list button').removeClass('on');
+	$.each($(this).parent().find('button'), function(idx, item) {
+		$(item).removeClass('on');
+	});
 	$(this).addClass('on');
 });
 
@@ -903,17 +913,6 @@ $(document).on("click","#refundAccountPop .select_bank",function(e){
 	$("body").css({"overflow":"hidden"});
 });
 
-//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
-$('.refundAccountPop .popup_close').on("click",function(){
-	$('.refundAccountPop').hide().removeClass('active');
-	$("body").css({"overflow":"visible"});
-});
-
-//210408_ 추가 : 은행선택 팝업 스크립트 닫기
-$('.refundBankPop .popup_close').on("click",function(){
-	$('.refundBankPop').hide().removeClass('active');
-});
-
 //210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
 $(document).on('click','.popup_box.refundBankPop .button_list button',function(){
 	let bankCd = $(this).attr('bankCd');

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

@@ -585,17 +585,24 @@ $('#btn_bank_return').click(function() {
 
 //팝업_닫기
 $('.popup_close').on("click",function(){
-	$('.popup_box').hide().removeClass('active');
-	$("body").css({"overflow":"visible"});
+	let id = $(this).parent().parent().attr('id');
+	$(this).parent().parent().hide().removeClass('active');
+	
+	if (id != 'refundBankPop') {
+		$("body").css({"overflow": "visible"});
+	}
 });
 </script>
 
 <script>
-// 버튼 색
-$(document).on('click','.popup_box .button_list button',function(){
-	$('.popup_box .button_list button').removeClass('on');
-	$(this).addClass('on');
-});
+	// 버튼 색
+	$(document).on('click','.popup_box .button_list button',function(){
+		//$('.popup_box .button_list button').removeClass('on');
+		$.each($(this).parent().find('button'), function(idx, item) {
+			$(item).removeClass('on');
+		});
+		$(this).addClass('on');
+	});
 
 // 210408_송장번호 input 글자 수 제한
 function handleOnInput(el, maxlength) {
@@ -617,17 +624,6 @@ $(document).on("click","#refundAccountPop .select_bank",function(e){
 	$("body").css({"overflow":"hidden"});
 });
 
-//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
-$('.refundAccountPop .popup_close').on("click",function(){
-	$('.refundAccountPop').hide().removeClass('active');
-	$("body").css({"overflow":"visible"});
-});
-
-//210408_ 추가 : 은행선택 팝업 스크립트 닫기
-$('.refundBankPop .popup_close').on("click",function(){
-	$('.refundBankPop').hide().removeClass('active');
-});
-
 //210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
 $(document).on('click','.popup_box.refundBankPop .button_list button',function(){
 	let bankCd = $(this).attr('bankCd');

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

@@ -122,14 +122,36 @@
 								</button>
 							</div>
 						</div>
-						<div class="goods_txt">
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_20'}">교환 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_31' and exchangeDtl.chgGb == 'G680_40'}">고객님이 교환하신 상품을 검수 중에 있습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_40' and (exchangeDtl.chgOrdDtlStat == 'G013_60' or exchangeDtl.chgOrdDtlStat == 'G013_70')}">교환이 완료되었습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_49'}">요청하신 교환을 취소하였습니다.</p>
-						</div>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_20'}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">교환 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_30'}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_31' and exchangeDtl.chgGb == 'G680_40'}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">고객님이 교환하신 상품을 검수 중에 있습니다.</p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_40' and (exchangeDtl.chgOrdDtlStat == 'G013_60' or exchangeDtl.chgOrdDtlStat == 'G013_70')}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">교환이 완료되었습니다.</p>
+							</div>
+						</th:block>
+						<th:block th:if="${exchangeDtl.chgStat == 'G685_49'}">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">요청하신 교환을 취소하였습니다.</p>
+							</div>
+						</th:block>
 					</div>
 				</th:block>
 			</div>

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

@@ -132,7 +132,7 @@
 							<!-- //결제하기 -->
 							<!-- 배송조회 -->
 							<th:block th:if="${cre.chgStat} == 'G685_40'">
-								<th:block th:each="exchange, index , ${creList.exchangeOptionList}">
+								<th:block th:each="exchange, index : ${creList.exchangeOptionList}">
 									<th:block th:if="${cre.chgOrdDtlNo} == ${exchange.ordDtlNo} and ${exchange.ordDtlStat} == 'G013_50'">
 										<div>
 											<button type="button" class="btn btn_default" th:attr="ordNo=${cre.ordNo}, ordDtlNo=${cre.ordDtlNo}, shipCompCd=${exchange.shipCompCd}, invoiceNo=${exchange.invoiceNo}" onclick="fnGoToDelivery(this);">
@@ -176,8 +176,8 @@
 						</th:block>
 						<!-- //결제대기(교환) -->
 						<!-- 교환완료 -->
-						<th:block th:if="${cre.chgStat} == 'G680_40'">
-							<th:block th:each="exchange, index , ${creList.exchangeOptionList}">
+						<th:block th:if="${cre.chgStat} == 'G685_40'">
+							<th:block th:each="exchange, index : ${creList.exchangeOptionList}">
 								<th:block th:if="${cre.chgOrdDtlNo} == ${exchange.ordDtlNo} and (${exchange.ordDtlStat} == 'G013_60' or ${exchange.ordDtlStat} == 'G013_70')">
 									<div class="goods_txt">
 										<p class="cf_txt cf_desc">교환이 완료되었습니다.</p>

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

@@ -101,7 +101,7 @@
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_50'}">반품 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_30'}">고객님이 반품하신 상품을 검수 중에 있습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_33'}">환불을 진행하고 있습니다(영업일 최대 3일 내 환불 예정)</p>
+							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_33'}">환불을 진행하고 있습니다다.(영업일 최대 3일 내 환불 예정)</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_60'}">반품이 완료되었습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_69'}">요청하신 반품을 취소하였습니다.</p>
 						</div>

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

@@ -879,13 +879,20 @@ $(document).on("click",".select_custom.select_return",function(e){
 
 // 팝업_닫기
 $('.popup_close').on("click",function(){
-	$('.popup_box').hide().removeClass('active');
-	$("body").css({"overflow":"visible"});
+	let id = $(this).parent().parent().attr('id');
+	$(this).parent().parent().hide().removeClass('active');
+	
+	if (id != 'refundBankPop') {
+		$("body").css({"overflow": "visible"});
+	}
 });
 
 // 버튼 색
 $(document).on('click','.popup_box .button_list button',function(){
-	$('.popup_box .button_list button').removeClass('on');
+	//$('.popup_box .button_list button').removeClass('on');
+	$.each($(this).parent().find('button'), function(idx, item) {
+		$(item).removeClass('on');
+	});
 	$(this).addClass('on');
 });
 
@@ -908,17 +915,6 @@ $(document).on("click","#refundAccountPop .select_bank",function(e){
 	$("body").css({"overflow":"hidden"});
 });
 
-//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
-$('.refundAccountPop .popup_close').on("click",function(){
-	$('.refundAccountPop').hide().removeClass('active');
-	$("body").css({"overflow":"visible"});
-});
-
-//210408_ 추가 : 은행선택 팝업 스크립트 닫기
-$('.refundBankPop .popup_close').on("click",function(){
-	$('.refundBankPop').hide().removeClass('active');
-});
-
 //210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
 $(document).on('click','.popup_box.refundBankPop .button_list button',function(){
 	let bankCd = $(this).attr('bankCd');

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

@@ -106,7 +106,7 @@
 									<!-- 반품상품검수중 -->
 									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_30'}"><p>고객님이 반품하신 상품을 검수 중에 있습니다.</p></div>
 									<!-- 반품진행중 -->
-									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_33'}"><p>환불을 진행하고 있습니다(영업일 최대 3일 내 환불 예정)</p></div>
+									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_33'}"><p>환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)</p></div>
 									<!-- 반품완료 -->
 									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_60'}"><p>반품이 완료되었습니다.</p></div>
 									<!-- 반품철회 -->

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

@@ -482,7 +482,7 @@
 					// 버튼 처리
 					if (ordDtl.giftPackYn == 'Y') {
 						// SMS 재발송 버튼
-						if (gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.giftLimitDay >= 0) {
+						if (ordDtl.giftAddrInpYn == 'N' && ordDtl.giftLimitDay >= 0) {
 							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>\n';
 						}
 
@@ -492,12 +492,12 @@
 						}
 
 						// 리뷰 쓰기 버튼
-						if (!gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99' && ordDtl.reviewableYn == 'Y' && ordDtl.reviewSq == null) {
+						if (ordDtl.giftAddrInpYn == 'Y' && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99' && ordDtl.reviewableYn == 'Y' && ordDtl.reviewSq == null) {
 							tag += '											<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" goodsCd="' + ordDtl.goodsCd + '" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>\n';
 						}
 
 						// 쇼핑백담기 버튼(구매확정)
-						if (!gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99') {
+						if (ordDtl.giftAddrInpYn == 'Y' && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99') {
 							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>\n';
 						}
 					} else {
@@ -559,12 +559,12 @@
 					// 하단 상태값 배너 처리
 					if (ordDtl.giftPackYn == 'Y') {
 						// 주소 입력 대기중
-						if (gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.giftLimitDay >= 0) {
+						if (ordDtl.giftAddrInpYn == 'N' && ordDtl.giftLimitDay >= 0) {
 							tag += '									<div class="order_text"><p>' + ordDtl.recipNm + '님이 주소를 입력하기 전입니다. (입력기한 ' + ordDtl.giftLimitDt + ')</p></div>\n';
 						}
 						
 						// 선물 완료
-						if (!gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99') {
+						if (ordDtl.giftAddrInpYn == 'Y' && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99') {
 							tag += '									<div class="order_text"><p>' + ordDtl.recipNm + '님께 선물이 발송되었습니다.</p></div>\n';
 						}
 						

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

@@ -104,7 +104,7 @@
 									<!-- 반품상품검수중 -->
 									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_30'}"><p>고객님이 반품하신 상품을 검수 중에 있습니다.</p></div>
 									<!-- 반품진행중 -->
-									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_33'}"><p>환불을 진행하고 있습니다(영업일 최대 3일 내 환불 예정)</p></div>
+									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_33'}"><p>환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)</p></div>
 									<!-- 반품완료 -->
 									<div class="order_text" th:if="${returnDtl.chgStat == 'G685_60'}"><p>반품이 완료되었습니다.</p></div>
 									<!-- 반품철회 -->