Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front.git into develop

src/main/java/com/style24/front/biz/dao/TsfOrderDao.java

@@ -156,4 +156,13 @@ public interface TsfOrderDao {
 	 * @since 2021. 05. 26
 	 */
 	int getNoMemberOrderInfo(Order order);
+
+	/**
+	 * 주문 실결제 금액 조회
+	 * @param param
+	 * @return
+	 * @author xodud1202
+	 * @since 2021. 06. 02
+	 */
+	int getRealPaymentAmt(Order param);
 }

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

@@ -1302,13 +1302,26 @@ public class TsfOrderService {
 
 			result = sendOrderInfoToNC(sb);
 
-			// 네이버 페이 주문번호 저장
-			param.setNpayOrdNo(Integer.parseInt(result.get("resultNo").toString()));
+			// 최종 결제 금액 계산
+			Order realAmtOrdNo = new Order();
+			realAmtOrdNo.setOrdNo(ordNo);
+
+			// 4. 결제 예정 정보 저장
+			Payment payment = new Payment();
+			payment.setOrdNo(param.getOrdNo());
+			payment.setPayMeans(TscConstants.PayMeans.CREDIT_CARD.value());
+			payment.setPayAmt(orderDao.getRealPaymentAmt(realAmtOrdNo));
+			payment.setPgCpnAmt(0);
+			payment.setNpayPntAmt(0);
+			payment.setPayGb("O");
+			payment.setPayStat(TscConstants.PaymentStat.PAYMENT_WAIT.value());
+			payment.setPgGb(TscConstants.PgGb.NAVER_ORDER.value());
+			payment.setPgShopId(env.getProperty("naverPay.shop.id"));
+			payment.setEscrowYn("N");
+			payment.setRegNo(custNo);
+			payment.setUpdNo(custNo);
+			coreOrderDao.insertPayment(payment);
 
-			// 3.주문정보 저장
-			param.setOrdNo(ordNo);
-			param.setUpdNo(custNo);
-			coreOrderDao.updateNaverPayOrderNo(param);
 			if(TscConstants.FrontGb.PC.value().equals(TsfSession.getFrontGb())) {
 				result.put("npayOrderUrl", env.getProperty("naverPay.order.pc.url"));
 			} else {

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

@@ -84,7 +84,12 @@ public class TsfCartController extends TsfBaseController {
 	@GetMapping("/list/form")
 	public ModelAndView cartListForm() {
 		ModelAndView mav = new ModelAndView();
-		mav.addObject("loginCustNo", TsfSession.getInfo().getCustNo());
+		int custNo = 0;
+		if(TsfSession.isLogin()) {
+			custNo = TsfSession.getInfo().getCustNo();
+		}
+
+		mav.addObject("loginCustNo", custNo);
 		mav.setViewName(super.getDeviceViewName("cart/CartListForm"));
 		return mav;
 	}

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

@@ -1452,7 +1452,7 @@
 		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
 		                    FROM	TB_CONTENTS CT
 		                    , TMP_CONTENTS_GOODS CTG
-		                    , TB_GOODS G
+		                    , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		                    , TB_GOODS_STOCK S
 		                    , TB_BRAND B
 		                    , TB_BRAND_GROUP BG
@@ -1469,7 +1469,7 @@
 		                <otherwise>
 		                    FROM   TB_CATE_4SRCH C4
 		                    , TB_CATE_GOODS CG
-		                    , TB_GOODS G 
+		                    , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		                    , TB_GOODS_STOCK S
 		                    , TB_BRAND B
 		                    , TB_BRAND_GROUP BG
@@ -1675,7 +1675,7 @@
 		        	<when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
 		        		FROM	TB_CONTENTS CT
 		        		, TMP_CONTENTS_GOODS CTG
-		        		, TB_GOODS G USE INDEX (IX_GOODS_11)
+		        		, TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		        		, TB_GOODS_STOCK S
 		        		, TB_BRAND B
 		        		, TB_BRAND_GROUP BG
@@ -1692,7 +1692,7 @@
 		        	<otherwise>
 		        		FROM   TB_CATE_4SRCH C4
 		        		, TB_CATE_GOODS CG
-		        		, TB_GOODS G USE INDEX (IX_GOODS_11)
+		        		, TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		        		, TB_GOODS_STOCK S
 		        		, TB_BRAND B
 		        		, TB_BRAND_GROUP BG
@@ -1773,7 +1773,6 @@
 		         , G.LIST_PRICE         /*정상가(최초판매가)*/
 		         , G.CURR_PRICE         /*현재판매가*/
 		         , G.REG_DT             /*등록일시*/
-		         , G.NUMB
 		    FROM   (
 		            SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
 		                            BG.BRAND_GROUP_ENM
@@ -1792,11 +1791,9 @@
 		                 , G.LIST_PRICE                                             /*정상가(최초판매가)*/
 		                 , G.CURR_PRICE                                             /*현재판매가*/
 		                 , G.REG_DT                                                 /*등록일시*/
-		                 , ROW_NUMBER() OVER(ORDER BY G.REG_DT DESC
-		                                            , G.GOODS_CD) AS NUMB
 		            FROM   TB_CATE_4SRCH C4
 		                 , TB_CATE_GOODS CG
-		                 , TB_GOODS G USE INDEX (IX_GOODS_11)
+		                 , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
 		                 , TB_GOODS_STOCK GS
 		                 , TB_BRAND B
 		                 , TB_BRAND_GROUP BG
@@ -1834,11 +1831,12 @@
 		            AND    BG.USE_YN = 'Y'
 		           ) G
 		    WHERE  1=1
+		    ORDER BY G.REG_DT DESC, G.GOODS_CD
 		<if test="pageable != null and pageable.endRow != null and pageable.endRow > 0">
-			AND  G.NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
+			LIMIT #{pageable.limitStartRow} , #{pageable.pageSize}
 		</if>
 		<if test="maxRow != null and maxRow !=''">
-			AND  G.NUMB <![CDATA[<=]]> #{maxRow}
+			LIMIT #{maxRow}
 		</if>
 		)
 		SELECT G.BRAND_GROUP_NM
@@ -1984,7 +1982,7 @@
 		               , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		          FROM   TB_CATE_4SRCH C4
 		          INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		          INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		          INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
 		          INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		          INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		          INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
@@ -2148,7 +2146,7 @@
 		             , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		         FROM   TB_CATE_4SRCH C4
 		         INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		         INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		         INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
 		         INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		         INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		         INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
@@ -2320,7 +2318,7 @@
 		                , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		            FROM   TB_CATE_4SRCH C4
 		            INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		            INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		            INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
 		            INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		            INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		            INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
@@ -2484,7 +2482,7 @@
 		               , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
 		         FROM   TB_CATE_4SRCH C4
 		         INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		         INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
+		         INNER JOIN TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
 		         INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		         INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		         INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO

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

@@ -440,6 +440,7 @@
 			 , DL.RTN_LOC_ZIPCODE
 			 , DL.RTN_LOC_BASE_ADDR
 			 , DL.RTN_LOC_DTL_ADDR
+			 , DA.GIFT_MSG
 			 , DA.REG_NO
 			 , DA.REG_DT
 			 , DA.UPD_NO
@@ -617,5 +618,18 @@
 		   AND ORD_PHNNO = #{ordPhnno}
 	</select>
 
-
+	<select id="getRealPaymentAmt" parameterType="Order" resultType="int">
+		SELECT OD.REAL_ORD_AMT + DF.REAL_DELV_AMT AS PAY_AMT
+		FROM   (SELECT OD.ORD_NO
+		             , SUM(OD.REAL_ORD_AMT) AS REAL_ORD_AMT
+		        FROM   TB_ORDER_DETAIL OD
+		        WHERE  OD.ORD_NO = #{ordNo}
+			    GROUP  BY OD.ORD_NO) OD
+		INNER  JOIN (SELECT DF.ORD_NO
+		                 , SUM(DF.REAL_DELV_AMT) AS REAL_DELV_AMT
+		            FROM   TB_DELIVERY_FEE DF
+		            WHERE  DF.ORD_NO = #{ordNo}
+		            GROUP  BY DF.ORD_NO) DF
+		ON     OD.ORD_NO = DF.ORD_NO
+	</select>
 </mapper>

src/main/resources/config/application-locd.yml

@@ -90,7 +90,7 @@ naverPay:
     button.pc.js.url : https://test-pay.naver.com/customer/js/naverPayButton.js
     button.mobile.js.url : https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
     common.certification.key : s_3799db3bf4af-
-    certification.key: 2BC5E173-2840-4B48-BC7D-FF770005DD76
+    certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
     order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
     order.pc.url: https://test-order.pay.naver.com/customer/buy/
     order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/

src/main/resources/config/application-style.yml

@@ -102,7 +102,7 @@ naverPay:
     button.pc.js.url: https://test-pay.naver.com/customer/js/naverPayButton.js
     button.mobile.js.url: https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
     common.certification.key: s_3799db3bf4af-
-    certification.key: 2BC5E173-2840-4B48-BC7D-FF770005DD76
+    certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
     order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
     order.pc.url: https://test-order.pay.naver.com/customer/buy/
     order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/

src/main/resources/config/application-tsit.yml

@@ -95,7 +95,19 @@ naverPay:
     button.pc.js.url: https://test-pay.naver.com/customer/js/naverPayButton.js
     button.mobile.js.url: https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
     common.certification.key : s_3799db3bf4af-
-    certification.key: 2BC5E173-2840-4B48-BC7D-FF770005DD76
+    certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
     order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
     order.pc.url: https://test-order.pay.naver.com/customer/buy/
     order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/
+    
+# ERP (한세드림)
+erp:
+    api:
+        stock.url: http://erp.hansaemk.com:96/api/hsdr/Shop/GoodsInfo
+        goods.url: http://erp.hansaemk.com:96/api/hsdr/Shop
+
+# 검색엔진(NHN다이퀘스트)
+search:
+    engine:
+        diquest.ip: 133.186.171.33
+        diquest.port: 44555

src/main/resources/persistence/mybatis-shop-config.xml

@@ -9,7 +9,7 @@
 		<!-- <setting name="multipleResultSetsEnabled" value="true" /> --> <!-- 한개의 구문에서 여러개의 ResultSet을 허용할지의 여부 (default true) -->
 		<setting name="useGeneratedKeys" value="true" /> <!-- 생성키를 강제로 생성 (default false) -->
 		<setting name="defaultExecutorType" value="REUSE" /> <!-- 디폴트 실행자(executor) 설정. PreparedStatement를 재사용 (default SIMPLE)-->
-		<setting name="defaultStatementTimeout" value="25" /> <!-- 데이터베이스로의 응답을 얼마나 오래 기다릴지를 판단하는 타임아웃(초)를 설정 -->
+		<setting name="defaultStatementTimeout" value="60" /> <!-- 데이터베이스로의 응답을 얼마나 오래 기다릴지를 판단하는 타임아웃(초)를 설정 -->
 		<setting name="mapUnderscoreToCamelCase" value="true"/> <!-- 데이터베이스 칼럼명 형태인 A_COLUMN을 CamelCase 형태의 자바 프로퍼티명 형태인 aColumn으로 자동으로 매핑하도록 함 (default false) -->
 		<setting name="logImpl" value="NO_LOGGING" /> <!-- 마이바티스가 사용할 로깅 구현체를 명시. 이 설정을 사용하지 않으면 마이바티스가 사용할 로깅 구현체를 자동으로 찾는다. -->
 		<setting name="jdbcTypeForNull" value="NULL"/> <!-- JDBC 타입을 파라미터에 제공하지 않을 때 null 값을 처리한 JDBC 타입을 명시 -->

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDescFormMob.html

@@ -45,11 +45,11 @@
 			<div class="movblock">
 				<th:block th:if="${goodsVideo.videoGb == 'Y'}">
 				<div style="height:4rem"></div><!-- 여백용 html -->
-				<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+				<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0&mute=1'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 				</th:block>
 				<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
 				<div style="height:4rem"></div><!-- 여백용 html -->
-				<iframe class="pd_mov" width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+				<iframe class="pd_mov" width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?player_version=html5&mute'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 				</th:block>
 			</div>
 			</th:block>

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -980,34 +980,34 @@
 	var fnGoodsDealSaleOpen = function(goodsCd){
 		$("#pdDescrpPop .close-modal ").click();
 		$('.container').addClass('btPop_open');
-		$(".Purchase_pop .pop_option_select").show();
+		$(".pop_option_select").show();
 		popOpenScroll();
 		let selIdx = 0;
-		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').each(function() { 
+		$('.pop_option_select').find('#form_field_item_Up .list li').each(function() { 
 			if (goodsCd == $(this).find('.item_prod').attr('goodscd')){
 				return false;
 			}
 			selIdx ++;
 		});
 		
-		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').eq(selIdx).trigger("click");
+		$('.pop_option_select').find('#form_field_item_Up .list li').eq(selIdx).trigger("click");
 		return false;
 	}	
 	
 	//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업
 	var fnGoodsDealOptionOpen = function(goodsCd){
 		$('.container').addClass('btPop_open');
-		$(".Purchase_pop .pop_option_select").show();
+		$(".pop_option_select").show();
 		popOpenScroll();
 		let selIdx = 0;
-		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').each(function() { 
+		$('.pop_option_select').find('#form_field_item_Up .list li').each(function() { 
 			if (goodsCd == $(this).find('.item_prod').attr('goodscd')){
 				return false;
 			}
 			selIdx ++;
 		});
 		
-		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').eq(selIdx).trigger("click");
+		$('.pop_option_select').find('#form_field_item_Up .list li').eq(selIdx).trigger("click");
 		return false;
 	}	
 	
@@ -1285,9 +1285,9 @@
 		 	$(".pop_option_select").show();
 			 return false;
 		 });
-		$(document).on('click','.Purchase_pop .close',function(e){
+		$(document).on('click','.pop_option_select .close',function(e){
 			$(".pop_option_select").hide();
-			$('.option_result .option_open').removeClass('on');
+			$(".option_open").removeClass("on");
 			 return false;
 		 })
 //			//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업 ==> fnGoodsDealOptionOpen()대체

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -309,11 +309,11 @@
 					<div class="movblock">
 						<th:block th:if="${goodsVideo.videoGb == 'Y'}">
 						<div style="height:4rem"></div><!-- 여백용 html -->
-						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0&mute=1'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 						</th:block>
 						<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
 						<div style="height:4rem"></div><!-- 여백용 html -->
-						<iframe class="pd_mov" width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+						<iframe class="pd_mov" width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?player_version=html5&mute'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 						</th:block>
 					</div>
 					</th:block>

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

@@ -6,9 +6,9 @@
 		<th:block th:if="${exchangeOptionInfo}" th:each="oneData, status : ${exchangeOptionInfo}">
 			<div class="option_list">
 				<ul>
-					<input type="hidden" name="chgOptCd2" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}">
 					<!-- 자사일때 opt2 교환 -->
 					<th:block th:if="${oneData.selfGoodsYn == 'Y'}">
+						<input type="hidden" name="chgOptCd2" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}">
 						<li>
 							<div class="option_name">
 								<span>
@@ -65,12 +65,13 @@
 		<div class="popup_con">
 			<div class="button_list">
 				<th:block th:each="option, idx : ${oneData.optCd2Arr}">
-					<button type="button" th:disabled="${oneData.optCd2Arr.length} > 0 and (${#numbers.formatInteger(oneData.currStockQtyArr[idx.index],0)} <= 0 or ${oneData.soldoutYnArr[idx.index]} == 'Y')" th:attr="optCd2=${option}" onclick="fnSelectOption(this);">
+					<button type="button" th:disabled="${oneData.optCd2Arr.length} > 0 and (${#numbers.formatInteger(oneData.currStockQtyArr[idx.index],0)} <= 0 or ${oneData.soldoutYnArr[idx.index]} == 'Y')" th:attr="optCd2=${option}" th:checked="${oneData.optCd2 == option}" onclick="fnSelectOption(this);">
 						<span th:text="${option}"></span>
 					</button>
 					</th:block>
 				</th:block>
-			</div> 
+			</div>
+			<input type="hidden" name="chgOptCd2" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}" />
 		</div>
 	</div>
 </div>
@@ -81,7 +82,17 @@ var oneData1 	= [[${oneData}]];
 var chgQty1 	= [[${chgQty}]];
 
 $(document).ready( function() {
+	$.each($('.optionChangePop .option_box button'), function(idx ,item) {
+		if ($(item).attr('checked') == 'checked') {
+			$(item).addClass('on');
+		}
+	});
 	
+	$.each($('.popup_box .button_list button'), function(idx ,item) {
+		if ($(item).attr('checked') == 'checked') {
+			$(item).addClass('on');
+		}
+	});
 });
 
 // 라디오 클릭 이벤트
@@ -93,6 +104,7 @@ var fnRadioOption = function(param) {
 var fnSelectOption = function(param) {
 	$("#exchangePop .option_list .option_select .select_custom.select_option .select").text($(param).attr('optCd2'));
 	$(param).parent().parent().find('input[name=chgOptCd2]').val($(param).attr('optCd2'));
+	$('.exchangeOptionPop').hide().removeClass('active');
 }
 
 // 옵션 저장 버튼 클릭 이벤트
@@ -125,7 +137,10 @@ var fnSaveOption = function() {
 
 // 버튼 색
 $(document).on('click','.optionChangePop .option_box button',function(){
-	$('.optionChangePop .option_box button').removeClass('on');
+	//$('.optionChangePop .option_box button').removeClass('on');
+	$.each($(this).parent().find('button'), function(idx, item) {
+		$(item).removeClass('on');
+	});
 	$(this).addClass('on');
 });
 

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

@@ -85,7 +85,7 @@
 						</div>
 						<div class="goods_btn_wrap btn_group_flex">
 							<div>
-								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
 									<span>1:1 문의</span>
 								</button>
 							</div>

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

@@ -123,11 +123,11 @@
 						<div class="goods_btn_wrap btn_group_flex">
 							<div th:if="${exchangeDtl.chgStat == 'G685_32' or exchangeDtl.chgStat == 'G685_21'}">
 								<button type="button" class="btn btn_default" th:attr="ordNo=${exchangeDtl.ordNo}, ordChgSq=${exchangeDtl.ordChgSq}" onclick="fnCrePayAddCost(this);">
-									<span>결재하기</span>
+									<span>결제하기</span>
 								</button>
 							</div>
 							<div>
-								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
 									<span>1:1 문의</span>
 								</button>
 							</div>

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

@@ -79,12 +79,24 @@
 		</div>
 		<div class="popup_con">
 			<div class="button_list clear">
-				<button type="button" class="ordDtlStat on"><span>전체상태</span></button>
-				<th:block th:each="oneData, status : ${chgStatList}">
-					<button type="button" class="ordDtlStat" th:code="${oneData.cd}">
-						<span th:text="${oneData.cdNm}"></span>
-					</button>
-				</th:block>
+				<button type="button" class="ordDtlStat on" code=""><span>전체상태</span></button>
+				<button type="button" class="ordDtlStat" code="G685_91"><span>결제대기</span></button>
+				<button type="button" class="ordDtlStat" code="G685_20"><span>교환접수</span></button>
+				<button type="button" class="ordDtlStat" code="G685_50"><span>반품접수</span></button>
+				<button type="button" class="ordDtlStat" code="G685_30"><span>회수요청</span></button>
+				<button type="button" class="ordDtlStat" code="G685_31"><span>상품 검수중</span></button>
+				<button type="button" class="ordDtlStat" code="G685_34"><span>교환 진행중</span></button>
+				<button type="button" class="ordDtlStat" code="G685_33"><span>환불 진행중</span></button>
+				<button type="button" class="ordDtlStat" code="G685_40"><span>교환완료</span></button>
+				<button type="button" class="ordDtlStat" code="G685_60"><span>반품완료</span></button>
+				<button type="button" class="ordDtlStat" code="G685_92"><span>접수취소</span></button>
+				<button type="button" class="ordDtlStat" code="G685_93"><span>주문취소</span></button>
+				<button type="button" class="ordDtlStat" code="G685_94"><span>품절취소</span></button>
+<!--				<th:block th:each="oneData, status : ${chgStatList}">-->
+<!--					<button type="button" class="ordDtlStat" th:code="${oneData.cd}">-->
+<!--						<span th:text="${oneData.cdNm}"></span>-->
+<!--					</button>-->
+<!--				</th:block>-->
 			</div>
 		</div>
 	</div>
@@ -110,7 +122,7 @@ $(document).ready(function() {
 
 	jsonObj = {
 		"pageNo" 			: 1
-		, "pageSize" 		: 5
+		, "pageSize" 		: 10
 		, "pageUnit" 		: 10
 		, "chgStat" 		: ""
 		, "stDate" 			: ""

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

@@ -19,8 +19,21 @@
 				<th:block th:each="cre , i : ${creList.creList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 					<div class="goods_section">
 						<div class="goods_status">
-							<p class="dlvr_staus" th:text="${cre.chgStatNm}"></p>
+							<!-- 상태값 처리 -->
+							<p class="dlvr_staus" th:if="${cre.chgStat == 'G685_17' or cre.chgStat == 'G685_18'}">주문취소</p>
+							<th:block th:if="${cre.chgStat == 'G685_40'}" th:each="exchange, index : ${creList.exchangeOptionList}">
+								<p class="dlvr_staus" th:if="${cre.chgOrdDtlNo == exchange.ordDtlNo && (exchange.ordDtlStat == 'G013_20' or exchange.ordDtlStat == 'G013_30' or exchange.ordDtlStat == 'G013_35' or exchange.ordDtlStat == 'G013_40' or exchange.ordDtlStat == 'G013_50')}">교환진행중</p>
+								<p class="dlvr_staus" th:if="${cre.chgOrdDtlNo == exchange.ordDtlNo && (exchange.ordDtlStat == 'G013_60' or exchange.ordDtlStat == 'G013_70')}">교환완료</p>
+							</th:block>
+							<p class="dlvr_staus" th:if="${cre.chgStat == 'G685_33'}">환불진행중</p>
+							<p class="dlvr_staus" th:if="${cre.chgStat == 'G685_21' or cre.chgStat == 'G685_51'}">결제대기</p>
+							<p class="dlvr_staus" th:if="${cre.chgStat == 'G685_49' or cre.chgStat == 'G685_69'}">접수취소</p>
+							<p class="dlvr_staus" th:unless="${cre.chgStat == 'G685_17' or cre.chgStat == 'G685_18' or cre.chgStat == 'G685_40' or cre.chgStat == 'G685_33' or cre.chgStat == 'G685_21' or cre.chgStat == 'G685_51' or cre.chgStat == 'G685_49' or cre.chgStat == 'G685_69'}" th:text="${cre.chgStatNm}"></p>
+							<!-- //상태값 처리 -->
+
+							<!-- 상태값 변경 일시 -->
 							<p class="dlvr_desc" th:text="|${cre.chgDate} ${cre.chgTime}|"></p>
+							<!-- //상태값 변경 일시 -->
 						</div>
 						<div class="goods_detail">
 							<a href="javascript:void(0)" th:attr="goodsCd=${cre.goodsCd}" onclick="fnGoToGoodsDetail(this)">
@@ -33,10 +46,10 @@
 											<span th:text="${cre.brandNm}"></span>
 											<div class="badge_wrap">
 												<th:block th:if="${cre.shotDelvYn} == 'Y'">
-													<em class="order_badge">STYLE24 일반배송</em>
+													<em class="order_badge order_bullet_badge">총알배송</em>
 												</th:block>
 												<th:block th:if="${cre.selfGoodsYn} == 'Y' and ${cre.shotDelvYn} == 'N'">
-													<em class="order_badge order_bullet_badge">총알배송</em>
+													<em class="order_badge">STYLE24 일반배송</em>
 												</th:block>
 												<th:block th:if="${cre.selfGoodsYn} == 'N' and ${cre.shotDelvYn} == 'N'">
 													<em class="order_badge order_bullet_badge">업체직배송</em>
@@ -121,7 +134,7 @@
 							<th:block th:if="${cre.chgStat} == 'G685_21' or ${cre.chgStat} == 'G685_51' or ${cre.chgStat} == 'G685_32'">
 								<div>
 									<button type="button" class="btn btn_default" th:ordNo="${cre.ordNo}" th:ordChgSq="${cre.ordChgSq}" onclick="fnCrePayAddCost(this);">
-										<span>결재하기</span>
+										<span>결제하기</span>
 									</button>
 								</div>
 							</th:block>
@@ -135,7 +148,7 @@
 								</div>
 							</th:block>
 							<!-- //배송조회 -->
-							<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+							<div><button type="button" class="btn btn_default" onclick="fnGoToOneToOnePage()"><span>1:1 문의</span></button></div>
 						</div>
 						<!-- //취소,반품,교환 상태별 버튼기능정의 -->
 						
@@ -162,7 +175,7 @@
 						</th:block>
 						<!-- //상품검수중(교환) -->
 						<!-- 결제대기(교환) -->
-						<th:block th:if="${cre.chgStat} == 'G685_32' and ${cre.chgGb} == 'G680_40'">
+						<th:block th:if="${cre.chgStat == 'G685_21' or (cre.chgGb == 'G680_40' and cre.chgStat == 'G685_32')}">
 							<div class="goods_txt">
 								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 결제 후 교환 가능합니다.|"></p>
 							</div>

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

@@ -97,11 +97,11 @@
 						<div class="goods_btn_wrap btn_group_flex">
 							<div th:if="${returnDtl.chgStat == 'G685_32' or returnDtl.chgStat == 'G685_51'}">
 								<button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}" onclick="fnCrePayAddCost(this);">
-									<span>결재하기</span>
+									<span>결제하기</span>
 								</button>
 							</div>
 							<div>
-								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
 									<span>1:1 문의</span>
 								</button>
 							</div>

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

@@ -17,7 +17,7 @@
 
 <th:block layout:fragment="content">
 <main role="" id="mypageDeliveryInfoForm" class="container my">
-	<section class="content my_order">
+	<section class="content my_goodsy">
 		<div class="inner wide bg_beige">
 			<div class="order_number">
 				<dl class="clear">
@@ -122,7 +122,7 @@
 								<!-- 입금대기 (1:1문의, 쇼핑백 담기) -->
 								<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
 									<div class="goods_btn_wrap btn_group_flex">
-										<div><button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></div>
 										<div><button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 									</div>
 								</th:block>
@@ -279,7 +279,7 @@
 									<div class="goods_btn_wrap btn_group_flex">
 										<!-- 리뷰사용불가능, 리뷰등록후일때 -->
 										<th:block th:unless="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
-											<div><button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+											<div><button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></div>
 										</th:block>
 										<!-- //리뷰사용불가능, 리뷰등록후일때 -->
 
@@ -337,17 +337,16 @@
 										<!-- //교환불가능, 반품불가능 -->
 										
 										<!-- 교환불가능 -->
-										<th:block th:if="${ordDtl.changeableYn} == 'N'">
+										<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
 											<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
 										</th:block>
 										<!-- //교환불가능 -->
 										
 										<!-- 반품불가능 -->
-										<th:block th:if="${ordDtl.returnableYn} == 'N'">
+										<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
 											<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
 										</th:block>
 										<!-- //반품불가능 -->
-										
 									</th:block>
 									<!-- //배송중, 배송완료 상태 -->
 								</div>

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

@@ -145,7 +145,7 @@
 								<col width="*">
 							</colgroup>   
 							<tr>
-								<th class="sr-only">반품 접수 일자</th>
+								<th class="sr-only">교환 접수 일자</th>
 								<td>
 									<div class="select_custom select_exchange">
 										<div class="combo">
@@ -155,7 +155,7 @@
 								</td>
 							</tr>
 							<tr>
-								<th class="sr-only">반품 완료 일자</th>
+								<th class="sr-only">교환 완료 일자</th>
 								<td>
 									<div class="textarea_wrap">
 										<textarea class="doc_return" name="chgMemo" id="chgMemo" maxlength="200" placeholder="자세한 사유를 입력해주세요."></textarea>
@@ -227,7 +227,7 @@
 								<dl>
 									<div class="name">
 										<dt><span class="sr-only">배송지명</span></dt>
-										<dd th:text="${deliveryAddrInfo.recipNm}"></dd>
+										<dd id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></dd>
 									</div>
 									<div class="addr">
 										<dt><span class="sr-only">배송주소</span></dt>
@@ -235,9 +235,9 @@
 									</div>
 									<div class="phone">
 										<dt><span class="sr-only">휴대폰 번호</span></dt>
-										<dd th:text="${deliveryAddrInfo.recipPhnno}"></dd>
+										<dd id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></dd>
 									</div>
-									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>
+<!--									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>-->
 								</dl>
 							</div>
 						</div>
@@ -321,7 +321,7 @@
 			</div>
 			<div class="popup_con">
 				<div class="button_list clear">
-					<button type="button" qty=0 onclick="fnChangeExchangeQty(this);">
+					<button type="button" class="on" qty=0 onclick="fnChangeExchangeQty(this);">
 						<span>수량 0개</span>
 					</button>
 					<th:block th:each="num : ${#numbers.sequence(1, exchange.ordCanChgQty)}">
@@ -433,6 +433,7 @@ var fnExchange = function() {
 
 	// 교환옵션 설정
 	let cancelReqList = [];
+	let optionCnt = 0;
 	$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
 		if (chgOrdDtlNoArr.includes($(item).attr('ordDtlNo')) && !gagajf.isNull($(item).val())) {
 			let json 		= $(item).val();
@@ -449,14 +450,16 @@ var fnExchange = function() {
 				cancelReq.chgQty 			= chgOpt.chgQty;
 				cancelReqList.push(cancelReq);
 			});
+			
+			optionCnt++;
 		}
 	});
 
 	// 교환 수량 및 변경 옵션 체크
-	if (chgOrdDtlNoArr.length > cancelReqList.length) {
+	if (chgOrdDtlNoArr.length > optionCnt) {
 		mcxDialog.alert('교환하실 상품의 변경 옵션을 선택해주세요.');
 		return false;
-	} else if (chgOrdDtlNoArr.length < cancelReqList.length || chgOrdDtlNoArr.length == 0) {
+	} else if (chgOrdDtlNoArr.length < optionCnt || chgOrdDtlNoArr.length == 0) {
 		mcxDialog.alert('교환하실 상품의 수량을 선택해주세요.');
 		return false;
 	}
@@ -566,6 +569,7 @@ var fnChangeOptionCallback = function(param) {
 		if (goodsType == 'G056_S') {
 			html += '<div class="option">';
 			html += '	<em>'+itemNm+'</em>';
+			html += '	<em>'+colorNm+'</em>';
 			html += '	<em>'+optCd2+'</em>';
 			html += '</div>';
 		} else {

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

@@ -129,7 +129,7 @@
 								<!-- 입금대기 (1:1문의, 쇼핑백 담기) -->
 								<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
 									<div class="goods_btn_wrap btn_group_flex">
-										<div><button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+										<div><button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></div>
 										<div><button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 									</div>
 								</th:block>
@@ -147,7 +147,7 @@
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_40'">
 									<div class="goods_btn_wrap btn_group_flex">
 										<div>
-											<button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+											<button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
 												<span>1:1 문의</span>
 											</button>
 										</div>
@@ -475,7 +475,7 @@
 									<div class="goods_btn_wrap btn_group_flex">
 										<!-- 리뷰사용불가능, 리뷰등록후일때 -->
 										<th:block th:unless="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
-											<div><button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+											<div><button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></div>
 										</th:block>
 										<!-- //리뷰사용불가능, 리뷰등록후일때 -->
 

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

@@ -186,7 +186,7 @@ $(document).ready(function() {
 	// AJAX 로드를 위한 변수 설정
 	jsonObj = {
 		"pageNo" 			: 1
-		, "pageSize" 		: 5
+		, "pageSize" 		: 10
 		, "pageUnit" 		: 10
 		, "ordDtlStat" 		: ""
 		, "stDate" 			: ""
@@ -219,7 +219,7 @@ $(window).on("pageshow", function(event) {
 		// 인피니티스크롤 초기화
 		fnMypageOrderListInfiniteScrollInit();
 	}
-	
+
 	gagaInfiniteScroll.getHistory();
 });
 
@@ -249,18 +249,18 @@ var fnGetInfiniteScrollDataList = function() {
 	gagajf.ajaxJsonSubmit('/mypage/order/list/pre/info', JSON.stringify(jsonObj), function(result) {
 		let totalCount 	= result.paging.totalCount;
 		totalCnt 		= totalCount;
-		
+
 		getTotalPage(totalCount);
-		
+
 		gagaInfiniteScroll.pageStatus.totalCount = totalCount;
-		
+
 		let ordNoList = []; 
 		$.each(result.ordNoList, function(idx, item) {
 			ordNoList.push(item.ordNo);
 		});
 
 		jsonObj.ordNoList = ordNoList;
-		
+
 		if (ordNoList.length > 0) {
 			$.ajax({
 				type: "POST",
@@ -363,7 +363,7 @@ $('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
 // 인피니티 스크롤 초기화
 var fnMypageOrderListInfiniteScrollInit = function(){
 	sessionStorage.removeItem(document.location.href);
-	
+	localStorage.setItem('scrollpos', '0');
 	pageNo = 0;
 	
 	// History 초기화

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

@@ -127,7 +127,7 @@
 							<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
 								<div class="goods_btn_wrap btn_group_flex">
 									<div>
-										<button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+										<button type="button" class="btn btn_default btn_cncl_complete" onclick="fnGoToOneToOnePage();">
 											<span>1:1 문의</span>
 										</button>
 									</div>
@@ -156,7 +156,7 @@
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_40'">
 								<div class="goods_btn_wrap btn_group_flex">
 									<div>
-										<button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+										<button type="button" class="btn btn_default btn_cncl_complete" onclick="fnGoToOneToOnePage();">
 											<span>1:1 문의</span>
 										</button>
 									</div>
@@ -175,7 +175,7 @@
 									<!-- 교환불가 -->
 									<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
 										<div>
-											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+											<button type="button" class="btn btn_default btn_qna_write" onclick="fnGoToOneToOnePage();">
 												<span>1:1 문의</span>
 											</button>
 										</div>
@@ -202,7 +202,7 @@
 									<!-- 반품불가 -->
 									<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
 										<div>
-											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+											<button type="button" class="btn btn_default btn_qna_write" onclick="fnGoToOneToOnePage();">
 												<span>1:1 문의</span>
 											</button>
 										</div>
@@ -212,7 +212,7 @@
 									<!-- 교환불가, 반품불가 -->
 									<th:block th:if="${ordDtl.returnableYn} == 'N' and ${ordDtl.changeableYn} == 'N'">
 										<div>
-											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+											<button type="button" class="btn btn_default btn_qna_write" onclick="fnGoToOneToOnePage();">
 												<span>1:1 문의</span>
 											</button>
 										</div>
@@ -236,7 +236,7 @@
 									<!-- 교환불가 -->
 									<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
 										<div>
-											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+											<button type="button" class="btn btn_default btn_qna_write" onclick="fnGoToOneToOnePage();">
 												<span>1:1 문의</span>
 											</button>
 										</div>
@@ -263,7 +263,7 @@
 									<!-- 반품불가 -->
 									<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
 										<div>
-											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+											<button type="button" class="btn btn_default btn_qna_write" onclick="fnGoToOneToOnePage();">
 												<span>1:1 문의</span>
 											</button>
 										</div>
@@ -272,7 +272,7 @@
 									<!-- 교환불가, 반품불가 -->
 									<th:block th:if="${ordDtl.returnableYn} == 'N' and ${ordDtl.changeableYn} == 'N'">
 										<div>
-											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+											<button type="button" class="btn btn_default btn_qna_write" onclick="fnGoToOneToOnePage();">
 												<span>1:1 문의</span>
 											</button>
 										</div>
@@ -323,7 +323,7 @@
 									<!-- 리뷰사용불가능, 리뷰등록일때 -->
 									<th:block th:unless="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
 										<div>
-											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+											<button type="button" class="btn btn_default btn_qna_write" onclick="fnGoToOneToOnePage();">
 												<span>1:1 문의</span>
 											</button>
 										</div>

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

@@ -204,7 +204,7 @@
 								<dl>
 									<div class="name">
 										<dt><span class="sr-only">배송지명</span></dt>
-										<dd th:text="${deliveryAddrInfo.recipNm}"></dd>
+										<dd id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></dd>
 									</div>
 									<div class="addr">
 										<dt><span class="sr-only">배송주소</span></dt>
@@ -212,7 +212,7 @@
 									</div>
 									<div class="phone">
 										<dt><span class="sr-only">휴대폰 번호</span></dt>
-										<dd th:text="${deliveryAddrInfo.recipPhnno}"></dd>
+										<dd id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></dd>
 									</div>
 									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>
 								</dl>
@@ -246,7 +246,7 @@
 				<div class="tbl_wrap pay_wrap">
 					<div class="tbl_tit"> 
 						<h3>환불 정보</h3>
-						<strong class="pay"><span id="returnAmt"></span>원</strong>
+						<strong class="pay"><span id="returnAmt">0</span>원</strong>
 					</div>
 					<div class="tbl type1">
 						<table>
@@ -346,7 +346,7 @@
 			</div>
 			<div class="popup_con">
 				<div class="button_list clear">
-					<button type="button" qty=0 onclick="fnChangeReturnQty(this);"><span>수량 0개</span></button>
+					<button type="button" class="on" qty=0 onclick="fnChangeReturnQty(this);"><span>수량 0개</span></button>
 					<th:block th:each="num : ${#numbers.sequence(1, return.ordCanChgQty)}">
 						<button type="button" th:qty="${num}" onclick="fnChangeReturnQty(this);"><span th:text="|수량 ${num}개|"></span></button>
 					</th:block>
@@ -587,7 +587,7 @@ var fnReturn = function() {
 	data.bankCd 			= $('#returnForm input[name=bankCd]').val();
 	data.isCustomer 		= isCustomer;
 	data.wdGb 				= $('#returnForm input[name=wdGb]:radio:checked').val();
-	data.chgerNm 			= $('#chgerNm').text();
+	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();

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

@@ -80,7 +80,7 @@
 						</div>
 <!--						<div class="goods_btn_wrap btn_group_flex">-->
 <!--							<div>-->
-<!--								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">-->
+<!--								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
 <!--									<span>1:1 문의</span>-->
 <!--								</button>-->
 <!--							</div>-->

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

@@ -118,7 +118,7 @@
 						<div class="goods_btn_wrap btn_group_flex" th:if="${exchangeDtl.chgStat == 'G685_32' or exchangeDtl.chgStat == 'G685_21'}">
 							<div>
 								<button type="button" class="btn btn_default" th:attr="ordNo=${exchangeDtl.ordNo}, ordChgSq=${exchangeDtl.ordChgSq}" onclick="fnCrePayAddCost(this);">
-									<span>결재하기</span>
+									<span>결제하기</span>
 								</button>
 							</div>
 						</div>

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

@@ -94,12 +94,24 @@
 		</div>
 		<div class="popup_con">
 			<div class="button_list clear">
-				<button type="button" class="ordDtlStat on"><span>전체상태</span></button>
-				<th:block th:each="oneData, status : ${chgStatList}">
-					<button type="button" class="ordDtlStat" th:code="${oneData.cd}">
-						<span th:text="${oneData.cdNm}"></span>
-					</button>
-				</th:block>
+				<button type="button" class="ordDtlStat on" code=""><span>전체상태</span></button>
+				<button type="button" class="ordDtlStat" code="G685_91"><span>결제대기</span></button>
+				<button type="button" class="ordDtlStat" code="G685_20"><span>교환접수</span></button>
+				<button type="button" class="ordDtlStat" code="G685_50"><span>반품접수</span></button>
+				<button type="button" class="ordDtlStat" code="G685_30"><span>회수요청</span></button>
+				<button type="button" class="ordDtlStat" code="G685_31"><span>상품 검수중</span></button>
+				<button type="button" class="ordDtlStat" code="G685_34"><span>교환 진행중</span></button>
+				<button type="button" class="ordDtlStat" code="G685_33"><span>환불 진행중</span></button>
+				<button type="button" class="ordDtlStat" code="G685_40"><span>교환완료</span></button>
+				<button type="button" class="ordDtlStat" code="G685_60"><span>반품완료</span></button>
+				<button type="button" class="ordDtlStat" code="G685_92"><span>접수취소</span></button>
+				<button type="button" class="ordDtlStat" code="G685_93"><span>주문취소</span></button>
+				<button type="button" class="ordDtlStat" code="G685_94"><span>품절취소</span></button>
+<!--				<th:block th:each="oneData, status : ${chgStatList}">-->
+<!--					<button type="button" class="ordDtlStat" th:code="${oneData.cd}">-->
+<!--						<span th:text="${oneData.cdNm}"></span>-->
+<!--					</button>-->
+<!--				</th:block>-->
 			</div>
 		</div>
 	</div>
@@ -126,7 +138,7 @@ $(document).ready(function() {
 
 	jsonObj = {
 		"pageNo" 			: 1
-		, "pageSize" 		: 5
+		, "pageSize" 		: 10
 		, "pageUnit" 		: 10
 		, "chgStat" 		: ""
 		, "stDate" 			: ""

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

@@ -12,8 +12,21 @@
 				<th:block th:each="cre , i : ${creList.creList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 					<div class="goods_section">
 						<div class="goods_status">
-							<p class="dlvr_staus" th:text="${cre.chgStatNm}"></p>
-							<p class="dlvr_desc"><th:block th:text="|${cre.chgDate} ${cre.chgTime}|"></p>
+							<!-- 상태값 처리 -->
+							<p class="dlvr_staus" th:if="${cre.chgStat == 'G685_17' or cre.chgStat == 'G685_18'}">주문취소</p>
+							<th:block th:if="${cre.chgStat == 'G685_40'}" th:each="exchange, index : ${creList.exchangeOptionList}">
+								<p class="dlvr_staus" th:if="${cre.chgOrdDtlNo == exchange.ordDtlNo && (exchange.ordDtlStat == 'G013_20' or exchange.ordDtlStat == 'G013_30' or exchange.ordDtlStat == 'G013_35' or exchange.ordDtlStat == 'G013_40' or exchange.ordDtlStat == 'G013_50')}">교환진행중</p>
+								<p class="dlvr_staus" th:if="${cre.chgOrdDtlNo == exchange.ordDtlNo && (exchange.ordDtlStat == 'G013_60' or exchange.ordDtlStat == 'G013_70')}">교환완료</p>
+							</th:block>
+							<p class="dlvr_staus" th:if="${cre.chgStat == 'G685_33'}">환불진행중</p>
+							<p class="dlvr_staus" th:if="${cre.chgStat == 'G685_21' or cre.chgStat == 'G685_51'}">결제대기</p>
+							<p class="dlvr_staus" th:if="${cre.chgStat == 'G685_49' or cre.chgStat == 'G685_69'}">접수취소</p>
+							<p class="dlvr_staus" th:unless="${cre.chgStat == 'G685_17' or cre.chgStat == 'G685_18' or cre.chgStat == 'G685_40' or cre.chgStat == 'G685_33' or cre.chgStat == 'G685_21' or cre.chgStat == 'G685_51' or cre.chgStat == 'G685_49' or cre.chgStat == 'G685_69'}" th:text="${cre.chgStatNm}"></p>
+							<!-- //상태값 처리 -->
+
+							<!-- 상태값 변경 일시 -->
+							<p class="dlvr_desc" th:text="|${cre.chgDate} ${cre.chgTime}|"></p>
+							<!-- //상태값 변경 일시 -->
 						</div>
 						<div class="goods_detail">
 							<a href="javascript:void(0)" th:attr="goodsCd=${cre.goodsCd}" onclick="fnGoToGoodsDetail(this)">
@@ -26,10 +39,10 @@
 											<span th:text="${cre.brandNm}"></span>
 											<div class="badge_wrap">
 												<th:block th:if="${cre.shotDelvYn} == 'Y'">
-													<em class="order_badge">STYLE24 일반배송</em>
+													<em class="order_badge order_bullet_badge">총알배송</em>
 												</th:block>
 												<th:block th:if="${cre.selfGoodsYn} == 'Y' and ${cre.shotDelvYn} == 'N'">
-													<em class="order_badge order_bullet_badge">총알배송</em>
+													<em class="order_badge">STYLE24 일반배송</em>
 												</th:block>
 												<th:block th:if="${cre.selfGoodsYn} == 'N' and ${cre.shotDelvYn} == 'N'">
 													<em class="order_badge order_bullet_badge">업체직배송</em>
@@ -112,7 +125,7 @@
 							<th:block th:if="${cre.chgStat} == 'G685_21' or ${cre.chgStat} == 'G685_51' or ${cre.chgStat} == 'G685_32'">
 								<div>
 									<button type="button" class="btn btn_default" th:ordNo="${cre.ordNo}" th:ordChgSq="${cre.ordChgSq}" onclick="fnCrePayAddCost(this);">
-										<span>결재하기</span>
+										<span>결제하기</span>
 									</button>
 								</div>
 							</th:block>
@@ -156,7 +169,7 @@
 						</th:block>
 						<!-- //상품검수중(교환) -->
 						<!-- 결제대기(교환) -->
-						<th:block th:if="${cre.chgStat} == 'G685_32' and ${cre.chgGb} == 'G680_40'">
+						<th:block th:if="${cre.chgStat == 'G685_21' or (cre.chgGb == 'G680_40' and cre.chgStat == 'G685_32')}">
 							<div class="goods_txt">
 								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 결제 후 교환 가능합니다.|"></p>
 							</div>

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

@@ -92,7 +92,7 @@
 						<div class="goods_btn_wrap btn_group_flex" th:if="${returnDtl.chgStat == 'G685_32' or returnDtl.chgStat == 'G685_51'}">
 							<div>
 								<button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}" onclick="fnCrePayAddCost(this);">
-									<span>결재하기</span>
+									<span>결제하기</span>
 								</button>
 							</div>
 						</div>

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

@@ -17,7 +17,7 @@
 
 <th:block layout:fragment="content">
 <main role="" id="noMemberDeliveryInfoForm" class="container my">
-	<section class="content my_order">
+	<section class="content my_goodsy">
 		<div class="inner wide bg_beige">
 			<div class="order_number">
 				<dl class="clear">
@@ -175,13 +175,13 @@
 									<!-- //교환불가능, 반품불가능 -->
 
 									<!-- 교환불가능 -->
-									<th:block th:if="${ordDtl.changeableYn} == 'N'">
+									<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
 										<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.</p>
 									</th:block>
 									<!-- //교환불가능 -->
 
 									<!-- 반품불가능 -->
-									<th:block th:if="${ordDtl.returnableYn} == 'N'">
+									<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
 										<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.</p>
 									</th:block>
 									<!-- //반품불가능 -->

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

@@ -226,7 +226,7 @@
 								<dl>
 									<div class="name">
 										<dt><span class="sr-only">배송지명</span></dt>
-										<dd th:text="${deliveryAddrInfo.recipNm}"></dd>
+										<dd id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></dd>
 									</div>
 									<div class="addr">
 										<dt><span class="sr-only">배송주소</span></dt>
@@ -234,9 +234,9 @@
 									</div>
 									<div class="phone">
 										<dt><span class="sr-only">휴대폰 번호</span></dt>
-										<dd th:text="${deliveryAddrInfo.recipPhnno}"></dd>
+										<dd id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></dd>
 									</div>
-									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>
+<!--									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>-->
 								</dl>
 							</div>
 						</div>
@@ -435,6 +435,7 @@ var fnExchange = function() {
 
 	// 교환옵션 설정
 	let cancelReqList = [];
+	let optionCnt = 0;
 	$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
 		if (chgOrdDtlNoArr.includes($(item).attr('ordDtlNo')) && !gagajf.isNull($(item).val())) {
 			let json 		= $(item).val();
@@ -451,14 +452,16 @@ var fnExchange = function() {
 				cancelReq.chgQty 			= chgOpt.chgQty;
 				cancelReqList.push(cancelReq);
 			});
+			
+			optionCnt++;
 		}
 	});
 
 	// 교환 수량 및 변경 옵션 체크
-	if (chgOrdDtlNoArr.length > cancelReqList.length) {
+	if (chgOrdDtlNoArr.length > optionCnt) {
 		mcxDialog.alert('교환하실 상품의 변경 옵션을 선택해주세요.');
 		return false;
-	} else if (chgOrdDtlNoArr.length < cancelReqList.length || chgOrdDtlNoArr.length == 0) {
+	} else if (chgOrdDtlNoArr.length < optionCnt || chgOrdDtlNoArr.length == 0) {
 		mcxDialog.alert('교환하실 상품의 수량을 선택해주세요.');
 		return false;
 	}
@@ -568,6 +571,7 @@ var fnChangeOptionCallback = function(param) {
 		if (goodsType == 'G056_S') {
 			html += '<div class="option">';
 			html += '	<em>'+itemNm+'</em>';
+			html += '	<em>'+colorNm+'</em>';
 			html += '	<em>'+optCd2+'</em>';
 			html += '</div>';
 		} else {

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

@@ -126,7 +126,7 @@ $(document).ready(function() {
 	// AJAX 로드를 위한 변수 설정
 	jsonObj = {
 		"pageNo" 			: 1
-		, "pageSize" 		: 5
+		, "pageSize" 		: 10
 		, "pageUnit" 		: 10
 		, "ordDtlStat" 		: ""
 		, "stDate" 			: ""

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

@@ -203,7 +203,7 @@
 								<dl>
 									<div class="name">
 										<dt><span class="sr-only">배송지명</span></dt>
-										<dd th:text="${deliveryAddrInfo.recipNm}"></dd>
+										<dd id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></dd>
 									</div>
 									<div class="addr">
 										<dt><span class="sr-only">배송주소</span></dt>
@@ -211,7 +211,7 @@
 									</div>
 									<div class="phone">
 										<dt><span class="sr-only">휴대폰 번호</span></dt>
-										<dd th:text="${deliveryAddrInfo.recipPhnno}"></dd>
+										<dd id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></dd>
 									</div>
 									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>
 								</dl>
@@ -245,7 +245,7 @@
 				<div class="tbl_wrap pay_wrap">
 					<div class="tbl_tit"> 
 						<h3>환불 정보</h3>
-						<strong class="pay"><span id="returnAmt"></span>원</strong>
+						<strong class="pay"><span id="returnAmt">0</span>원</strong>
 					</div>
 					<div class="tbl type1">
 						<table>
@@ -345,7 +345,7 @@
 			</div>
 			<div class="popup_con">
 				<div class="button_list clear">
-					<button type="button" qty=0 onclick="fnChangeReturnQty(this);"><span>수량 0개</span></button>
+					<button type="button" class="on" qty=0 onclick="fnChangeReturnQty(this);"><span>수량 0개</span></button>
 					<th:block th:each="num : ${#numbers.sequence(1, return.ordCanChgQty)}">
 						<button type="button" th:qty="${num}" onclick="fnChangeReturnQty(this);"><span th:text="|수량 ${num}개|"></span></button>
 					</th:block>
@@ -592,7 +592,7 @@ var fnReturn = function() {
 	data.bankCd 			= $('#returnForm input[name=bankCd]').val();
 	data.isCustomer 		= isCustomer;
 	data.wdGb 				= $('#returnForm input[name=wdGb]:radio:checked').val();
-	data.chgerNm 			= $('#chgerNm').text();
+	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();

src/main/webapp/WEB-INF/views/mob/order/OrderAddPaymentFormMob.html

@@ -19,6 +19,7 @@
 <!-- payment.js -->
 <script type="text/javascript" th:src="${@environment.getProperty('pg.kcp.js.url')}" src=""></script>
 <script type="text/javascript" src="/biz/payment.js"></script>
+<script type="text/javascript" src="/ux/plugins/approval_key.js" charset='euc-kr'></script>
 
 <!-- 주문정보form -->
 <form id="order_info" name="order_info" method="post" action="/order/addPay/result/response" style="display:none"></form>
@@ -67,7 +68,7 @@
 															<div class="info_box">
 																<div class="od_name">
 																	<div class="brand">
-																		<span th:text="${goods.brandGroupNm"></span>
+																		<span th:text="${goods.brandGroupNm}"></span>
 																	</div>
 																	<div class="name" th:text="${goods.goodsNm}"></div>
 																</div>
@@ -233,7 +234,7 @@
 </form>
 
 <script th:inline="javascript">
-//결재하기
+//결제하기
 $("#btn_payment").on("click", function(){
 	var paynormal			= $("input[name='rdi-paynormal']:checked").val();
 	var paynormalArr		= paynormal.split("|");
@@ -274,7 +275,9 @@ $("#btn_payment").on("click", function(){
 			} else if (pgGb == "KAKAO") {
 				fnKakaoPaymentReady();
 			} else if (pgGb == "KCP" || pgGb == "PAYCO") {
-				jsf__pay(document.order_info);
+				//jsf__pay(document.order_info);
+				$("#order_info input[name=Ret_URL]").val("http:" + _frontUrl + "/order/pay/result/response");
+				kcp_AJAX();
 			}
 		}
 	});

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -985,7 +985,7 @@ var paymentInfoSet = function() {
 					$("#orderForm .area_paymentinfo .paymentinfo.agree2").hide();
 				}
 
-				// 결재하기
+				// 결제하기
 				$("#btn_payment").on("click", function(){
 					// 사은품정보
 					var prePntDcAmtYn		= $("#orderForm input[name='rdi-beforpoint']:checked").val();

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

@@ -91,7 +91,7 @@
 											</p>
 										</div>
 										<div class="button_box">
-											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 										</div>
 									</div>
 								</div>

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

@@ -103,7 +103,7 @@
 <!--											<p th:if="${exchangeDtl.chgStat == 'G685_20' or exchangeDtl.chgStat == 'G685_21'}"><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${exchangeDtl.ordNo}, ordChgSq=${exchangeDtl.ordChgSq}, cancelGb=${exchangeDtl.chgGb}" onclick="fnCreCancel(this);"><span>신청취소</span></button></p>-->
 											<p th:if="${exchangeDtl.chgStat == 'G685_32' or exchangeDtl.chgStat == 'G685_21'}"><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${exchangeDtl.ordNo}, ordChgSq=${exchangeDtl.ordChgSq}" onclick="fnCrePayAddCost(this);"><span>결제하기</span></button></p>
 											<p th:if="${exchangeDtl.chgStat == 'G685_40' and exchangeDtl.ordDtlStat == 'G013_50'}"><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${exchangeDtl.ordNo}, ordDtlNo=${exchangeDtl.ordDtlNo}, shipCompCd=${exchangeDtl.exchangeShipCompCd}, invoiceNo=${exchangeDtl.exchangeInvoiceNo}" onclick="fnGoToDelivery(this);"><span>배송조회</span></button></p>
-											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 										</div>
 									</div>
 									<!-- 교환결제대기 -->

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

@@ -454,7 +454,7 @@
 							}
 						});
 					}
-					tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>\n';
+					tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';
 					tag += '										</div>\n';
 					tag += '									</div>\n';
 					//if (cre.chgStat == 'G685_10') {

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

@@ -94,7 +94,7 @@
 										<div class="button_box">
 <!--											<p th:if="${returnDtl.chgStat == 'G685_50' or returnDtl.chgStat == 'G685_51'}"><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}, cancelGb=${returnDtl.chgGb}" onclick="fnCreCancel(this);"><span>신청취소</span></button></p>-->
 											<p th:if="${returnDtl.chgStat == 'G685_32' or returnDtl.chgStat == 'G685_51'}"><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}" onclick="fnCrePayAddCost(this);"><span>결제하기</span></button></p>
-											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 										</div>
 									</div>
 									<!-- 반품결제대기 -->

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

@@ -142,19 +142,19 @@
 
 														<!-- 교환 신청 불가 상품 -->
 														<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">
-															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
 														</th:block>
 
 														<!-- 반품 신청 불가 상품 -->
 														<th:block th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></p>
-															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 														</th:block>
 
 														<!-- 교환/반품 신청 불가 상품 -->
 														<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">
-															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 														</th:block>
 													</th:block>
 
@@ -180,7 +180,7 @@
 
 													<!-- 1:1문의 버튼(입금대기, 배송준비중, 구매확정) -->
 													<th:block th:if="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_40' or (ordDtl.ordDtlStat == 'G013_70' and (ordDtl.reviewableYn == 'N' or ordDtl.reviewSq > 0))}">
-														<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+														<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 													</th:block>
 												</th:block>
 											</div>

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

@@ -427,6 +427,7 @@
 
 		// 교환옵션 설정
 		let cancelReqList = [];
+		let optionCnt = 0;
 		$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
 			if (chgOrdDtlNoArr.includes($(item).attr('ordDtlNo')) && !gagajf.isNull($(item).val())) {
 				let json = $(item).val();
@@ -443,14 +444,16 @@
 					cancelReq.chgQty = chgOpt.chgQty;
 					cancelReqList.push(cancelReq);
 				});
+				
+				optionCnt++;
 			}
 		});
 
 		// 교환 수량 및 변경 옵션 체크
-		if (chgOrdDtlNoArr.length > cancelReqList.length) {
+		if (chgOrdDtlNoArr.length > optionCnt) {
 			mcxDialog.alert('교환하실 상품의 변경 옵션을 선택해주세요.');
 			return false;
-		} else if (chgOrdDtlNoArr.length < cancelReqList.length || chgOrdDtlNoArr.length == 0) {
+		} else if (chgOrdDtlNoArr.length < optionCnt || chgOrdDtlNoArr.length == 0) {
 			mcxDialog.alert('교환하실 상품의 수량을 선택해주세요.');
 			return false;
 		}

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

@@ -148,19 +148,19 @@
 															
 															<!-- 교환 신청 불가 상품 -->
 															<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">
-																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 																<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
 															</th:block>
 	
 															<!-- 반품 신청 불가 상품 -->
 															<th:block th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">
 																<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></p>
-																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 															</th:block>
 	
 															<!-- 교환/반품 신청 불가 상품 -->
 															<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">
-																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 															</th:block>
 														</th:block>
 														
@@ -186,7 +186,7 @@
 	
 														<!-- 1:1문의 버튼(입금대기, 배송준비중, 구매확정) -->
 														<th:block th:if="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_40' or (ordDtl.ordDtlStat == 'G013_70' and (ordDtl.reviewableYn == 'N' or ordDtl.reviewSq > 0))}">
-															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
 														</th:block>
 													</th:block>
 												</div>
@@ -346,7 +346,7 @@
 										<th>
 											선물 메세지
 										</th>
-										<td th:text="${orderInfo.giftMsg}" id="giftMsg"></td>
+										<td th:text="${deliveryAddrInfo.giftMsg}" id="giftMsg"></td>
 									</tr>
 									<!-- 주문 -->
 									<tr th:unless="${oneData.giftPackYn == 'Y'}">
@@ -502,7 +502,7 @@
 	let orderAmtInfo = [[${orderAmtInfo}]];
 	let deliveryAddrInfo = [[${deliveryAddrInfo}]];
 	let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
-	let giftMsg = [[${orderInfo.giftMsg}]];
+	let giftMsg = [[${deliveryAddrInfo.giftMsg}]];
 	let jsonObj = {};
 
 	$(document).ready(function() {

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

@@ -521,11 +521,11 @@
 							// 반품 신청 불가 상품
 							else if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'N') {
 								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
-								tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>\n';
+								tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';
 							}
 							// 교환/반품 신청 불가 상품
 							else {
-								tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>\n';
+								tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';
 							}
 						}
 
@@ -551,7 +551,7 @@
 
 						// 1:1문의 버튼(구매확정)
 						if (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_40' || (ordDtl.ordDtlStat == 'G013_70' && (ordDtl.reviewableYn == 'N' || ordDtl.reviewSq > 0))) {
-							tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>\n';
+							tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';
 						}
 					}
 					tag += '										</div>\n';

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

@@ -425,6 +425,7 @@
 
 		// 교환옵션 설정
 		let cancelReqList = [];
+		let optionCnt = 0;
 		$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
 			if (chgOrdDtlNoArr.includes($(item).attr('ordDtlNo')) && !gagajf.isNull($(item).val())) {
 				let json = $(item).val();
@@ -441,14 +442,16 @@
 					cancelReq.chgQty = chgOpt.chgQty;
 					cancelReqList.push(cancelReq);
 				});
+				
+				optionCnt++;
 			}
 		});
 
 		// 교환 수량 및 변경 옵션 체크
-		if (chgOrdDtlNoArr.length > cancelReqList.length) {
+		if (chgOrdDtlNoArr.length > optionCnt) {
 			mcxDialog.alert('교환하실 상품의 변경 옵션을 선택해주세요.');
 			return false;
-		} else if (chgOrdDtlNoArr.length < cancelReqList.length || chgOrdDtlNoArr.length == 0) {
+		} else if (chgOrdDtlNoArr.length < optionCnt || chgOrdDtlNoArr.length == 0) {
 			mcxDialog.alert('교환하실 상품의 수량을 선택해주세요.');
 			return false;
 		}

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

@@ -225,7 +225,7 @@ $(document).on('click','.area_paymentinfo .payinfo_blk a',function(e){
 	return false;
 });
 
-//결재하기
+//결제하기
 $("#btn_payment").on("click", function(){
 	var paynormal			= $("input[name='rdi-paynormal']:checked").val();
 	var paynormalArr		= paynormal.split("|");

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

@@ -984,7 +984,7 @@ var paymentInfoSet = function() {
 					$("#orderForm .area_paymentinfo").hide();
 				}
 				
-				// 결재하기
+				// 결제하기
 				$("#btn_payment").on("click", function(){
 					// 사은품정보
 					var prePntDcAmtYn		= $("#orderForm input[name='rdi-beforpoint']:checked").val();

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

@@ -707,7 +707,7 @@ var paymentInfoSet = function(jsonData) {
 				$("#paymentInfo").css("display", "block");
 				$("#paymentInfo").html(result);
 				
-				// 결재하기
+				// 결제하기
 				$("#btn_payment").on("click", function(){
 					// 사은품정보
 					var prePntDcAmtYn		= $("input[name='rdi-beforpoint']:checked").val();

src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html

@@ -158,7 +158,7 @@
 								    tag += '                                   <img alt="" class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + goods.sysImgNm + '?RS=1000">\n';
 								    tag += '                               </div>\n';
 								    tag += '                               <div class="itemName">' + goods.goodsNm + '</div>\n';
-								    tag += '                               <p class="itemPrice"' + goods.currPrice.addComma() + '</p>\n';
+								    tag += '                               <p class="itemPrice">' + goods.currPrice.addComma() + '</p>\n';
 								    tag += '                           </a>\n';
 								    tag += '                       </div>\n';
 								    tag += '                   </div>\n';

src/main/webapp/biz/mypage.js

@@ -75,6 +75,15 @@ var fnGoToGoodsDetail = function(param) {
 	cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
 }
 
+// 1:1문의 페이지 이동 처리
+var fnGoToOneToOnePage = function(param) {
+	// 2021.05.27 인피니스크롤위치이동
+	let scrollpos = $(window).scrollTop();
+	localStorage.setItem('scrollpos', scrollpos);
+	
+	cfnGoToPage(_PAGE_ONETOONE_QNA);
+}
+
 // 배송조회 버튼 클릭 이벤트
 var fnGoToDelivery = function(param, noMember) {
 	// 2021.05.27 인피니스크롤위치이동