Merge branch 'develop' into bin2107

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

@@ -560,12 +560,11 @@ public class TsfOrderService {
 		int realOrdSumAmt 			= 0;
 		
 		int cartOrgGoodsSumAmt 		= 0;
-		int cartRealOrdSumAmt 		= 0;
 		
 		// 주문서화면 금액정보 체크
 		for (Order orderDetail : orderDetailList) {
-			orgGoodsSumAmt 				= orgGoodsSumAmt 	+ orderDetail.getCurrPrice();
-			cpn1DcSumAmt 				= cpn1DcSumAmt 		+ orderDetail.getCpn1DcAmt();
+			orgGoodsSumAmt 				= orgGoodsSumAmt 	+ ((orderDetail.getCurrPrice() + orderDetail.getOptAddPrice()) * orderDetail.getGoodsQty());
+			cpn1DcSumAmt 				= cpn1DcSumAmt 		+ (orderDetail.getCpn1DcAmt() * orderDetail.getGoodsQty());
 			tmtb1DcSumAmt 				= tmtb1DcSumAmt 	+ orderDetail.getTmtb1DcAmt();
 			tmtb2DcSumAmt 				= tmtb2DcSumAmt 	+ orderDetail.getTmtb2DcAmt();
 			goodsCpnDcSumAmt			= goodsCpnDcSumAmt 	+ orderDetail.getGoodsCpnDcAmt();
@@ -622,19 +621,14 @@ public class TsfOrderService {
 			resultStr = "상품권 사용 금액정보가 잘못 되었습니다.";
 			return resultStr;
 		}
-		
-		
-		
+
 		if (realOrdSumAmt != order.getRealOrdSumAmt()) {
 			resultStr = "실결제 금액정보가 잘못 되었습니다.";
 			return resultStr;
 		}
-		
-		
-
 		// 장바구니 금액정보 체크
 		for (Order orderDetail : cartGoodsList) {
-			cartOrgGoodsSumAmt 			= cartOrgGoodsSumAmt + orderDetail.getOrgCurrPrice();
+			cartOrgGoodsSumAmt 			= cartOrgGoodsSumAmt + ((orderDetail.getOrgCurrPrice() + orderDetail.getOptAddPrice()) * orderDetail.getGoodsQty());
 		}
 		
 		// 판매가비교
@@ -995,7 +989,16 @@ public class TsfOrderService {
 
 		return "SUCCESS";
 	}
-	
+
+	/**
+	 * 네이버페이 주문 정보 생성 및 송부
+	 * @param param
+	 * @param request
+	 * @param response
+	 * @author xodud1202
+	 * @since 2021. 05. 12
+	 */
+	@Transactional("shopTxnManager")
 	public GagaMap nPayReq50(Order param, HttpServletRequest request, HttpServletResponse response) {
 		GagaMap result = new GagaMap();
 
@@ -1160,6 +1163,12 @@ public class TsfOrderService {
 		return result;
 	}
 
+	/**
+	 * 네이버페이 주문 정보 송부
+	 * @param sb
+	 * @author xodud1202
+	 * @since 2021. 05. 12
+	 */
 	private GagaMap sendOrderInfoToNC(StringBuffer sb) throws IOException {
 		GagaMap resultMap = new GagaMap();
 
@@ -1229,6 +1238,224 @@ public class TsfOrderService {
 
 		return "";
 	}
+
+	/**
+	 * 네이버페이 상품 정보 생성 및 송부
+	 * @param request
+	 * @param response
+	 * @author xodud1202
+	 * @since 2021. 05. 12
+	 */
+	public void createNpayGoodsXml50(HttpServletRequest request, HttpServletResponse response) {
+		StringBuffer sb = new StringBuffer();
+		// http://locd.michaa2.sisun.com/order/createNpayGoodsXml.do?product[0][id]=G2019070300016&product[0][optionManageCodes]=010_5|55|&supplementSearch=true&optionSearch=true
+		// product[0][id]=G2019070300016&product[0][optionManageCodes]=010_5|55|&supplementSearch=true&optionSearch=true
+
+		try {
+			sb.append("<?xml version='1.0' encoding='utf-8'?>");
+			sb.append("<products>");
+
+			String goodsCdStr 				= "";
+			String optionManageCodesStr 	= "";
+			String queryStr 				= request.getQueryString();
+			String[] arr1 					= queryStr.split("product");
+
+			for (int i=0 ; i<arr1.length; i++) {
+				String[] arr2 = arr1[i].split("&");
+
+				for (int j=0 ; j<arr2.length ; j++) {
+					String[] arr3 = arr2[j].split("=");
+
+					if (arr3.length > 1) {
+						if (arr3[0].indexOf("id") > -1) {
+							if ("".equals(goodsCdStr)) {
+								goodsCdStr = goodsCdStr + arr3[1];
+							} else {
+								goodsCdStr = goodsCdStr + "," + arr3[1];
+							}
+						} else if (arr3[0].indexOf("optionManageCodes") > -1) {
+							if ("".equals(optionManageCodesStr)) {
+								optionManageCodesStr = optionManageCodesStr + arr3[1];
+							} else {
+								optionManageCodesStr = optionManageCodesStr + "," + arr3[1];
+							}
+						}
+					}
+				}
+			}
+
+			String[] goodsCdArr 			= goodsCdStr.split(",");
+			String[] optionManageCodesArr 	= optionManageCodesStr.split(",");
+
+			// 네이버페이 기본정보
+			String shopId			= env.getProperty("naverPay.shop.id");				// shopId
+			String certificationKey	= env.getProperty("naverPay.certification.key");	// 네이버페이 인증키
+			String cpaInflowCode	= getCookieValue(request, "CPAValidator");
+			String naverInflowCode	= getCookieValue(request, "NA_CO");
+			String saClickId		= getCookieValue(request, "NVADID");
+			String domain 			= env.getProperty("domain.front");					// 도메인 주소
+			String staticUrl		= "/resources";
+			String goodsImgUrl		= env.getProperty("upload.goods.view");				// 상품 이미지 경로
+			int totPrice			= 0;												// 전체 주문 금액
+
+			/*for (int i=0; i<goodsCdArr.length; i++) {
+				Order item = new Order();
+
+				item.setGoodsCd(goodsCdArr[i]);
+				//shopInfo.setLang(CommonCodeConstant.SHIP_CONTR_KOREA);  //KOR
+				//shopInfo.setDevice(CommonCodeConstant.DEIVCE_WEB);		//WEB
+
+				// 9.상품 옵션
+				String optionManageCodesArrStr = CryptoManager.simpleDecode(optionManageCodesArr[i]);
+				String [] arr = optionManageCodesArrStr.split("_");
+				item.setOptCd1(arr[0]);
+
+				arr[1] = CryptoManager.simpleDecode(arr[1]);
+
+				shopInfo = shopService.shopData(shopInfo);
+
+				Ship shipInfoVo = new Ship();
+				shipInfoVo.setCompany_mng_idx(shopInfo.getCompany_mng_idx());
+
+				// 2018.10.17 전석훈추가 (반품정보연동)
+				shipInfoVo = shipService.companyShipInfoView(shipInfoVo);
+
+				// 1.상품정보
+				// 사이트별 상품명 칼럼이 다름
+				String goodsNm = "";
+
+				if ("99999".equals(shopInfo.getBrand_mng_idx())) {
+					goodsNm = shopInfo.getBrand_nm() + " " + shopInfo.getGoods_nm_kor();
+				} else {
+					goodsNm = shopInfo.getBrand_nm() + " " + shopInfo.getGoods_nm_eng();
+				}
+
+				sb.append("<product>");
+				sb.append("<id>").append(goodsCdArr[i]).append("</id>");
+				sb.append("<merchantProductId>").append(goodsCdArr[i]).append("</merchantProductId>");
+				sb.append("<ecMallProductId>").append(goodsCdArr[i]).append("</ecMallProductId>");
+				sb.append("<name>").append("<![CDATA[" + goodsNm + "]]>").append("</name>");
+				sb.append("<basePrice>").append(String.valueOf(shopInfo.getSale_amt())).append("</basePrice>");
+				sb.append("<infoUrl>").append("<![CDATA[" + domain + "/shop/shopView?goods_code=" + shopInfo.getGoods_code() + "]]>").append("</infoUrl>");
+
+				// 1.2 상품 이미지
+				List<Shop> shopImgList 	= shopDao.shopImgList(shopInfo);
+				Shop img 				= null;
+				String prodImg 			= null;
+
+				if (shopImgList.size() > 0) {
+					img = shopImgList.get(0);
+					prodImg = goodsImgUrl + "/" + img.getSys_img_nm();
+
+					if (prodImg.indexOf("http:") < 0) {
+						prodImg = "http:" + prodImg;
+					}
+				} else {
+					prodImg = "http:" + staticUrl + "/images/common/default_gy.jpg";
+				}
+
+				sb.append("<imageUrl>").append("<![CDATA[" + prodImg + "]]>").append("</imageUrl>");
+
+				// 12.반품주소
+				if (shipInfoVo != null) {
+					if (shipInfoVo.getReturn_addr_zip() != null && !"".equals(shipInfoVo.getReturn_addr_zip())) {
+						// 2.1 반품정보
+						sb.append("<returnInfo>");
+						sb.append("<zipcode>").append("<![CDATA[" + String.valueOf(shipInfoVo.getReturn_addr_zip()) + "]]>").append("</zipcode>");
+						sb.append("<address1>").append("<![CDATA[" + String.valueOf(shipInfoVo.getReturn_addr_base()) + "]]>").append("</address1>");
+						sb.append("<address2>").append("<![CDATA[" + String.valueOf(shipInfoVo.getReturn_addr_detail()) + "]]>").append("</address2>");
+						sb.append("<sellername>").append("<![CDATA[" + String.valueOf(shipInfoVo.getResp_nm()) + "]]>").append("</sellername>");
+						sb.append("<contact1>").append("<![CDATA[" + String.valueOf(shipInfoVo.getCntct_no()) + "]]>").append("</contact1>");
+						sb.append("</returnInfo>");
+
+						// 반품배송비, 교환배송비
+						sb.append("<returnShippingFee>" + shipInfoVo.getReturn_amt() + "</returnShippingFee>");
+						sb.append("<exchangeShippingFee>" + shipInfoVo.getExch_amt() + "</exchangeShippingFee>");
+					}
+				}
+
+				// 옵션정보 지원여부 true
+				sb.append("<optionSupport>true</optionSupport>");
+				sb.append("<option>");
+
+				// 9.1 옵션 아이템정보 색상
+				sb.append("<optionItem>");
+				sb.append("<type>SELECT</type>");
+				sb.append("<name>칼라</name>");
+				sb.append("<value>");
+				sb.append("<id>").append("<![CDATA[" + arr[0] + "]]>").append("</id>");
+				sb.append("<text>").append("<![CDATA[" + shopInfo.getGoods_color_nm() + "]]>").append("</text>");
+				sb.append("</value>");
+				sb.append("</optionItem>");
+
+				String goodsSizeStr = CryptoManager.decodeStr(arr[1]);
+
+				// 9.1 옵션 아이템정보 사이즈
+				sb.append("<optionItem>");
+				sb.append("<type>SELECT</type>");
+				sb.append("<name>사이즈</name>");
+				sb.append("<value>");
+				sb.append("<id>").append("<![CDATA[" + arr[1] + "]]>").append("</id>");
+				sb.append("<text>").append("<![CDATA[" + goodsSizeStr + "]]>").append("</text>");
+				sb.append("</value>");
+				sb.append("</optionItem>");
+
+				// 9.3 옵션 옵션조합정보
+				sb.append("<combination>");
+				sb.append("<price>").append(0).append("</price>");
+				sb.append("<manageCode>").append("<![CDATA[" + optionManageCodesArrStr + "]]>").append("</manageCode>");
+				//sb.append("<stockQuantity>").append(5).append("</stockQuantity>");
+				sb.append("<status>true</status>");
+
+				// 9.3.1  옵션 옵션조합정보 색상
+				sb.append("<options>");
+				sb.append("<name>칼라</name>");
+				sb.append("<id>").append("<![CDATA[" + arr[0] + "]]>").append("</id>");
+				sb.append("</options>");
+
+				// 9.3.2  옵션 옵션조합정보 사이즈
+				sb.append("<options>");
+				sb.append("<name>사이즈</name>");
+				sb.append("<id>").append("<![CDATA[" + arr[1] + "]]>").append("</id>");
+				sb.append("</options>");
+
+				sb.append("</combination>");
+				sb.append("</option>");
+
+				// 10. 배송정보조회
+				// 5.2.1 업체별 기본배송비, 무료배송비 조회
+				Ship ship = new Ship();
+				ship.setCompany_mng_idx(shopInfo.getCompany_mng_idx());
+				ship = shipService.localShipInfo(ship);
+
+				sb.append("<shippingPolicy>");
+				sb.append("<groupId>").append(shopInfo.getCompany_mng_idx()).append("</groupId>");
+				sb.append("<method>").append("DELIVERY").append("</method>");
+				sb.append("<feeType>").append("CONDITIONAL_FREE").append("</feeType>");
+				sb.append("<feePayType>").append("PREPAYED").append("</feePayType>");
+				sb.append("<feePrice>").append(ship.getShip_amt()).append("</feePrice>");
+
+				sb.append("<conditionalFree>");
+				sb.append("<basePrice>").append(ship.getFree_ship_amt()).append("</basePrice>");
+				sb.append("</conditionalFree>");
+
+				sb.append("<surchargeByArea>");
+				sb.append("<apiSupport>").append("true").append("</apiSupport>");
+				sb.append("</surchargeByArea>");
+
+				sb.append("</shippingPolicy>");
+
+				sb.append("</product>");
+			}*/
+			sb.append("</products>");
+			//for end
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			//write(response, sb.toString());
+		}
+	}
 	
 	/**
 	 * 장바구니정보 주문번호 이력 등록

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

@@ -268,7 +268,7 @@ public class TsfOrderController extends TsfBaseController {
 		// 2021.05.07 jsh77b id만 개발자모드허용
 		boolean devTempYn = false;
 		if (TsfSession.isLogin()) {
-			if ("jsh77b".equals(TsfSession.getInfo().getCustId())) {
+			if ("jsh77b".equals(TsfSession.getInfo().getCustId()) || "xodud1202".equals(TsfSession.getInfo().getCustId())) {
 				devTempYn = true;
 			}
 		}

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

@@ -184,4 +184,19 @@ public class TsfPgController extends TsfBaseController {
 	public GagaMap nPayReq(@RequestBody Order param, HttpServletRequest request, HttpServletResponse response) {
 		return orderService.nPayReq50(param, request, response);
 	}
+
+	/**
+	 * 네이버 페이 상품정보 연동
+	 * @param request
+	 * @param response
+	 * @param cart
+	 * @param model
+	 * @return
+	 * @throws Exception
+	 */
+	@ResponseBody
+	@PostMapping("/create/npay/goodsxml")
+	public void createNpayGoodsXml(HttpServletRequest request, HttpServletResponse response) {
+		orderService.createNpayGoodsXml50(request, response);
+	}
 }

src/main/webapp/WEB-INF/views/mob/common/layout/GoodsLayoutMob.html

@@ -9,6 +9,7 @@
 
 	<th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
 	
+	
 	<div class="app">
 		<!-- GNB -->
 		<th:block th:replace="~{mob/common/fragments/GnbSubGoodsMob :: gnb}"></th:block>

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

@@ -66,7 +66,7 @@
 									<td>
 										<div class="info_card">
 											<p th:text="${cardInfo.minNoItrt + '~' + cardInfo.maxNoItrt + '개월 무이자'}">2~6개월 무이자</p>
-											<p th:text="${cardInfo.minPayAmt + '만원 이상 구매 시'}">5만원 이상 구매 시</p>
+											<p th:text="${#numbers.formatInteger(cardInfo.minPayAmt, 0,'COMMA') + '원 이상 구매 시'}">5만원 이상 구매 시</p>
 										</div>
 									</td>
 								</tr>

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

@@ -719,37 +719,45 @@
 
 
 		// =============딜리스트팝업========================================================
-		//팝업 - 딜리뷰상품 리스트팝업
-		$(document).on('click','#listReviewPop .close, #listReviewPop .deal_list_select ul > li',function(e){
-			$("#listReviewPop").hide(); 
-			return false;
-		});
+			//팝업 - 딜리뷰상품 리스트팝업
+			$(document).on('click','.deal_listReview_open',function(e){
+                $("#listReviewPop").show();
+                return false;
+            }).on('click','#listReviewPop .close, #listReviewPop .deal_list_select ul > li',function(e){
+				$("#listReviewPop").hide(); 
+				return false;
+			});
 
 			//팝업 - 딜문의상품 리스트팝업
-		$(document).on('click','#listQnaPop .close, #listQnaPop .deal_list_select ul > li',function(e){
-			$("#listQnaPop").hide(); 
-			return false;
-		});
+			$(document).on('click','.deal_listQna_open',function(e){
+                $("#listQnaPop").show();
+                return false;
+            }).on('click','#listQnaPop .close, #listQnaPop .deal_list_select ul > li',function(e){
+				$("#listQnaPop").hide(); 
+				return false;
+			});
 
 			//팝업 - 딜배송상품 리스트팝업
-		$(document).on('click','#listDeliveryPop .close, #listDeliveryPop .deal_list_select ul > li',function(e){
-			$("#listDeliveryPop").hide(); 
-			return false;
-		});
-
-		//팝업 - 딜상세정보 리스트팝업
-	 	$(document).on('click','#pdDescrpPop .deal_listDescrp_open',function(e){
-			$(this).toggleClass("active");
-			 $("#listDescrpPop").toggle();
-			 return false;
-		 }).on('click','#listDescrpPop .deal_list_select ul > li',function(e){
-			$("#pdDescrpPop .deal_listDescrp_open").removeClass("active");
-			$("#listDescrpPop").hide(); 
-			return false;
-		}); 
-			// ============================================================================//
-
+			$(document).on('click','.deal_listDelivery_open',function(e){
+                $("#listDeliveryPop").show();
+                return false;
+            }).on('click','#listDeliveryPop .close, #listDeliveryPop .deal_list_select ul > li',function(e){
+				$("#listDeliveryPop").hide(); 
+				return false;
+			});
 
+			//팝업 - 딜상세정보 리스트팝업
+			$(document).on('click','#pdDescrpPop .deal_listDescrp_open',function(e){
+				$(this).toggleClass("active");
+                $("#listDescrpPop").toggle();
+                return false;
+            }).on('click','#listDescrpPop .deal_list_select ul > li',function(e){
+				$("#pdDescrpPop .deal_listDescrp_open").removeClass("active");
+				$("#listDescrpPop").hide(); 
+				return false;
+			});
+			// ============================================================================//	
+		
 		 //탭 - 딜상품 > 상품상세정보 탭
 		 $(document).on('click','.pd.deal .tab_detail_nav ul li',function(e){
 			 $(this).addClass('active').siblings().removeClass('active');

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

@@ -51,7 +51,7 @@
 										<div class="swiper-slide">
 											<div class="movbox">
 												<th:block th:if="${goodsVideo.videoGb == 'Y'}">
-												<iframe id="prodctThumbVideo" class="pd_mov" width="100%" height="100%" th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0&autoplay=1&mute=1'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+												<iframe width="100%" height="100%" th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0&autoplay=1&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'}">
 												<iframe id="child" 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>
@@ -257,6 +257,7 @@
 						<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>
 						</th:block>
 						<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+						<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>
 						</th:block>
 					</div>
 					</th:block>
@@ -1954,10 +1955,10 @@
 		}); 
 		
 		//슬라이드 - 함께하면 할인되는 다다익선 상품
-        var togetherItemSwiper = new Swiper('.pd .pd_together .area_slider .swiper-container', {
-            slidesPerView: 3,
-            spaceBetween: 8,
-        }); 
+		var togetherItemSwiper = new Swiper('.pd .pd_together .area_slider .swiper-container', {
+			slidesPerView: 3,
+			spaceBetween: 8,
+		}); 
 		
 		//슬라이드 - 베스트리뷰
 		var riviewSwiper = new Swiper('.riview_box .area_slider .swiper-container', {
@@ -2071,13 +2072,13 @@
 		});
 
 		 //관심상품 등록
-        $(document).on('click','.pd .itemLike',function(e){
-            $(this).toggleClass('active');
-            return false;
-        });   
+		$(document).on('click','.pd .itemLike',function(e){
+			$(this).toggleClass('active');
+			return false;
+		});   
 
-       
-        
+	   
+		
 		fnOptionSoldout();
 		
 		// 광고 스크립트용
@@ -2156,10 +2157,19 @@
 		
 		// ep 쿠폰확인
 		fnEpCouponDown([[${afLinkCd}]], [[${params.goodsCd}]], 1);
+		
+		
+		 $('.Purchase_pop .btPop_close').click(function(){
+			$('html, body').css({'overflow': 'visible', 'height': '100%'});
+			$('.container').removeClass('btPop_open');
+			autome.style.top  = 100 + "%";
+			return false;
+		});
+		 
 	});
 	
 	 // 상품상세 asis html  이지미 경로 수정
-    window.onload = function(){
+	window.onload = function(){
    	 $(".pd_descrp .cont_body").find('img').each(function() {
 			let tmpImgSrc = $(this).attr('src');
 			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
@@ -2167,42 +2177,65 @@
 			}
 			
 		});
-	}
-	 
-	 $('.Purchase_pop .btPop_close').click(function(){
-			$('html, body').css({'overflow': 'visible', 'height': '100%'});
-			$('.container').removeClass('btPop_open');
-			autome.style.top  = 100 + "%";
-			return false;
-		});
-     
-     $(window).scroll(function(){
-		var lastScrollTop = 0;
-		var st = $(this).scrollTop();
-		if($('header').hasClass("main") !== true){
-			if (st > lastScrollTop){
-				$(".app .gnb").css("position", "fixed");
-				$(".htop").css("background", "#fff");
-				$(".app .gnb .btn-expand").css("position", "fixed");
-				$(".tabbar").removeClass("fixed");
-			} else {
-				$(".app .gnb").css("position", "fixed");
-				$(".htop").css("background", "#fff");
-				$(".app .gnb .btn-expand").css("position", "fixed");
-				$(".tabbar").addClass("fixed");
-				setTimeout(function(){
-					if($(window).scrollTop() === 0){
-						$(".app .gnb").css("position", "relative");
-						$(".app .gnb .btn-expand").css("position", "absolute");
-					}
-				},300)
+	
+   	/*
+		let goodsVideoList = [[${goodsVideoList}]];
+		let videoFlag = false;
+		if (goodsVideoList != null){
+			
+			$.each(goodsVideoList, function(idx, goodsVideo) {
+				if ("M" == goodsVideo.videoGb){
+					videoFlag = true;
+					return false;
+				}
+				
+			});
+		}
+			
+		 if (videoFlag){
+			try {
+				var controller = new VgControllerClient({
+					target_window: document.getElementById('child').contentWindow
+				});
+				//console.log(controller.get_screen());
+				//controller.enable_fullscreen_button(true);
+				// 여기서부터 이벤트 리스너를 등록하거나, 웹페이지 Element에 메소드를 bind하면 됩니다.
+			} catch(e) {
+				// Videogateweay Controller Library는 window.postMessage API를 이용하기 때문에
+				// 해당 기능을 지원하지 않는 웹브라우져에서는 동작하지 않습니다.
+				// 이 부분에 적절한 fail-over 코드를 추가하여 주십시요.
 			}
-			if(st < 10) {
-				$(".htop").css("background", "transparent");
+			controller.mute();
+			controller.play();
+			controller.set_control_visibility(false);
+			
+		}	 */
+		
+		/* $(window).scroll(function(){
+			var scrollTop= $(window).scrollTop();
+			var itemTop=$('.descript_box').offset().top;
+			var winHeight = $(window).height();
+			console.log(winHeight-scrollTop);
+			console.log(winHeight/1.5);
+			if (winHeight-scrollTop <= winHeight/1.5){
+				controller.pause();
+			} else {
+				controller.play();
+				controller.set_control_visibility(false);
 			}
-			lastScrollTop = st;
-		}
-     });
+
+			controller.on('done', function() {
+				controller.play();
+				controller.set_control_visibility(false);
+			});
+		}); */
+
+		$(document).on('click','.pop_open_btn',function(){
+				$('.modal.photo_comment_popup .pop_detail').toggleClass('active');
+		});
+		
+	};
+	
 /*]]>*/
 </script>
 

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

@@ -68,6 +68,7 @@
 /*<![CDATA[*/
 	
 	var fnGoodsQnaList = function() {
+		$('.close-modal').trigger("click");
 		gagajf.ajaxFormSubmit($('#goodsQnaForm').prop('action'), '#goodsQnaForm', fnGetListCallback);
 	}
 

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

@@ -37,8 +37,8 @@
 		<div class="tab_detail_nav">
 			<ul>
 				<li class="active"><a href="javascript:void(0)">상세정보</a></li>
-				<li><a href="javascript:void(0)">리뷰<em><th:block  th:text="${(goodsReviewCnt <= 9999) ? #numbers.formatInteger(goodsReviewCnt, 0,'COMMA')  : '9,999+'}"></th:block></em></a></li>
-				<li><a href="javascript:void(0)">문의<em><th:block  th:text="${(goodsQnaCnt <= 9999) ? #numbers.formatInteger(goodsQnaCnt, 0,'COMMA')  : '9,999+'}"></th:block></em></a></li>
+				<li><a href="javascript:void(0)">리뷰<em><th:block  th:text="${(goodsInfo.reviewRegCnt <= 9999) ? #numbers.formatInteger(goodsInfo.reviewRegCnt, 0,'COMMA')  : '9,999+'}"></th:block></em></a></li>
+				<li><a href="javascript:void(0)">문의<em><th:block  th:text="${(goodsInfo.goodsQnaCnt <= 9999) ? #numbers.formatInteger(goodsInfo.goodsQnaCnt, 0,'COMMA')  : '9,999+'}"></th:block></em></a></li>
 				<li class=""><a href="javascript:void(0)">배송/반품</a></li>
 			</ul>
 		</div>
@@ -48,7 +48,7 @@
 				<div class="item_prod" th:each="goodsInfo, status : ${goodsDealComposeList}">
 					<div class="item_state">
 						<a href="javascript:void(0);" class="itemLink" th:onclick="fnOpenGoodsDealDetail([[${goodsInfo.goodsCd}]],[[${goodsInfo.compsGoodsCd}]])">
-							<div class="rank detail"><span>상품<em class="number" th:text="${#numbers.formatInteger(status.count,2)}">01</em></span></div>
+							<div class="shape dealdetail"><span>상품<br/><th:block th:text="${#numbers.formatInteger(status.count,2)}">01</th:block> </span></div>
 							<div class="itemPic">
 								<img alt="" class="vLHTC pd_img" th:src="${imgGoodsUrl+'/'+goodsInfo.sysImgNm+'?RS=156'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 							</div>
@@ -159,12 +159,12 @@
 										<img alt="" class="vLHTC pd_img" th:src="${imgGoodsUrl+'/'+goodsInfo.sysImgNm+'?RS=331'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 									</div>
 									<p class="itemBrand" th:text="${goodsInfo.brandGroupNm}">BRAND NAME1</p>
-									<div class="itemName" th:text="${goodsInfo.goodsFullNm}">남성 </div>
+									<div class="itemName" ><span class="tit_option" th:text="${'[상품'+status.count+']'}">[상품1]</span><th:block th:text="${goodsInfo.goodsFullNm}"></th:block> </div>
 									<div class="itemText">
 										<span class="tx1">(리뷰 <th:block  th:text="${(goodsInfo.reviewRegCnt <= 9999) ? #numbers.formatInteger(goodsInfo.reviewRegCnt, 0,'COMMA')  : '9,999+'}"></th:block>)</span>
 									</div>
 								</a>
-								<input type="hidden" name="selectGoods" th:value="${goodsInfo.compsGoodsCd}" />
+								<input type="hidden" name="selectGoods" th:value="${goodsInfo.compsGoodsCd}"  th:attr="currPrice=${goodsInfo.currPrice}, selfGoodsYn=${goodsInfo.selfGoodsYn}"/>
 							</div>
 						</div>
 					</li> 
@@ -194,7 +194,7 @@
 										<img alt="" class="vLHTC pd_img" th:src="${imgGoodsUrl+'/'+goodsInfo.sysImgNm+'?RS=331'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 									</div>
 									<p class="itemBrand" th:text="${goodsInfo.brandGroupNm}">BRAND NAME1</p>
-									<div class="itemName" th:text="${goodsInfo.goodsFullNm}">남성 </div>
+									<div class="itemName" ><span class="tit_option" th:text="${'[상품'+status.count+']'}">[상품1]</span><th:block th:text="${goodsInfo.goodsFullNm}"></th:block> </div>
 									<div class="itemText">
 										<span class="tx1">(문의 <th:block  th:text="${(goodsInfo.goodsQnaCnt <= 9999) ? #numbers.formatInteger(goodsInfo.goodsQnaCnt, 0,'COMMA')  : '9,999+'}"></th:block>)</span>
 									</div>
@@ -229,7 +229,7 @@
 										<img alt="" class="vLHTC pd_img" th:src="${imgGoodsUrl+'/'+goodsInfo.sysImgNm+'?RS=331'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 									</div>
 									<p class="itemBrand" th:text="${goodsInfo.brandGroupNm}">BRAND NAME1</p>
-									<div class="itemName" th:text="${goodsInfo.goodsFullNm}">남성 </div>
+									<div class="itemName" ><span class="tit_option" th:text="${'[상품'+status.count+']'}">[상품1]</span><th:block th:text="${goodsInfo.goodsFullNm}"></th:block> </div>
 								</a>
 								<input type="hidden" name="selectGoods" th:value="${goodsInfo.compsGoodsCd}" />
 							</div>
@@ -334,9 +334,11 @@
 		fnGoodsDetailReview(params);  // ajax html
 		
 		$('.pd_pop.pd_listReview_pop').find('.deal_list_select .list li').each(function() { 
-			
+			$(this).removeClass('selected');
 			if (goodsCd == $(this).find('input[name=selectGoods]').val()){
-				let tag = $(this).parent().parent().find('.item_prod').parent().html();
+				$(this).addClass('selected');
+				//let tag = $(this).find('.item_prod').parent().html();
+				let tag = $(this).html();
 				$('.tab_detail_cont.pd_review .item_blk').html(tag);
 			}
 		});

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

@@ -94,7 +94,9 @@
 			return false;
 		}
 		
-		mcxDialog.confirm("저장하시겠습니까?", {
+		gagajf.ajaxFormSubmit($('#goodsQnaDetailForm').prop('action') , $('#goodsQnaDetailForm'), btnGoodsQnaSaveCallBack());
+		
+		/* mcxDialog.confirm("저장하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function() {
@@ -105,10 +107,14 @@
 						}
 				);
 			}
-		});
+		}); */
 		
 	}
 
+	var btnGoodsQnaSaveCallBack = function(){
+		setTimeout(fnGoodsQnaList, 100);
+	}
+	
 /*]]>*/
 </script>
  </html>

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

@@ -34,13 +34,13 @@
 						<div class="swiper-container thumb_list">
 							<div class="swiper-wrapper">
 								<th:block th:if="${review.reviewAttachList != null and !review.reviewAttachList.empty}" >
-								<th:block th:each="reviewAttach, attachStatus : ${review.reviewAttachList}" th:if="${attachStatus.first}">
+								<th:block th:each="reviewAttach, attachStatus : ${review.reviewAttachList}">
 								<div class="swiper-slide">
 									<div class="thumb " th:classAppend="${(reviewAttach.fileGb == 'M') ? 'mov' :''}">
 										<th:block th:if="${reviewAttach.fileGb == 'M'}">
 											<video poster="http://cdn.011st.com/11dims/resize/1999x1999/quality/75/11src/review/10201202/3121412332/2e66698576d64c5c9977a6fe6606008d.jpg" muted="muted" preload="metadata" controls="controls">
-											<source src="http://snsvideo.11st.co.kr/movie/item/www/675/67518524_06_1_C1.mp4" type="video/mp4">
-										</video>
+												<source src="http://snsvideo.11st.co.kr/movie/item/www/675/67518524_06_1_C1.mp4" type="video/mp4">
+											</video>
 										</th:block>
 										<th:block th:unless="${reviewAttach.fileGb == 'M'}">
 											<img th:src="${imgUrl+'/'+reviewAttach.sysFileNm}" alt="">
@@ -159,7 +159,23 @@
 /*<![CDATA[*/
 	
 	$(document).ready( function() {
-
+		 //슬라이드 - 포토,영상리뷰팝업 
+        var photoreviewdetailSwiper = new Swiper('.pd_photoreviewdetail_pop .area_slider .swiper-container', {
+            observer: true,
+            observeParents: true,
+            slidesPerView: 1,
+            pagination: {
+                el: '.swiper-pagination',
+                type: 'fraction',
+            },
+        });
+        // 포토,베스트리뷰숨김
+        var review_open=$(".btn_review_open");
+        $(document).on('click','.btn_review_open',function(e){
+            $(this).toggleClass('active');
+            $(this).next(".review_list").toggleClass('active');
+            return false;
+        });
 
 	});
 	

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

@@ -32,10 +32,10 @@
 							<tbody>
 								<tr th:if="${(goodsCoupon1List != null and !goodsCoupon1List.empty)}">
 									<th>즉시할인</th>
-									<td th:each="goodsCoupon, status : ${goodsCoupon1List}" th:if="${status.first}">최대
+									<td th:each="goodsCoupon, status : ${goodsCoupon1List}" th:if="${status.first}"><p>최대
 									<th:block th:if="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${#numbers.formatInteger(goodsCoupon.dcVal, 0,'COMMA')}원|"></th:block>
 									<th:block th:unless="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${goodsCoupon.dcVal}%|"></th:block>
-									 할인</td>
+									 할인</p></td>
 								</tr>
 								<tr th:if="${(goodsCouponList != null and !goodsCouponList.empty)}">
 									<th>쿠폰할인</th>

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

@@ -312,7 +312,8 @@ let paymentInfo 	= [[${paymentInfo}]];
 let addPayCost 		= 0;
 
 $(document).ready(function() {
-	
+	// 타이틀명
+	$('#htopTitle').text('주문취소');
 });
 
 // 취소수량버튼기능

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

@@ -319,7 +319,6 @@ var fnGetInfiniteScrollDataList = function(pageNo) {
 			if (result != null) {
 				$("#listBox").css("display", "block");
 				$("#listBox").append(result);
-				console.log(result);
 				scrollTemp = true;
 				
 				// 인피니티 스크롤 기억기능

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

@@ -24,7 +24,7 @@
 			<input type="hidden" name="accountNm" 	th:value="${oneData.accountNm}"/>
 			<input type="hidden" name="bankCd" 		th:value="${oneData.bankCd}"/>
 			<input type="hidden" name="chgReason"/>
-					
+
 			<div class="inner wide bg_beige">
 				<div class="order_number">
 					<dl class="clear">
@@ -39,7 +39,7 @@
 						<div th:unless="${oneData.giftPackYn == 'Y'}" class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
 						<div th:if="${oneData.giftPackYn == 'Y'}" class="goods_date">선물일<span class="date" th:text="${oneData.ordDt}"></span></div>
 					</div>
-					
+
 					<!-- 반품상품목록 -->
 					<th:block th:if="${returnList.returnList}" th:each="return, status : ${returnList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 						<div class="goods_section">
@@ -467,6 +467,9 @@ $(document).ready(function() {
 		$('#withdraw').click();
 		$('.wdGb').css('display','none');
 	}
+
+	// 타이틀명
+	$('#htopTitle').text('반품 신청');
 });
 
 // 반품수량버튼기능

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

@@ -2196,8 +2196,8 @@ var custCpnSumAmtCal = function() {
 		var dcSumAmt		= 0;
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
-		//orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
-		orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
+		orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
+		//orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
 		cpn1DcSumAmt		= cpn1DcSumAmt + (cpn1DcAmt * goodsQty);
 		tmtb1DcSumAmt		= tmtb1DcSumAmt + tmtb1DcAmt;
 		tmtb2DcSumAmt		= tmtb2DcSumAmt + tmtb2DcAmt;
@@ -2248,10 +2248,11 @@ var custCpnSumAmtCal = function() {
 		}
 		
 		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
+		var realOrdAmt2		= ordAmt - dcSumAmt - pntDcAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		// 2021.05.11 최종할인금액으로 적립포인트 적용
-		savePntAmt1			= parseInt(realOrdAmt1 * (pntPrate/100));
+		savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
 		
 		// 선포인트사용여부 
 		if (prePntDcAmtYn == "Y") {
@@ -2500,8 +2501,9 @@ $(document).ready( function() {
 
 // PG 카카오페이 결제준비 처리
 var fnKakaoPaymentReady = function() {
-	let nextRedirectUrl = $('#order_info input[name=nextRedirectPcUrl]').val();
-	let option = 'width=420, height=520';
+	//let nextRedirectUrl = $('#order_info input[name=nextRedirectPcUrl]').val();
+	let nextRedirectUrl = $('#order_info input[name=nextRedirectMobileUrl]').val();
+	//let option = 'width=420, height=520';
 	
 	window.open(nextRedirectUrl, 'kakaoPaymentPopup', option);
 }
@@ -2519,10 +2521,10 @@ var fnKakaoPaymentRequest = function(pgToken) {
 
 // PG 네이버페이 결제준비 처리
 var fnNaverPaymentReady = function() {
-	let naverPayUrl = 'https://' + [[${@environment.getProperty('naverPay.payUrl.web')}]];
+	let naverPayUrl = 'https://' + [[${@environment.getProperty('naverPay.payUrl.mob')}]];
 	let reserveId = $('#order_info input[name=reserveId]').val();
 	let url = naverPayUrl + '/payments/' + reserveId;
-	let option = 'width=750, height=' + $(window).height();
+	//let option = 'width=750, height=' + $(window).height();
 	
 	window.open(url, 'naverPaymentPopup', option);
 }

src/main/webapp/WEB-INF/views/web/goods/CardPrmtFormWeb.html

@@ -73,7 +73,7 @@
 									<td>
 										<div class="info_card">
 											<p th:text="${cardInfo.minNoItrt + '~' + cardInfo.maxNoItrt + '개월 무이자'}">2~6개월 무이자</p>
-											<p th:text="${cardInfo.minPayAmt + '만원 이상 구매 시'}">5만원 이상 구매 시</p>
+											<p th:text="${#numbers.formatInteger(cardInfo.minPayAmt, 0,'COMMA') + '원 이상 구매 시'}">5만원 이상 구매 시</p>
 										</div>
 									</td>
 								</tr>

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

@@ -356,7 +356,8 @@
 			let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비
 			let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
 			let spanRefundAmt = Number(result.spanRefundAmt);						// 환불 예정 금액
-			
+			console.log('sumDeliveryFee : '+sumDeliveryFee);
+			console.log('spanTotDeliveryFee : '+spanTotDeliveryFee);
 			let goodsCancelAmt = spanCnclRtnAmt;									// 상품취소금액
 			let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
 			let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)

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

@@ -138,25 +138,6 @@
 	
 	<!-- 주문금액합계 -->
 	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="orderSumAmtInfo" id="orderSumAmtInfo">
-		<tr style="height:30px;">
-			<th>orgGoodsSumAmt</th>
-			<th>delvSumAmt</th>
-			<th>freegiftUsePnt</th>
-			<th>cpn1DcSumAmt</th>
-			<th>ordSumAmt</th>
-			<th>tmtb1DcSumAmt</th>
-			<th>tmtb2DcSumAmt</th>
-			<th>tmtbDcSumAmt</th>
-			<th>goodsCpnDcSumAmt</th>
-			<th>cartCpnDcSumAmt</th>
-			<th>delvCpnDcSumAmt</th>
-			<th>cpnDcSumAmt</th>
-			<th>prePntDcAmt</th>
-			<th>pntDcSumAmt</th>
-			<th>gfcdUseSumAmt</th>
-			<th>realOrdSumAmt</th>
-			<th>savePntSumAmt</th>
-		</tr>
 		<tr style="height:30px;">
 			<td class="orgGoodsSumAmt">0</td>
 			<td class="delvSumAmt" th:text="${sumDelvFee}"></td>
@@ -2115,8 +2096,8 @@ var custCpnSumAmtCal = function() {
 		var dcSumAmt		= 0;
 		
 		// 주문금액 = ((판매가 - 즉시할인가) + 옵션추가금액) * 장바구니수량
-		//orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
-		orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
+		orgGoodsSumAmt		= orgGoodsSumAmt + (orgCurrPrice + optAddPrice) * goodsQty;
+		//orgGoodsSumAmt		= orgGoodsSumAmt + orgCurrPrice;
 		cpn1DcSumAmt		= cpn1DcSumAmt + (cpn1DcAmt * goodsQty);
 		tmtb1DcSumAmt		= tmtb1DcSumAmt + tmtb1DcAmt;
 		tmtb2DcSumAmt		= tmtb2DcSumAmt + tmtb2DcAmt;
@@ -2165,10 +2146,11 @@ var custCpnSumAmtCal = function() {
 		}
 		
 		var realOrdAmt1		= ordAmt - dcSumAmt - pntDcAmt1 - gfcdUseAmt1;
+		var realOrdAmt2		= ordAmt - dcSumAmt - pntDcAmt1;
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		// 2021.05.11 최종할인금액으로 적립포인트 적용
-		savePntAmt1			= parseInt(realOrdAmt1 * (pntPrate/100));
+		savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
 		
 		// 선포인트사용여부 
 		if (prePntDcAmtYn == "Y") {