Merge remote-tracking branch 'TSIT/ST24PRJ-333(무료배송)' into develop

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

@@ -1146,9 +1146,12 @@ public class TsfCartService {
 		for (Order param : params) {
 			// 입점업체 배송비
 			for (Order delv : delvFeeInfo) {
-				if (param.getDelvFeeCd().equals(delv.getDelvFeeCd()) && !"WMS".equals(param.getDelvFeeCd())) {
+				
+				// 2022.01.13 입점업체 배송비에는 자사 배송비 정책 수정 (WMS, WMS_FREE);
+				if (param.getDelvFeeCd().equals(delv.getDelvFeeCd()) && param.getDelvFeeCd().indexOf("WMS") < 0) {
 					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()) {
@@ -1209,8 +1212,10 @@ public class TsfCartService {
 
 				// 배송비 합계
 				if ("Y".equals(cart.getFirstCompYn())) {
+					// 2022.01.13
 					// 2021.08.13 자사는 전체배송비에서 제외 아래에서 처리하고있음
-					if (!"WMS".equals(cart.getDelvFeeCd())) {
+					//if (!"WMS".equals(cart.getDelvFeeCd())) {
+					if (cart.getDelvFeeCd().indexOf("WMS") < 0) {
 						order.setTotDelvFee(order.getTotDelvFee() + cart.getDelvFee());
 					}
 				}
@@ -1285,6 +1290,8 @@ public class TsfCartService {
 
 		if ("WMS".equals(param.getDelvFeeCd())) {
 			goods.setSelfGoodsYn("Y");
+			// 2022.01.13 자사무료배송
+			goods.setDelvFeeCd(param.getDelvFeeCd());
 		} else {
 			goods.setDelvFeeCd(param.getDelvFeeCd());
 		}

src/main/java/com/style24/front/support/security/TsfAuthenticationProvider.java

@@ -113,11 +113,8 @@ public class TsfAuthenticationProvider implements AuthenticationProvider {
 		}
 		
 		// 활동회원 중 본인인증이 필요한 회원
-		// 2021.10.26 김유중 : ci 없는 회원이 본인 인증 시 실패가 많아서 로그인 처리로 변경(정지혜과장,전석훈차장 협의)
+//		2021.10.26 김유중 : ci 없는 회원이 본인 인증 시 실패가 많아서 로그인 처리로 변경(정지혜과장,전석훈차장 협의)
 		if (TscConstants.CustStat.ACTIVE.value().equals(loginInfo.getCustStat()) && StringUtils.isBlank(loginInfo.getCi())) {
-			
-			log.info("loginInfo.getCustNo()) ::: {}", loginInfo.getCustNo());
-			
 			TsfSession.setAttribute("custNo", String.valueOf(loginInfo.getCustNo()));
 			throw new TsfNonCertificationAccountException(message.getMessage("LOGN_0009"));
 		}

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

@@ -726,8 +726,7 @@
 		             , (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY WHERE SUPPLY_COMP_CD = G.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
 		             , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = CD.ITEM_CD) AS ITEM_NM
 		             , (SELECT MIN(DATE_FORMAT(DELV_RES_DT,'%Y.%m.%d')) FROM TB_GOODS_RES_SELL WHERE GOODS_CD = G.GOODS_CD AND NOW() <![CDATA[ < ]]> DELV_RES_DT AND USE_YN = 'Y') AS DELV_RES_DT
-		             , CASE WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
-		                    ELSE DFP.DELV_FEE_CD END AS DELV_FEE_CD
+		             , G.DELV_FEE_CD
 		             , CASE WHEN GQDS.GOODS_CD IS NULL AND G.SELF_GOODS_YN = 'Y' THEN 'SHOT'
 		                    WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
 		                    ELSE DFP.DELV_FEE_CD END AS CART_DELV_FEE_CD

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

@@ -149,14 +149,7 @@
 			</otherwise>
 		</choose>
 		<if test="delvFeeCd != null and delvFeeCd != ''">
-			<choose>
-				<when test="delvFeeCd == 'WMS'">
-		           AND G.SELF_GOODS_YN = 'Y'
-				</when>
-				<otherwise>
 		           AND OD.DELV_FEE_CD = #{delvFeeCd}
-				</otherwise>
-			</choose>
 		</if>
 		           AND O.DISP_YN = 'Y'
 		           AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
@@ -320,14 +313,7 @@
 		           AND O.ORD_NO = #{ordNo}
 		</if>
 		<if test="delvFeeCd != null and delvFeeCd != ''">
-			<choose>
-				<when test="delvFeeCd == 'WMS'">
-		           AND G.SELF_GOODS_YN = 'Y'
-				</when>
-				<otherwise>
 		           AND OD.DELV_FEE_CD = #{delvFeeCd}
-				</otherwise>
-			</choose>
 		</if>
 		<choose>
 			<when test="chgGb == 'G680_30'">

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

@@ -135,6 +135,12 @@
 								<div class="od_name">
 									<div class="brand">
 										<span th:text="${cart.brandGroupNm}"></span>
+										<!-- 2022.01.13 자사무료배송 -->
+										<th:block th:if="${cart.delvFeeCd == 'WMS_FREE'}">
+											<span class="icon_tag">
+												<em class="tag_stype2">무료배송</em>
+											</span>
+										</th:block>
 									</div>
 									<div class="name"><a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|" th:text="${cart.goodsNm}"></a></div>
 								</div>
@@ -242,6 +248,12 @@
 								<div class="od_name">
 									<div class="brand">
 										<span th:text="${cart.brandGroupNm}"></span>
+										<!-- 2022.01.13 자사무료배송 -->
+										<th:block th:if="${cart.delvFeeCd == 'WMS_FREE'}">
+											<span class="icon_tag">
+												<em class="tag_stype2">무료배송</em>
+											</span>
+										</th:block>
 									</div>
 									<div class="name"><a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|" th:text="${cart.goodsNm}"></a></div>
 								</div>

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

@@ -181,7 +181,7 @@
 																<th>제공받는 자</th>
 																<td>
 																	<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' || ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																			<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																				<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																			</th:block>

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

@@ -265,7 +265,7 @@
 													<th>제공받는 자</th>
 													<td>
 														<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' || ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																	<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																</th:block>
@@ -355,7 +355,7 @@
 													<th>제공받는 자</th>
 													<td>
 														<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+															<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' || ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																	<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																</th:block>

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

@@ -125,6 +125,10 @@
 														</span>
 														<p>
 															<span class="brand" th:text="${cart.brandGroupNm}"></span>
+															<!-- 2022.01.13 자사무료배송 -->
+															<th:block th:if="${cart.delvFeeCd == 'WMS_FREE'}">
+																<span><em class="tag primary_line">무료배송상품</em><span>
+															</th:block>
 														</p>
 														<p>
 															<span class="name" th:text="${cart.goodsNm}"></span>
@@ -240,7 +244,13 @@
 												<div class="gd_item">
 													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|">
 														<span class="thumb"><img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm} + '?RS=100'" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'" src="/" width="100%"  th:alt="${cart.sysImgNm}" alt=""></span>
-														<p><span class="brand" th:text="${cart.brandGroupNm}"></span></p>
+														<p>
+															<span class="brand" th:text="${cart.brandGroupNm}"></span>
+															<!-- 2022.01.13 자사무료배송 -->
+															<th:block th:if="${cart.delvFeeCd == 'WMS_FREE'}">
+																<span><em class="tag primary_line">무료배송상품</em><span>
+															</th:block>
+														</p>
 														<p><span class="name" th:text="${cart.goodsNm}"></span></p>
 													</a>
 												</div>

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

@@ -101,7 +101,7 @@
 															<tr>
 																<td>
 																	<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+																		<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' || ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																			<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																				<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																			</th:block>

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

@@ -269,7 +269,7 @@
 														<tr class="paymentinfo agree2">
 															<td>
 																<th:block th:each="delvFeeCd, i : ${delvFeeCdList}">
-																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS'">
+																	<th:block th:unless="${delvFeeCd.delvFeeCd} == 'WMS' || ${delvFeeCd.delvFeeCd} == 'WMS_FREE'">
 																		<th:block th:if="${i.count == #lists.size(delvFeeCdList)}">
 																			<th:block th:text="|${delvFeeCd.supplyCompNm}|"></th:block>
 																		</th:block>