이태영 - 20210727 네이버페이 주문형 SCM 클레임건 추가 개발 및 수정사항 수정

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

@@ -944,6 +944,7 @@ public class TsfCartService {
 			for (Order delv : delvFeeInfo) {
 				if (param.getDelvFeeCd().equals(delv.getDelvFeeCd()) && !"WMS".equals(param.getDelvFeeCd())) {
 					param.setCompCnt(delv.getCompCnt());
+					param.setDelvFeeCrite(delv.getDelvFeeCrite());
 					if (TscConstants.DelvFeeCrite.FREE.value().equals(delv.getDelvFeeCrite())) {
 						param.setDelvFee(0);
 					} else if (TscConstants.DelvFeeCrite.NORMAL.value().equals(delv.getDelvFeeCrite()) && delv.getCompSumPrice() > delv.getMinOrdAmt()) {

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

@@ -1209,7 +1209,6 @@ public class TsfOrderService {
 				sb.append("\t\t<ecMallProductId>").append(item.getGoodsCd()).append("</ecMallProductId>\n");	//<!-- 상품코드 -->
 				sb.append("\t\t<name>").append("<![CDATA[").append(item.getGoodsNm()).append("]]>").append("</name>\n");	//<!-- 상품명 -->
 				sb.append("\t\t<basePrice>").append(item.getCurrPrice()).append("</basePrice>\n");				//<!-- 상품금액 -->
-				// TODO http: 부분 운영 프로토콜 확인 후 수정 필요(운영 상품상세가 HTTPS일 경우 분기처리 필요(개발서버, 운영 구분))
 				sb.append("\t\t<infoUrl>").append("<![CDATA[https:").append(param.getGoodsUrl()).append(item.getGoodsCd()).append("]]>").append("</infoUrl>\n");		//<!-- 상품상세페이지 URL -->
 				sb.append("\t\t<imageUrl>").append("<![CDATA[https:").append(goodsImgUrl).append("/").append(item.getSysImgNm()).append("]]>").append("</imageUrl>\n");	//<!-- 상품원본이미지 URL -->
 

src/main/webapp/WEB-INF/views/mob/cart/CartListAjaxFormMob.html

@@ -70,7 +70,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="inner">
+		<div class="inner" style="padding:1.5rem 2rem;">
 			<div class="sec_select">
 				<div class="form_field">
 					<input id="od_item_all" type="checkbox" checked="checked"><label for="od_item_all"><span>전체선택</span></label>

src/main/webapp/WEB-INF/views/web/cart/CartListAjaxFormWeb.html

@@ -439,7 +439,7 @@
 										<span class="dlvr_fee delvFeeArea" th:if="${cart.delvFee == 0}">배송비 무료</span>
 										<span class="dlvr_fee delvFeeArea" th:if="${cart.delvFee > 0}">배송비&nbsp;<em th:text="${#numbers.formatInteger(cart.delvFee, 1, 'COMMA')}"></em>원</span>
 										<span class="dlvr_shop"><em th:text="${cart.supplyCompNm}"></em>&nbsp;업체직배송</span>
-										<a th:href="|javascript:fnGetDelvFeeSaveGoods('${cart.delvFeeCd}', '${cart.minOrdAmt - cart.compSumPrice}');|" class="btn_popup_save btn_dlvrSave_pop" th:if="${cart.delvFee > 0}">배송비 SAVE 상품 보기</a>
+										<a th:href="|javascript:fnGetDelvFeeSaveGoods('${cart.delvFeeCd}', '${cart.minOrdAmt - cart.compSumPrice}');|" class="btn_popup_save btn_dlvrSave_pop" th:if="${cart.delvFee > 0 and cart.delvFeeCrite != 'G078_30'}">배송비 SAVE 상품 보기</a>
 									</div>
 								</div>
 							</div>
@@ -1262,6 +1262,39 @@
 			}
 			changeCartSqArr();
 		});
+
+		$(function(){
+			$("#container .od_recommend").show();
+
+			//추천상품 슬라이드
+			var rcmdItemSwiper = new Swiper('.od_recommend .swiper-container', {
+				slidesPerView: 5,
+				slidesPerGroup: 5, //210708_ 추가 : 슬라이드 전환시 5개씩 이동.
+				spaceBetween: 20,
+				navigation: {
+					nextEl: '.od_recommend .swiper-button-next',
+					prevEl: '.od_recommend .swiper-button-prev',
+				},
+				pagination: {
+					el: '.od_recommend .swiper-pagination',
+					clickable: true,
+				},
+			});
+			//지금 많이 보고 있어요 슬라이드
+			var realtimeItemSwiper = new Swiper('.od_realtime .swiper-container', {
+				slidesPerView: 5,
+				slidesPerGroup: 5, //210708_ 추가 : 슬라이드 전환시 5개씩 이동.
+				spaceBetween: 20,
+				navigation: {
+					nextEl: '.od_realtime .swiper-button-next',
+					prevEl: '.od_realtime .swiper-button-prev',
+				},
+				pagination: {
+					el: '.od_realtime .swiper-pagination',
+					clickable: true,
+				},
+			});
+		});
 	</script>
 </div>
 </html>

src/main/webapp/WEB-INF/views/web/cart/CartListFormWeb.html

@@ -46,7 +46,7 @@
 			</div>
 
 			<th:block th:if="${cartSize>0}">
-				<div class="content od_recommend">
+				<div class="content od_recommend" style="display:none;">
 					<div class="cont_head">
 						<h4 class="subH1 t_c mb40">추천상품</h4>
 					</div>
@@ -88,7 +88,7 @@
 			</th:block>
 
 			<th:block th:if="${cartSize == null or cartSize == 0}">
-				<div class="content od_recommend od_realtime">
+				<div class="content od_recommend od_realtime" style="display:none;">
 					<div class="cont_head">
 						<h4 class="subH1 t_c mb40">지금 많이 보고 있어요</h4>
 					</div>
@@ -300,37 +300,6 @@
         $(this).parent().parent().parent().find(".color").text(optColor);
         return false;
     });
-
-    $(function(){
-        //추천상품 슬라이드
-		var rcmdItemSwiper = new Swiper('.od_recommend .swiper-container', {
-			slidesPerView: 5,
-			slidesPerGroup: 5, //210708_ 추가 : 슬라이드 전환시 5개씩 이동.
-			spaceBetween: 20,
-			navigation: {
-				nextEl: '.od_recommend .swiper-button-next',
-				prevEl: '.od_recommend .swiper-button-prev',
-			},
-			pagination: {
-				el: '.od_recommend .swiper-pagination',
-				clickable: true,
-			},
-		});
-		//지금 많이 보고 있어요 슬라이드
-		var realtimeItemSwiper = new Swiper('.od_realtime .swiper-container', {
-			slidesPerView: 5,
-			slidesPerGroup: 5, //210708_ 추가 : 슬라이드 전환시 5개씩 이동.
-			spaceBetween: 20,
-			navigation: {
-				nextEl: '.od_realtime .swiper-button-next',
-				prevEl: '.od_realtime .swiper-button-prev',
-			},
-			pagination: {
-				el: '.od_realtime .swiper-pagination',
-				clickable: true,
-			},
-		});
-    });
 </script>
 <!--네이버페이 전환스크립트를 이용하여 전환값 설정-->
 <script th:inline="javascript">