수정

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

@@ -177,10 +177,13 @@ public class TsfReviewService {
 		review.setUpdNo(TsfSession.getInfo().getCustNo());
 		if (review.getKufKeyArr() == null && review.getOrgFileNmArr() == null) {
 			review.setPntGiveStat("G043_30");
+			review.setReviewGb("R");
 		}else if(review.getKufKeyArr() == null && review.getOrgFileNmArr() != null) {
 			review.setPntGiveStat("G043_30");
+			review.setReviewGb("P");
 		}else {
 			review.setPntGiveStat("G043_10");
+			review.setReviewGb("P");
 		}
 		
 		reviewDao.saveMypageReview(review);
@@ -259,7 +262,6 @@ public class TsfReviewService {
 				point.setReviewSq(review.getReviewSq());
 				reviewDao.createReviewPointHst(point);
 			}else if(review.getKufKeyArr() == null && review.getOrgFileNmArr() != null) {
-				
 				// 상품평 + 사진
 				point.setCustNo(TsfSession.getInfo().getCustNo());
 				point.setGvPntAmt(photoReviewPnt);

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

@@ -570,6 +570,7 @@ public class TsfPlanningController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView();
 		Integer planSq = planningService.getShotPlanSq(plan);
 		plan.setPlanSq(planSq);
+		plan.setPlanGb(planGb);
 		
 		CustDeliveryAddr addr = new CustDeliveryAddr();
 		Integer custNo = null;

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

@@ -1041,6 +1041,9 @@
 		            AND    P.FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
 		            </if>
 		            AND    NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT /*현재 전시되는 기획전*/
+		            <if test='planGb == "S"'>
+		            AND    G.GOODS_CD NOT IN (SELECT GOODS_CD FROM TB_GOODS_SHOT_DELV_SKIP GSDS)
+		            </if>
 		            AND    P.DEL_YN = 'N' /*삭제안된 기획전*/
 		            AND    P.OPEN_YN = 'Y' /*오픈된 기획전*/
 		            AND    NOW() BETWEEN PD.DISP_STDT AND PD.DISP_EDDT /*현재 전시되는 코너*/

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

@@ -480,13 +480,14 @@
 				LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                                   AND C.USE_YN = 'Y'
 				  WHERE 1=1
-				AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL #{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
+				-- AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL #{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
 				-- AND O.ORD_NO NOT IN (SELECT R.ORD_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y')
 				AND OD.ORD_DTL_NO NOT IN (SELECT R.ORD_DTL_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y' AND R.ORD_NO = O.ORD_NO AND R.ORD_DTL_NO = OD.ORD_DTL_NO AND R.CUST_NO = #{custNo})
 				AND O.CUST_NO = #{custNo}
 				AND O.DISP_YN = 'Y'
 			 	AND O.SITE_CD = #{siteCd}
 				) Z
+		 WHERE Z.REMAIN_DT > 0
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.DELV_EDDT, Z.ORD_DTL_NO, Z.ORD_EXCH_GB
 				, Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM, Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT
 				, Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.INVOICE_NO
@@ -786,6 +787,7 @@
 		INSERT INTO TB_REVIEW (
 		                         REVIEW_SQ
 		                       , GOODS_CD
+		                       , REVIEW_GB
 		                       , CUST_NO
 		                       , ORD_NO
 		                       , ORD_DTL_NO
@@ -811,6 +813,7 @@
 		               VALUES (
 		                          #{reviewSq}
 		                        , #{goodsCd}
+		                        , #{reviewGb}
 		                        , #{custNo}
 		                        , #{ordNo}
 		                        , #{ordDtlNo}
@@ -865,10 +868,12 @@
 		<if test='confirmYn == "Y"'>
 		SET CONFIRM_DT = NOW()
 		   ,CONFIRM_YN = 'Y'
+		   ,REVIEW_GB = #{reviewGb}
 		   </if>
 		   <if test='confirmYn == "N"'>
 		 SET CONFIRM_DT = NULL
 		    ,CONFIRM_YN = 'N'
+		    ,REVIEW_GB = #{reviewGb}
 		   </if>
 		WHERE REVIEW_SQ  = #{reviewSq}
 	</update>

src/main/webapp/WEB-INF/views/mob/planning/PlanningShotGuideFormMob.html

@@ -299,15 +299,17 @@ var fnOpenDaumAddr = function() {
 						success 	: function(result) {
 							if (result != null) {
 								$('#addr').text(cfnGetDaumRoadAddr(data));
-								if(result.shotYn.shotDelvUseYn == "Y"){
-									$("#classPop").attr("class","possible-popup");
-									$('#shotAdr').text("총알배송");
-									$("#infoTxt").html("오늘 오전 10시까지 주문하시면 오늘 도착합니다. <br>(토, 일, 공휴일 휴무)")
-									
-								}else{
+								if (result.shotYn != null && result.shortYn != '') {
+									if(result.shotYn.shotDelvUseYn == "Y"){
+										$("#classPop").attr("class","possible-popup");
+										$('#shotAdr').text("총알배송");
+										$("#infoTxt").html("오늘 오전 10시까지 주문하시면 오늘 도착합니다. <br>(토, 일, 공휴일 휴무)");
+									}
+								}
+								else{
 									$("#classPop").attr("class","impossible-popup");
 									$('#shotAdr').text("일반배송");
-									$("#infoTxt").html("주문시간/배송지에 따라 2~3일 이내 도착합니다.<br> (일, 공휴일 휴무)")
+									$("#infoTxt").html("주문시간/배송지에 따라 2~3일 이내 도착합니다.<br> (일, 공휴일 휴무)");
 								}
 								
 								$("#bulletShipPop").modal("show");

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -1192,7 +1192,6 @@
 								tag += '				</div>';	
 								tag += '			</a>';	
 								tag += '			<div class="hover_con">';
-								console.log(item.stockQtySum);
 								if (item.stockQtySum>0) {
 									tag += '			<button type="button" class="btn btn_sm cart_btn on" afLinkCd="'+item.afLinkCd+'" goodsCd="'+item.goodsCd+'" optCd="'+item.optCd+'" minOrdQty="'+item.minOrdQty+'" goodsType="'+item.goodsType+'" contentsLoc="'+item.contentLoc+'" onclick="wishCardAdd(this)"><span>쇼핑백 담기</span></button>';
 								}

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

@@ -598,15 +598,17 @@ var fnChooseFile = function(obj) {
 				); 
 		}else if((new RegExp("mp4", "i")).test(file.name)){
 			setTimeout(function(){
+				$(".imgUpload").find('.pics').eq(0).addClass("mov");
 				$(".pics").children().eq(0).append("<input type='hidden' name='kufKeyArr' id='kufKey"+(picLength+1)+"'>");
 				$(".pics").children().eq(0).append("<input type='hidden' name='kmcKeyArr' id='kmcKey"+(picLength+1)+"'>");
 				gagaKollus.upload('Review', file, $('#kufKey'+(picLength+1)));
-			}, 2000);
+			}, 200);
 		}else{
 			mcxDialog.alertC('첨부할 수 없는 파일 형식입니다.', {
 				sureBtnText: "확인",
 				sureBtnClick: function() {
-					$(obj).parent('.imgUpload').find('.removes').trigger('click');
+					//$(obj).parent('.imgUpload').find('.removes').trigger('click');
+					$(".pics").find(".removes").eq(0).trigger('click');
 				}
 			});
 			return false;

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

@@ -319,7 +319,7 @@
 						html+='										<a>';
 						html+='											<div class="pic">';
 						if (attachList[i].fileGb == 'M') {
-							html+='												<span onclick="cfMypageReviewDetail(\''+item.goodsCd+'\', \'Y\',\''+item.reviewSq+'\');" class="thumb mov" style="background-image:url(' + _kollusMediaUrl + '/' + attachList[i].kmcKey + '?player_version=html5);"></span>';
+							html+='												<span onclick="cfMypageReviewDetail(\''+item.goodsCd+'\', \'Y\',\''+item.reviewSq+'\');" class="thumb mov" style="background-image:url(' + _kollusMediaUrl + '/poster/' + attachList[i].kmcKey + '?player_version=html5);"></span>';
 						}else{
 							html+='												<span onclick="cfMypageReviewDetail(\''+item.goodsCd+'\', \'Y\',\''+item.reviewSq+'\');" class="thumb" style="background-image:url(' + reviewUrl + '/' + attachList[i].sysFileNm + ');"></span>';
 						}

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

@@ -306,15 +306,16 @@ var fnOpenDaumAddr = function() {
 						success 	: function(result) {
 							if (result != null) {
 								$('#addr').text(cfnGetDaumRoadAddr(data));
-								if(result.shotYn.shotDelvUseYn == "Y"){
-									$('#shotAdr').text("총알배송");
-									$("#infoTxt").text("오늘 오전 10시까지 주문하시면 오늘 도착합니다. (토, 일, 공휴일 휴무)")
-									
-								}else{
+								if (result.shotYn != null && result.shortYn != '') {
+									if(result.shotYn.shotDelvUseYn == "Y"){
+										$('#shotAdr').text("총알배송");
+										$("#infoTxt").text("오늘 오전 10시까지 주문하시면 오늘 도착합니다. (토, 일, 공휴일 휴무)");
+									}
+								}
+								else{
 									$('#shotAdr').text("일반배송");
-									$("#infoTxt").text("주문시간/배송지에 따라 2~3일 이내 도착합니다. (일, 공휴일 휴무)")
+									$("#infoTxt").text("주문시간/배송지에 따라 2~3일 이내 도착합니다. (일, 공휴일 휴무)");
 								}
-								
 								$("#bulletShipPop").modal("show");
 								
 							}

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

@@ -313,7 +313,7 @@ input[type="file"] {
   display: inline !important;float: left;margin: 0 10px 0 0;width: 7.2rem;height:7.2rem;
   border: 1px solid #dddddd;box-sizing: border-box;position: relative; overflow: hidden;
 }
-.pics.mov::after {content:''; position:absolute; left:0; top:0; width:100%; height:100%; background:rgba(0,0,0,0.3) url('/images/mo/ico_play.png') no-repeat 50% 50%; z-index:2;}
+.pics.mov::after {content:''; position:absolute; left:0; top:0; width:100%; height:100%; background:rgba(0,0,0,0.3) url('/images/mo/ico_play.png') no-repeat 50% 50%; z-index:0;}
 .picsThumbs {
   width: auto;height: auto;max-height: 7.1rem;max-width:7.1rem;margin: auto 0;
   position: absolute;top: 50%;bottom: auto;left: 50%;right: 0;
@@ -321,7 +321,7 @@ input[type="file"] {
 }
 .removes {
   display: block;width:2rem;height:2rem;font-size: 0;text-align: center;cursor: pointer;background-color: #666666;
-  position: absolute;top: 0;bottom: auto;left: auto;right: 0; z-index: 3;
+  position: absolute;top: 0;bottom: auto;left: auto;right: 0; z-index: 1;
 }
 .removes::after {
   content: '';display: inline-block;width: 2rem;height: 2rem;
@@ -657,8 +657,8 @@ body.gnb_on {height: 100vh;overflow: hidden;}
 .app {height: 100vh;font-size: 1.4rem;}
 .skipNav {overflow: hidden;position: absolute;left: -9999px;width: 0;height: 1px;margin: 0;padding: 0;}
 
-.inner {padding: 0 2.0rem 1.3rem 2.0rem;position: relative;overflow: hidden;}
-.inner.wide {padding: 0 0rem 1.3rem 0rem;position: relative;overflow: hidden;}
+.inner {padding: 0 2.0rem 1.3rem 2.0rem;position: relative;}
+.inner.wide {padding: 0 0rem 1.3rem 0rem;position: relative;}
 .inner::after {content: '';display: block;clear: both;}
 .inner.bg_gray {background-color: #f5f5f5;}
 .inner.bg_beige {background-color: #ffeee7;}

src/main/webapp/ux/mo/js/common_m.js

@@ -161,7 +161,7 @@ $(document).ready(function() {
                         var file = e.target;
                         console.log(file);
                         $("<span class=\"pics\">" +
-                            "<img class=\"picsThumbs\" src=\"" + e.target.result + "\" title=\"" + file.name + "\"/>" +
+                            "<img class=\"picsThumbs\" src=\"" + e.target.result + "\"/>" +
                             "<br/><span class=\"removes\">Removes image</span>" +
                             "</span>").insertBefore(".fileAdd");
                         $(".removes").click(function(){
@@ -209,7 +209,7 @@ $(document).ready(function() {
                     fileReader.onload = (function(e) {
                         var file = e.target;
                         $("<span class=\"pics\">" +
-                            "<img class=\"picsThumbs\" src=\"" + e.target.result + "\" title=\"" + file.name + "\"/>" +
+                            "<img class=\"picsThumbs\" src=\"" + e.target.result + "\"/>" +
                             "<br/><span class=\"removes\">Removes image</span>" +
                             "</span>").insertBefore(".fileAdd");
                         $(".removes").click(function(){

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

@@ -459,10 +459,9 @@ background-color: #fe970a;border-color: #fe970a;color:#ffffff;
 /* btn linktext */
 a[class*="link"]::after, .btn_link span::after {
 content: "〉";font-size: 12px;padding-left: 8px;
-/* 아이콘 이미지 넣을것 , content 제거 */
   /* background:url(/images/pc/icon/ico_arrow.gif) no-repeat right 3px; */
 }
-.pd a[class*="link"]::after, .pd .btn_link span::after {content: "";}
+.npay_button a[class*="link"]::after, .npay_button .btn_link span::after {content: "";}
 .btn_link, .btn_link:hover, .btn_link:focus, .btn_link:active {border-color: transparent;}
 .btn_link:hover, .btn_link:focus {color: #2a6496;text-decoration:none;background-color: transparent;}
 .btn_link:hover, .btn_link:focus, .btn_link:active, .btn_link.active {color: #222222;background-color: transparent;border-color: transparent;}
@@ -1045,6 +1044,10 @@ input[type="file"] {
   display: inline !important;float: left;margin: 0 10px 0 0;width: 150px;height:150px;
   border: 1px solid #dddddd;box-sizing: border-box;position: relative;
 }
+
+.pics.mov {position: relative;}
+.pics.mov::after {content:''; position:absolute; left:0; top:0; width:100%; height:100%; background:rgba(0,0,0,0.3) url('/images/pc/ico_play.png') no-repeat 50% 50%; z-index:1;}
+
 .picsThumbs {
   width: auto;height: auto;max-height: 148px;max-width: 148px;margin: auto 0;
   position: absolute;top: 50%;bottom: auto;left: 50%;right: 0;
@@ -1052,7 +1055,7 @@ input[type="file"] {
 }
 .removes {
   display: block;width: 21px;height: 21px;font-size: 0;text-align: center;cursor: pointer;background-color: #666666;
-  position: absolute;top: 0;bottom: auto;left: auto;right: 0;
+  position: absolute;top: 0;bottom: auto;left: auto;right: 0; z-index: 2;
 }
 .removes::after {
   content: '';display: inline-block;width: 21px;height: 21px;

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

@@ -2342,11 +2342,12 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.odPayment .fold_cont .area_receiveinfo.none {padding:0 0 30px;}
 	.odPayment .fold_cont .area_receiveinfo > dl > div {margin-top:15px; min-height:16px}
 	.odPayment .fold_cont .area_receiveinfo > dl > div:first-child {margin-top:0}
-	.odPayment .fold_cont .area_receiveinfo > dl > div:last-child {margin-top: 5px;}
+	.odPayment .fold_cont .area_receiveinfo > dl > div:last-child {margin-top: 10px;}
+	.odPayment .fold_cont .area_receiveinfo > dl > div:nth-child(3) {line-height: 1.4;}
 	.odPayment .fold_cont .area_receiveinfo > dl > div dt {position:relative; padding-right:10px; margin-right:10px; font-weight:200;}
 	.odPayment .fold_cont .area_receiveinfo > dl > div:last-child dt::after {content:':'; position:absolute; right:-2px; top:-1px;}
 	.odPayment .fold_cont .area_receiveinfo > dl > div dd {min-height:16px}
-	.odPayment .fold_cont .area_receiveinfo > dl > div dd .btn {vertical-align:top; margin-top:-9px; margin-left:15px}
+	.odPayment .fold_cont .area_receiveinfo > dl > div dd .btn {margin-left:15px}
 	.odPayment .fold_cont .area_receiveinfo > dl > div dd .btn_underline {margin-left:12px}
 	.odPayment .fold_cont .area_receiveinfo .icon_tag {margin-top:-3px; margin-left:4px}
 
@@ -4402,7 +4403,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 
 
 
-	/* 이용약관,개인정보취급방침 */
+	/* 이용약관,개인정보취급방침,업체리스트 */
 	.ps .cont_head > div h3{text-align: center;margin-bottom: 0;padding-bottom: 60px;font-size: 40px;line-height: 1;}
 	.ps .cont_body {width: 1200px;margin: 0 auto;}
 	.ps p {font-size:16px;color:#666666;line-height:26px;letter-spacing:-0.025em;}
@@ -4413,6 +4414,13 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.ps table td {border-bottom:1px solid #ddd;border-right: 1px solid #ddd;font-weight:200;}
 	.ps table td:last-child {border-right: 1px solid transparent;}
 	.ps table th {border-top: 1px solid #000;border-bottom:1px solid #000;border-right: 1px solid transparent;font-weight:500;text-align:center;}
+	.modal.psptn_pop {max-width: none;width: 620px;padding: 60px 60px;}
+	.ps.ptn {border: 0;}
+	.ps.ptn table {margin-top:0;}
+	.ps.ptn table th, .ps.ptn table td {text-align: center;padding: 16px 0;}
+	.ps.ptn table th {font-size: 14px; font-weight: 500; line-height:14px;border-bottom: 1px solid #ddd;}
+	.ps.ptn table td {font-size: 14px; font-weight: 200; line-height: 14px;border-right: 0px solid #ddd;}
+	.ps.ptn .pager {padding-top: 20px;}
 	.hookGrp{margin-top: 40px;}
 	.hookGrp .hook_list{border: 1px solid #f5f5f5;padding: 40px;}
 	.hookGrp .hook_list ul{}

src/main/webapp/ux/pc/js/common-ui.js

@@ -91,7 +91,7 @@ $(document).ready(function() {
 					var file = e.target;
 					console.log(file);
 					$("<span class=\"pics\">" +
-						"<img class=\"picsThumbs\" src=\"" + e.target.result + "\" title=\"" + file.name + "\"/>" +
+						"<img class=\"picsThumbs\" src=\"" + e.target.result + "\"/>" +
 						"<br/><span class=\"removes\">Removes image</span>" +
 						"</span>").insertAfter("#fileAdd");
 					$(".removes").click(function(){
@@ -688,8 +688,16 @@ $(document).ready( function() {
 				sureBtnText: "확인",
 			});
 		}else {
-			$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
-			$(this).toggleClass('on');
+			$('.fold_head').removeClass('on');
+            $('.fold_cont').slideUp(100);
+            //$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
+            //$(this).parents('.fold_head').toggleClass('on');
+            if(!$(this).parents('.foldGroup li').find('.fold_cont').is(":visible")){
+                $(this).parents('.foldGroup li').find('.fold_cont').slideDown(100);
+                $(this).toggleClass('on');
+            }
+			//$(this).parents('.foldGroup li').find('.fold_cont').slideToggle(100);
+			//$(this).toggleClass('on');
 		}
 	});