Merge branch 'card007' into develop

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

@@ -2190,6 +2190,21 @@ public class TsfMypageController extends TsfBaseController {
 		GagaMap result = coreKcpService.checkAccount(custAccount);
 		if ("0000".equals(result.get("resCd"))) {
 			isValid = true;
+
+			// 환불계좌 등록 처리
+			if (TsfSession.isLogin()) {
+				Integer custNo = TsfSession.getInfo().getCustNo();
+				Order refundAccount = new Order();
+				refundAccount.setCustNo(custNo);
+				refundAccount.setBankCd(custAccount.getBankCd());
+				refundAccount.setAccountNo(custAccount.getAccountNo());
+				refundAccount.setAccountNm(custAccount.getAccountNm());
+				refundAccount.setRegNo(custNo);
+				refundAccount.setUpdNo(custNo);
+				refundAccount.encryptData();
+
+				coreOrderChangeService.saveRefundAccount(refundAccount);
+			}
 		}
 		result.setBoolean("isValid", isValid);
 		return result;

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

@@ -3576,6 +3576,9 @@
 		            WHERE GOODS_CD = G.GOODS_CD
 		            AND BENEFIT_GB = '40'
 		        )
+		<if test="maxRow != null and maxRow > 0">
+		    LIMIT #{maxRow}
+		</if>
 		    ) G
 		    WHERE 1 = 1
 		)

src/main/webapp/WEB-INF/views/mob/SigninFormMob.html

@@ -76,11 +76,15 @@
 				<div class="t_c sns_wrap">
 					<h3 class="sr-only">간편로그인</h3>
 					<ul class="login_utill">
+						<!-- 2021.09.01 card007 카카오싱크 검수 주석처리 -->
+						<th:block th:if="false">
 						<li class="lu_kakao">
 							<a href="javascript:void(0)" onclick="cfnLoginKakao();">
 								<div class="ico"></div>카카오
 							</a>
 						</li>
+						</th:block>
+						<!-- //2021.09.01 card007 카카오싱크 검수 주석처리 -->
 						<li class="lu_naver">
 							<a href="javascript:void(0)" onclick="cfnLoginNaver();">
 								<div class="ico"></div>네이버

src/main/webapp/WEB-INF/views/mob/customer/JoinTypeFormMob.html

@@ -47,11 +47,15 @@
 				<div class="t_c sns_wrap">
 					<h5>간편하게 시작하기</h5>
 					<ul class="login_utill">
+						<!-- 2021.09.01 card007 카카오싱크 검수 주석처리 -->
+						<th:block th:if="false">
 						<li class="lu_kakao">
 							<a href="javascript:void(0);" onclick="cfnLoginKakao();">
 								<div class="ico"></div>카카오
 							</a>
 						</li>
+						</th:block>
+						<!-- //2021.09.01 card007 카카오싱크 검수 주석처리 -->
 						<li class="lu_naver">
 							<a href="javascript:void(0);" onclick="cfnLoginNaver();">
 								<div class="ico"></div>네이버

src/main/webapp/WEB-INF/views/web/SigninFormWeb.html

@@ -80,12 +80,16 @@
 					<div class="sns_wrap">
 						<h5 class="sr-only">간편로그인</h5>
 						<ul>
+							<!-- 2021.09.01 card007 카카오싱크 검수 주석처리 -->
+							<th:block th:if="false">
 							<li>
 								<a href="javascript:void(0)" onclick="cfnLoginKakao();">
 									<i class="ico ico_snslogin kakao"></i>
 									<span>카카오</span>
 								</a>
 							</li>
+							</th:block>
+							<!-- //2021.09.01 card007 카카오싱크 검수 주석처리 -->
 							<li>
 								<a href="javascript:void(0)" onclick="cfnLoginNaver();">
 									<i class="ico ico_snslogin naver"></i>

src/main/webapp/WEB-INF/views/web/customer/JoinTypeFormWeb.html

@@ -38,12 +38,16 @@
 					<div class="sns_wrap">
 						<h5>간편하게 시작하기</h5>
 						<ul>
+							<!-- 2021.09.01 card007 카카오싱크 검수 주석처리 -->
+							<th:block th:if="false">
 							<li>
 								<a href="javascript:void(0)" onclick="cfnLoginKakao();">
 									<i class="ico ico_snslogin kakao"></i>
 									<span>카카오</span>
 								</a>
 							</li>
+							</th:block>
+							<!-- //2021.09.01 card007 카카오싱크 검수 주석처리 -->
 							<li>
 								<a href="javascript:void(0)" onclick="cfnLoginNaver();">
 									<i class="ico ico_snslogin naver"></i>

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

@@ -70,12 +70,12 @@
 						<input type="radio" name="rdi-paynormal" id="payRealBank" class="KCP" value="KCP|G014_10"> 
 						<label for="payRealBank"><span class="payType">실시간계좌이체</span></label>
 					</li>
-					<!-- 
+					<th:block th:if="${sessionInfo.custId == 'card007'}">
 					<li>
 						<input type="radio" name="rdi-paynormal" id="payVirtualBank" class="KCP" value="KCP|G014_20"> 
 						<label for="payVirtualBank"><span class="payType">무통장입금</span></label>
 					</li>
-					 -->
+					</th:block>
 				</ul>
 			</div>
 		</div>