Merge branch 'develop' into order

src/main/java/com/style24/admin/biz/service/TsaCustomerService.java

@@ -73,6 +73,7 @@ public class TsaCustomerService {
 	 */
 	public Customer getCustomerInfo(Integer custNo) {
 		Customer customer = new Customer();
+		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCustNo(custNo);
 		customer.setCustStat(TscConstants.CustStat.ACTIVE.value());
 		return coreCustomerService.getCustomerInfo(customer);
@@ -138,6 +139,7 @@ public class TsaCustomerService {
 	 */
 	@Transactional("shopTxnManager")
 	public GagaMap saveCustomerSecede(Customer customer) {
+		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCustStat(TscConstants.CustStat.SECEDE.value());
 		return coreCustomerService.saveCustomerSecede(customer);
 	}

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

@@ -226,7 +226,7 @@
 		    , HOME_DTL_ADDR = #{encodedHomeDtlAddr}
 		    </if>
 		    <if test="encodedBirthYmd != null and encodedBirthYmd != ''">
-		    , BIRTH_YMD = REPLACE(#{encodedBirthYmd}, '-', '')
+		    , BIRTH_YMD = #{encodedBirthYmd}
 		    </if>
 		    <if test="encodedEmail != null and encodedEmail != ''">
 		    , EMAIL = #{encodedEmail}

src/main/webapp/WEB-INF/views/customer/CustomerDetailForm.html

@@ -967,6 +967,7 @@
 
 	});
 
+	// 기본정보 - 탈퇴버튼
 	$('#btnCustSecede').on('click', function () {
 		let custNo = $('#custInfoForm input[name=custNo]').val();
 		if (gagajf.isNull(custNo)) {
@@ -1009,7 +1010,7 @@
 		if (customer.smsAgreeYn === orgData.smsAgreeYn) {
 			customer.smsAgreeYn = '';
 		}
-
+		customer.birthYmd = customer.birthYmd.replaceAll('-', '');
 
 		mcxDialog.confirm("기본정보를 수정 하시겠습니까?", {
 			cancelBtnText: "취소",

src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html

@@ -27,6 +27,7 @@
 
 	<!-- 검색조건 영역 -->
 	<form id="searchForm" name="searchForm" action="#" th:action="@{'/display/category/goods/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
+		<input type="hidden" id="cateLeafYn" value="N"/>
 		<div class="panelStyle">
 			<input type="hidden" id="searchGb" name="searchGb" />
 			<table class="frmStyle" aria-describedby="검색조건">
@@ -99,9 +100,9 @@
 		</ul>
 		<ul class="panelBar">
 			<li class="aR" id="btnGoodsEdit" style="display:none">
-				<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnAddGoods">상품추가</button>
-				<!-- <button type="button" class="btn btn-primary btn-lg" id="btnDispChange">순서변경</button>
-                <button type="button" class="btn btn-primary btn-lg" id="btnSelectTop">선택최상위로</button> -->
+				<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnAddGoods" style="display:none">상품추가</button>
+				<button type="button" class="btn btn-primary btn-lg" id="btnDispChange">순서변경</button>
+                <button type="button" class="btn btn-primary btn-lg" id="btnSelectTop">선택최상위로</button>
 				<button type="button" class="btn btn-danger btn-lg" id="btnSelectDel">선택삭제</button>
 			</li>
 		</ul>
@@ -110,17 +111,45 @@
 	<!-- 상품이동/복사 -->
 	<div class="panelStyle" id="addCategory" style="display:none">
 		<form id="saveForm" name="saveForm" action="#" th:action="@{'/display/goods/category/save'}">
-
+			<ul class="panelBar">
+				<li>
+					<strong>* 상품 선택 후 하단 leaf 카테고리 선택시 상품이동/ 상품복사 가능합니다.</strong>
+				</li>
+				<li class="right">
+					<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnMoveGoods">상품이동</button>
+					<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnCopyGoods">상품복사</button>
+				</li>
+			</ul>
+
+			<table class="frmStyle">
+				<colgroup>
+					<col style="width:20%"/>
+					<col style="width:20%"/>
+					<col style="width:20%"/>
+					<col style="width:20%"/>
+					<col style="width:20%"/>
+				</colgroup>
+				<tr>
+					<th>카테고리구분</th>
+					<th>카테고리1</th>
+					<th>카테고리2</th>
+					<th>카테고리3</th>
+					<th>카테고리4</th>
+				</tr>
+				<tr>
+					<td>
+						<select>
+							<option value="">[카테고리구분]</option>
+							<option th:if="${cateGbList}" th:each="oneData, status : ${cateGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+						</select>
+					</td>
+					<td>2</td>
+					<td>3</td>
+					<td>4</td>
+					<td>5</td>
+				</tr>
+			</table>
 		</form>
-
-		<!-- 버튼 배치 영역 -->
-		<ul class="panelBar">
-			<li class="right">
-				<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnMoveGoods">상품이동</button>
-				<button type="button" class="btn btn-primary btn-lg leafCateBtn" id="btnCopyGoods">상품복사</button>
-			</li>
-		</ul>
-		<!-- //버튼 배치 영역 -->
 	</div>
 	<!-- 상품이동/복사 -->
 	</form>
@@ -168,10 +197,23 @@
 		if (gagajf.isNull(val)) {
 			if (selLvl > 1) {
 				selLvl = selLvl - 1;
-				$("#goodsSearch").show();
-				$("#btnGoodsEdit").show();
+				if(gagajf.isNull($("#selCate2").val())){
+					$("#goodsSearch").hide();
+					$("#btnGoodsEdit").hide();
+					gagaPaging.load(1);
+				}
 			} else {
 				selLvl = 1;
+				$("#goodsSearch").hide();
+				$("#btnGoodsEdit").hide();
+			}
+		}else{
+			if (selLvl > 1) {
+				$("#goodsSearch").show();
+				$("#btnGoodsEdit").show();	// 순서변경,선택최상위로,선택삭제
+			}else{
+				$("#goodsSearch").hide();
+				$("#btnGoodsEdit").hide();
 			}
 		}
 		$('#searchForm input[name=selLvl]').val(selLvl);
@@ -211,6 +253,11 @@
 
 		// 대카테고리 이상이면 상품 조회해서 그리드
 		if(selLvl > 2){
+			if(data.length<1){
+				$("#cateLeafYn").val('Y');
+			}else{
+				$("#cateLeafYn").val('N');
+			}
 			$('#searchForm input[name=selLvl]').val(selLvl);
 			fnCategoryGoodsListSearch();
 		}
@@ -219,6 +266,13 @@
 	var fnCategoryGoodsListSearch = function(){
 		gagaPaging.init('searchForm', fnSearchCallBack, 'categoryGoodsListPagination', $('#searchForm').find('#pageSize').val());
 		gagaPaging.load(1);
+		if($("#cateLeafYn").val()=='Y'){
+			$("#addCategory").show();	// 상품이동/복사 show
+			$("#btnAddGoods").show();	// [상품추가] show
+		}else{
+			$("#addCategory").hide();	// 상품이동/복사 hide
+			$("#btnAddGoods").hide();	// [상품추가] hide
+		}
 	}
 
 	var fnSearchCallBack = function(result){