오류 수정

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

@@ -336,6 +336,7 @@
 			 , DF.REAL_DELV_AMT
 			 , P.PAY_AMT
 			 , P.NPAY_PNT_AMT
+			 , P.PG_CPN_AMT
 		  FROM TB_ORDER_DETAIL OD
 		  LEFT OUTER JOIN (
 			  SELECT ORD_NO
@@ -348,8 +349,9 @@
 		    ON OD.ORD_NO = DF.ORD_NO
 		  LEFT OUTER JOIN (
 		      SELECT ORD_NO
-		           , SUM(PAY_AMT)    AS PAY_AMT
+		           , SUM(PAY_AMT)         AS PAY_AMT
 		           , SUM(NPAY_PNT_AMT)    AS NPAY_PNT_AMT
+		           , SUM(PG_CPN_AMT)      AS PG_CPN_AMT
 		        FROM TB_PAYMENT
 		       WHERE ORD_NO = #{ordNo}
 		       GROUP BY ORD_NO

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

@@ -642,10 +642,10 @@
 											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.npayPntAmt, 1, 'COMMA')}|"></span>원</div></dd>
 										</div>
 									</th:block>
-									<th:block th:if="${paymentInfo.pgCpnAmt} > 0">
+									<th:block th:if="${orderAmtInfo.pgCpnAmt} > 0">
 										<div>
 											<dt>제휴 할인</dt>
-											<dd><div><span th:text="|- ${#numbers.formatInteger(paymentInfo.pgCpnAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.pgCpnAmt, 1, 'COMMA')}|"></span>원</div></dd>
 										</div>
 									</th:block>
 									<th:block th:if="${orderAmtInfo.savePntAmt} > 0">

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

@@ -412,9 +412,9 @@
 												<dt>마일리지 사용</dt>
 												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.npayPntAmt, 1, 'COMMA')}|"></em>원</dd>
 											</div>
-											<div class="include_item" th:if="${paymentInfo.pgCpnAmt > 0}">
+											<div class="include_item" th:if="${orderAmtInfo.pgCpnAmt > 0}">
 												<dt>제휴할인</dt>
-												<dd><em th:text="|- ${#numbers.formatInteger(paymentInfo.pgCpnAmt, 1, 'COMMA')}|"></em>원</dd>
+												<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.pgCpnAmt, 1, 'COMMA')}|"></em>원</dd>
 											</div>
 										</dl>
 									</td>
@@ -424,7 +424,7 @@
 												<dt>결제 금액</dt>
 												<dd>
 													<div class="price">
-														<span class="pay_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.payAmt - orderAmtInfo.npayPntAmt, 1, 'COMMA')}"></em>원</span>
+														<span class="pay_total_price"><em th:text="${#numbers.formatInteger(orderAmtInfo.payAmt - orderAmtInfo.npayPntAmt - orderAmtInfo.pgCpnAmt, 1, 'COMMA')}"></em>원</span>
 													</div>
 												</dd>
 											</div>

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

@@ -390,13 +390,16 @@
 		$.each($('#returnForm input[name=chgQty]'), function(idx, item) {
 			let chgQty = $(item).val();
 			let ordDtlNo = $(item).attr('ordDtlNo');
-
+			console.log(chgQty);
 			if (chgQty > 0) {
 				ordDtlNoArr.push(Number(ordDtlNo));
 				cnclRtnReqQtyArr.push(Number(chgQty));
 				chkQty += chgQty;
 			}
 		});
+		
+		console.log(ordDtlNoArr);
+		console.log(cnclRtnReqQtyArr);
 
 		// 반품 수량 체크
 		if (chkQty == 0) {
@@ -522,10 +525,11 @@
 				let spanTotRtnDelvFee = Number(result.spanTotRtnDelvFee);				// 반품배송비 (회수요청으로 인한 반품 배송비)
 				let spanRealCnclRtnAmt = Number(result.spanRealCnclRtnAmt);				// 환불 상품 실결제 금액 (환불상품금액 - 할인차감금액)
 				let spanRefundAmt = spanRealCnclRtnAmt + sumDeliveryFee;				// 환불예정금액 (환불상품실결제금액 + 원주문배송비)
-				
+
 				// 반품 사유 및 반품 방식 배송비 계산
 				if (result.spanRealCnclRtnAmt > 0) {
 					let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
+
 					// 회사사유 : 추가배송비 0, 반품배송비 0
 					if (!isCustomer) {
 						spanTotRtnDelvFee = 0;
@@ -539,8 +543,7 @@
 					spanTotRtnDelvFee = 0;
 					spanTotDeliveryFee = 0;
 				}
-				console.log('spanTotRtnDelvFee : '+spanTotRtnDelvFee);
-				console.log('spanTotDeliveryFee : '+spanTotDeliveryFee);
+
 				let goodsCancelAmt = spanCnclRtnAmt;										// 상품취소금액
 				let addDelvFee = spanTotRtnDelvFee + spanTotDeliveryFee;					// 추가배송비
 				let deductDcAmt = spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;			// 할인금액 차감(쿠폰+다다익선+선포인트)

src/main/webapp/ux/mo/css/style24_m.css

@@ -2267,6 +2267,13 @@ main.container .shopping_bag .inner:last-child {padding-bottom: 0;}
 .shopping_bag .inner {padding:3rem 2rem;}
 .shopping_bag .inner.wide {padding: 0;}
 .shopping_bag .btn_delete {position: absolute; top: 0; right: 0; z-index: 9; width: 4rem; height: 4rem; background: url(/images/mo/ico_itemdelete_btn.png) no-repeat center/1.2rem; background-position: center;}
+
+.shopping_bag .tip1 .tip_contents{width: 32.5rem;transform: translate(-70%, 1.0rem);}
+.shopping_bag .tip1 .tip_contents:before,
+.shopping_bag .tip1 .tip_contents:after{left: 72.2%;}
+.shopping_bag .tip_wrap ul li{position: relative;padding-left: 1.0rem;font-weight: 200;font-size: 1.3rem;}
+.shopping_bag .tip_wrap ul li::before{content: '';position: absolute;top: 7px;left: 0;background: #858585;width: 0.2rem;height: 0.2rem;}
+
 .shopping_bag .inner:nth-child(2) {padding:1.5rem 2rem;}
 .shopping_bag .nodata {min-height:13rem; line-height:13rem; text-align: center;}
 .shopping_bag .nodata p {color: #888;}
@@ -2562,4 +2569,10 @@ main.container .od_extra .inner:last-child {padding-bottom: 0;}
 .popup_main_notice.half .popup_content .popup_header {position: relative; background:transparent; height: 6rem; padding: 2.2rem;}
 .popup_main_notice.half .popup_content .popup_header::after {content:''; clear:both; display:block;}
 .popup_main_notice.half .popup_content .popup_header a.btn_underline {display:inline-block; float:left; color:#fff; font-size:1.3rem; font-weight:200; border-color:#fff; opacity: 0.4; padding-top: 0.2rem;}
-.popup_main_notice.half .popup_content .popup_header a.btn_popup_close {position: absolute; top: 0; right: 0; width: 6rem; height: 6rem; background: url(/images/mo/btn_main_pop_arrow.png) no-repeat center; background-size:1.6rem; text-indent:-999em;}
+.popup_main_notice.half .popup_content .popup_header a.btn_popup_close {position: absolute; top: 0; right: 0; width: 6rem; height: 6rem; background: url(/images/mo/btn_main_pop_arrow.png) no-repeat center; background-size:1.6rem; text-indent:-999em;}
+
+/* popup_마이페이지 회수조회 팝업 */
+.modal.reclaim_pop {}
+.modal.reclaim_pop .modal-body {margin-top: 8rem;}
+.modal.reclaim_pop .modal-body .pop_cont {color:#222;}
+.modal.reclaim_pop .modal-body .pop_cont .tbl_wrap .tbl {border-bottom: 1px solid #ddd; padding-bottom: 1.5rem;}

src/main/webapp/ux/pc/css/layout.css

@@ -64,7 +64,7 @@ header .common_header {}
 .gnb .nav .bundle > li:last-child > a::after{content: ''; display: block; width: 1px; height: 18px; background: #4e4e4e; position: absolute; top:50%; bottom:auto; right: -20px; left:auto; transform: translateY(-50%);}
 .gnb .nav .bundle:last-child > li > a::after{content: ''; display: none;}
 .gnb .nav .bundle > li > .depth_menu {}
-.depth_menu {position:absolute; top:80px; left:0; width:100%; background:#fff; color:#222; z-index:150; display:none;}
+.depth_menu {position:absolute; top:80px; left:0; width:100%; background:#fff; color:#222; z-index:150; display:none;height: 450px;}
 .depth_menu::after {content:''; display: block; clear:both;}
 .depth_menu .head_category {position:relative; float:left; width: 68.75%;padding:50px 70px;padding: 50px 70px 50px 240px;}
 .depth_menu .head_category .tit {position:absolute; width:170px; left:70px;}
@@ -95,7 +95,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .more_category .cate_list ul li a {display:block; padding:5px; color:#fff; font-size:19px;}
 .more_category .cate_list ul li a:hover {color:#fd4801; text-decoration:underline;}
 
-.depth_menu .head_banner {float:left; width: 31.25%; background: #f5f5f5; padding:50px 70px;}
+.depth_menu .head_banner {float:left; width: 31.25%; background: #f5f5f5; padding:50px 70px;height: 450px;}
 .depth_menu .head_banner .tit p {font-size: 24px; font-weight: 500; margin-bottom: 20px; }
 .depth_menu .head_banner li {float:left; width:49%;}
 .depth_menu .head_banner li:first-child {margin-right:2%;}
@@ -430,7 +430,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 #quick_menu .wishlist .shape:after {height: 18px; border-left:10px solid #fd4802;}
 #quick_menu .wishlist .shape span {width: 100%; font-size: 13px; font-weight: 300;}
 #quick_menu .wishlist .itemLike {top: 10px;}
-#quick_menu .wishlist .hover_con {z-index:3; position: absolute; left: 0; top: 0; width: 100%; height: 100%; background: rgba(0,0,0,.4); display: none;}
+#quick_menu .wishlist .hover_con {z-index:98; position: absolute; left: 0; top: 0; width: 100%; height: 100%; background: rgba(0,0,0,.4); display: none;}
 #quick_menu .wishlist .hover_con .cart_btn {position: absolute; top: 50%; left: 50%; transform:translate(-50%, -50%);}
 #quick_menu .wishlist .item_prod:hover .hover_con {display: block;}
 #quick_menu .wishlist .itemsGrp .item_prod .cart_btn {width: 91px; border:1px solid #ddd; font-size: 13px; padding: 6px 0;}
@@ -1766,7 +1766,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.dp_best_top100 .ui_row .ui_col_12 .form_field {justify-content: flex-end;}
 	.dp_best_top100 .ui_row .ui_col_12 .select_custom {width:180px;}
 	.dp_best_top100 .ui_row .ui_col_12 .select_custom:first-child {margin-right: 10px;}
-	.dp_best_top100 .select_custom .combo .list {border-top:1px solid #ddd;}
+	.dp_best_top100 .select_custom .combo .list {border-top:1px solid #ddd; z-index: 99;}
 	.dp_best_top100 .select_custom .combo .list > li {padding-left:15px; padding-right:15px; font-size:14px; line-height:40px;}
 	.dp_best_top100 .select_custom .combo .select {font-size: 14px; padding:14px 15px;}
 	.dp_best_top100 .list_content .item_prod {width: 20%;}
@@ -2682,7 +2682,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 
 	.pd_detail .area_desc .desc_wrap {/*position:absolute; right:auto; top:0; background:#eee*/width:500px; z-index:2;}
 	.pd_detail .area_desc .desc_wrap.absbottom {position:absolute; top:auto; bottom:0px;}
-	.pd_detail .area_desc .desc_wrap.fixbottom {position:fixed; top: 100px; bottom:0px;}
+	.pd_detail .area_desc .desc_wrap.fixbottom {position:fixed; top: auto; bottom:0px;}
 	
 	.pd_detail .area_desc .desc_wrap .timer_box {position:relative; padding-bottom:30px;}
 	.pd_detail .area_desc .desc_wrap .timer_box::after{content:''; position:absolute; right:-12px; bottom:18px; border:12px solid transparent; border-top:12px solid #fff; transform:rotate(-45deg);}
@@ -3074,7 +3074,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_desc_wrap .item_descrp .area_option {float:right;}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap {width:500px; padding-left:60px; padding-top:30px;}
 	/* .pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop {position:fixed; right:70px; top:80px; width:500px;} */
-	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop {position:fixed; right:70px; top:80px; width:500px;height: calc(100% - 11%);}
+	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop {position:fixed; right:70px; bottom:80px; width:500px;height: calc(100% - 11%);}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop .option_box {overflow-y: auto; height: calc(100% - 25%);}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.absbottom {position:absolute; top:auto; bottom:0px; right:70px;}
 	@media screen and (max-width:1459px) {
@@ -3325,7 +3325,9 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
     .modal[class*="reviewdetail_pop"] .detail .review .review_cont .response_box > div dl div {float:left; width:50%;}
     .modal[class*="reviewdetail_pop"] .detail .review .review_cont .response_box > div.full dl div {width:100%}
 	.modal[class*="reviewdetail_pop"] .detail .review .review_cont .response_box > div dl div dt {float:left; width:60px; color:#888}
-	.modal[class*="reviewdetail_pop"] .detail .review .review_cont .response_box > div dl div dd {float:left; margin-left:20px; color:#fd4802}    
+	.modal[class*="reviewdetail_pop"] .detail .review .review_cont .response_box > div dl div dd {float:left; margin-left:20px; color:#fd4802}
+	.modal[class*="reviewdetail_pop"] .detail .review .review_cont .response_box > div dl div dd p{margin-bottom:0.4rem;}
+	.modal[class*="reviewdetail_pop"] .detail .review .review_cont .response_box > div dl div dd p:last-child{margin-bottom:0;}
     .modal[class*="reviewdetail_pop"] .detail .review .review_cont .txt_review_box {color:#666; font-size:14px; line-height:24px;}
     .modal[class*="reviewdetail_pop"] .detail .review .review_cont .writer_box {}
     .modal[class*="reviewdetail_pop"] .detail .review .review_cont .writer_box span {position:relative; margin-left:20px; padding-left:20px; color:#888; font-size:14px; line-height: 18px;}
@@ -4827,7 +4829,10 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemPercent {position:relative; font-size: 26px; line-height: 0.8;}
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemLink .btn {margin-top:40px; border:1px solid #a7a7a7; font-weight:300;}
 
-	
+	/* popup_마이페이지 회수조회 팝업 */
+	.modal.reclaim_pop {width: 1000px; max-width:1000px;}
+	.modal.reclaim_pop .modal-header {margin-bottom: 0; padding-bottom: 40px;}
+	.modal.reclaim_pop .modal-body .pop_cont {color:#222;}
 	
 	/******* 지울예정 *******/
 	/* 핫딜 전용 아이템 리스트 */
@@ -5084,4 +5089,4 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 		.cs .history_wrap .txt {padding-left: 0px;}
 		.cs .history_wrap {padding: 50px 30px 50px 0;}
 	
-	}
+	}

src/main/webapp/ux/pc/css/main.css

@@ -79,14 +79,14 @@
 
 .main_visual::before {content:'';display:block;width:100%; /*height:72px;*/ height:172px; position:absolute; top:-100px; left:0; background:#222222; z-index:-1;}
 .post-visual .btn {font-weight:300; border:1px solid #a7a7a7;}
-.post-visual .txtWrap{position:absolute; top:auto;bottom:100px;left:90px;right:auto;z-index:1;} 
+.post-visual .txtWrap{position:absolute; top:auto;bottom:100px;left:90px;right:auto;z-index:1; width: 85%;} 
 .post-visual .txtWrap dl,
 .post-visual .txtWrap dl + button {opacity:0; transition:all 200ms ease;}
 .post-visual .txtWrap dl {color:#222; line-height:1; padding-bottom:40px;}
 .post-visual .txtWrap dl.w,
 .post-visual .txtWrap dl.w + button {color:#ffffff; border-color:#fff;}
 .post-visual .txtWrap dt {font-size:18px; padding-bottom:20px; font-weight:200;}
-.post-visual .txtWrap dd {font-size:62px;line-height:1;font-weight:500; padding-bottom:5px; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical; overflow:hidden;}
+.post-visual .txtWrap dd {font-size:62px;line-height:1;font-weight:500; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical; overflow:hidden;}
 .post-visual .txtWrap dd.txt_xs {font-size:18px;line-height:1;font-weight:200;padding:20px 0 0px 0; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical; max-height:37px; overflow:hidden;}
 /* .post-visual .vrt_txt{width:auto;height:auto;font-size:18px;color:#888888;position:absolute;left:-90px;bottom:-99px;top:0;-webkit-transform:rotate(-90deg);transform:rotate(-180deg); white-space: nowrap; -webkit-writing-mode:vertical-rl;-ms-writing-mode:tb-rl;writing-mode:vertical-rl;} */
 .post-visual .vrt_txt{width: 500px;height: 20px;box-sizing: content-box;display: inline-block;text-align: left;font-size: 18px;color: #888888;position: absolute;left: -80%;bottom: 160px;position: relative;left: -65%;bottom: -160px;top: auto;-webkit-transform: rotate(-90deg);transform: rotate(-90deg);white-space: nowrap;}
@@ -509,11 +509,11 @@
 .fy_item .part .itemPic {width:100%; margin:0;}
 .fy_item .part {width:20%;}
 .fy_item .part.lg {width:40%;}
-.fy_item .part .item_state .itemInfo {display:none; position:absolute; top:50%; left:50%; transform:translate(-50%,-50%); width:65%; height:auto; text-align:center; z-index:1;}
+.fy_item .part .item_state .itemInfo {display:none; position:absolute; top:50%; left:50%; transform:translate(-50%,-50%); width:65%; height:auto; text-align:center; z-index:21;}
 .fy_item .part .item_state:hover .itemInfo,
 .fy_item .part .item_state:active .itemInfo,
 .fy_item .part .item_state:focus .itemInfo {display:block;}
-.fy_item .part .item_state:hover::after{content:''; position:absolute; left:0; right:0; top:0; bottom:0; width:100%; height:100%; background:rgba(0,0,0,0.8);}
+.fy_item .part .itemLink:hover::after{content:''; position:absolute; left:0; right:0; top:0; bottom:0; width:100%; height:100%; background:rgba(0,0,0,0.8); z-index: 19;}
 .fy_item .part .itemBrand,
 .fy_item .part .itemName,
 .fy_item .part .itemPrice {color:#ffffff; width:100%; max-width:none; word-break:keep-all;}
@@ -534,11 +534,14 @@
 .main_tv .cont_head p {color:#ffffff; font-size:42px;}
 .post-tv {width:100%;height:760px; height:auto; margin:0px auto; padding-top:60px; padding-bottom:60px;}
 .post-tv .swiper-slide {width:890px;}
-.post-tv .swiper-slide .movbox {position:relative; width:100%; height:0; padding-top:56.1818%; overflow:hidden; transition:all 300ms ease; transform:scale(1);}
-.post-tv .swiper-slide .movbox iframe {position:absolute; left:0; right:0; top:0; bottom:0; width:100%; height:100%; z-index:1;}
-.post-tv .swiper-slide-active .movbox {transform:scale(1.24);}
+.post-tv .swiper-slide .movbox {position:relative; width:100%; height:0; padding-top:56.1818%; overflow:hidden; transition:all 300ms ease; transform:scale(1); pointer-events: none;}
+.post-tv .swiper-slide .movbox iframe {position:absolute; left:0; right:0; top:0; bottom:0; width:100%; height:100%; z-index:1; }
+.post-tv .swiper-slide-active .movbox {transform:scale(1.24); pointer-events:auto;}
+.post-tv .swiper-slide-active .movbox iframe {}
 .post-tv .swiper-button-next,
 .post-tv .swiper-button-prev{opacity:0.5;}
+.post-tv .swiper-button-next:hover,
+.post-tv .swiper-button-prev:hover{opacity:1; background-image:url('/images/pc/ico_slide_arrow_orange.png');}
 .post-tv .swiper-button-next {right:140px;}
 .post-tv .swiper-button-prev {left:140px;}
 .main_tv .swiper-controls {margin-top:40px}
@@ -577,6 +580,7 @@ header.minify .common_header.br_header::after {bottom:-565px;}
 .brand_main .brand_visual .cont_body {}
 .brand_main .brand_visual .swiper-button-prev {left:70px; opacity:0.5;}
 .brand_main .brand_visual .swiper-button-next {right:70px; opacity:0.5;}
+.brand_main .brand_visual .swiper-button-disabled {display: none;}
 .brand_main .post-visual .swiper-container {margin-left:0;}
 .brand_main .post-visual .swiper-wrapper {padding-bottom:0;}
 .brand_main .post-visual .swiper-slide {position:relative; max-width:1520px; padding-left:28.9473%; mask-size:86.6072% 0%, 9.3928% 21.4285%, 90.6072% 100%, 100% 78.5715%; -webkit-mask-size:86.6072% 0%, 9.3928% 21.4285%, 90.6072% 100%, 100% 78.5715%; /*transition:all 200ms ease;*/}