Merge branch 'develop' into bin2107

src/main/java/com/style24/persistence/domain/Delivery.java

@@ -42,7 +42,7 @@ public class Delivery extends TscBaseDomain {
 	private String recipNm;
 	private String recipTelno;
 	private String recipPhnno;
-	private String recipZipNo;
+	private String recipZipcode;
 	private String recipBaseAddr;
 	private String recipDtlAddr;
 	private String delvMemo;

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

@@ -20,7 +20,7 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , DATE_FORMAT(EMAIL_AGREE_DT, '%Y%m%d%H%i%S') AS EMAIL_AGREE_DT
-		     , HOME_ZIP_NO
+		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
 		     , SITE_CD
@@ -132,7 +132,7 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , DATE_FORMAT(EMAIL_AGREE_DT, '%Y%m%d%H%i%S') AS EMAIL_AGREE_DT
-		     , HOME_ZIP_NO
+		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
 		     , SITE_CD
@@ -196,8 +196,8 @@
 		                    END,
 		     SMS_AGREE_YN = #{smsAgreeYn},
 		    </if>
-		    <if test="homeZipNo != null and homeZipNo != ''">
-		     HOME_POST_NO = #{homeZipNo},
+		    <if test="homeZipcode != null and homeZipcode != ''">
+		     HOME_ZIPCODE = #{homeZipcode},
 		    </if>
 		    <if test="homeBaseAddr != null and homeBaseAddr != ''">
 		     HOME_BASE_ADDR = #{homeBaseAddr},
@@ -288,7 +288,7 @@
 		     , CDA.RECIP_NM
 		     , CDA.RECIP_PHNNO
 		     , CDA.RECIP_TELNO
-		     , CDA.RECIP_ZIP_NO
+		     , CDA.RECIP_ZIPCODE
 		     , CDA.RECIP_BASE_ADDR
 		     , CDA.RECIP_DTL_ADDR
 		     , CDA.DEL_YN
@@ -323,7 +323,7 @@
 		     , RECIP_NM
 		     , RECIP_PHNNO
 		     , RECIP_TELNO
-		     , RECIP_ZIP_NO
+		     , RECIP_ZIPCODE
 		     , RECIP_BASE_ADDR
 		     , RECIP_DTL_ADDR
 		     , DELV_MEMO
@@ -340,7 +340,7 @@
 		     , #{recipNm}
 		     , #{recipPhnno}
 		     , #{recipTelno}
-		     , #{recipZipNo}
+		     , #{recipZipcode}
 		     , #{recipBaseAddr}
 		     , #{recipDtlAddr}
 		     , #{delvMemo}
@@ -356,7 +356,7 @@
 		     , RECIP_NM = #{recipNm}
 		     , RECIP_PHNNO = #{recipPhnno}
 		     , RECIP_TELNO = #{recipTelno}
-		     , RECIP_ZIP_NO = #{recipZipNo}
+		     , RECIP_ZIPCODE = #{recipZipcode}
 		     , RECIP_BASE_ADDR = #{recipBaseAddr}
 		     , RECIP_DTL_ADDR  = #{recipDtlAddr}
 		     , DEL_YN = IFNULL(#{delYn}, 'N')
@@ -666,7 +666,7 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , DATE_FORMAT(EMAIL_AGREE_DT, '%Y%m%d%H%i%S') AS EMAIL_AGREE_DT
-		     , HOME_ZIP_NO
+		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
 		     , SITE_CD
@@ -750,7 +750,7 @@
 		     , EMAIL
 		     , EMAIL_AGREE_YN
 		     , DATE_FORMAT(EMAIL_AGREE_DT, '%Y%m%d%H%i%S') AS EMAIL_AGREE_DT
-		     , HOME_ZIP_NO
+		     , HOME_ZIPCODE
 		     , HOME_BASE_ADDR
 		     , HOME_DTL_ADDR
 		     , SITE_CD

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

@@ -148,7 +148,7 @@
 									<tr>
 										<th class="dashR">자택주소</th>
 										<td class="dashR" colspan="3">
-											<input type="text" id="homeZipNo" name="homeZipNo" class="w100" readonly="readonly"/>
+											<input type="text" id="homeZipcode" name="homeZipcode" class="w100" readonly="readonly"/>
 											<button type="button" class="btn btn-info btn-lg" onclick="fnOpenDaumAddr('custInfoForm');">우편번호찾기</button>
 											<br/>
 											<input type="text" id="homeBaseAddr" name="homeBaseAddr" class="w300" readonly="readonly"/>
@@ -306,7 +306,7 @@
 									<tr>
 										<th>주소<i class="star"></i></th>
 										<td colspan="5">
-											<input type="text" id="recipZipNo" name="recipZipNo" class="w100" maxlength="10" required="required" data-valid-name="주소"/>
+											<input type="text" id="recipZipcode" name="recipZipcode" class="w100" maxlength="10" required="required" data-valid-name="주소"/>
 											<button type="button" class="btn btn-info btn-lg" onclick="fnOpenDaumAddr('custAddrForm');">우편번호찾기</button>
 											<br/>
 											<input type="text" id="recipBaseAddr" name="recipBaseAddr" class="w300" maxlength="50" required="required" data-valid-name="주소"/>
@@ -436,6 +436,8 @@
 					<li id="tab10" class="tab">
 						<!-- TAB10 PANELSTYLE -->
 						<div class="panelStyle">
+							<form id="custContactHstForm" name="custContactHstForm" action="#" method="post">
+							<input type="hidden" name="custNo" th:value="${custNo}"/>
 							<h4>회원접촉이력</h4>
 							<table class="frmStyle">
 								<colgroup>
@@ -475,6 +477,7 @@
 							</table>
 							<br/>
 							<div id="custContactList" class="ag-theme-balham" style="width: 100%; height: 420px;"></div>
+							</form>
 						</div>
 						<!-- //TAB10 PANELSTYLE -->
 					</li>
@@ -523,7 +526,6 @@
 	const contactTypeList = gagajf.convertToArray([[${contactTypeList}]]);			//회원접촉유형
 	const contactMethodList = gagajf.convertToArray([[${contactMethodList}]]);		//회원접촉방법
 	const genderGbList = gagajf.convertToArray([[${genderGbList}]]);				// 성별
-	let orgData;
 
 	//구매내역 그리드
 	const columnOrderDefs = [
@@ -602,7 +604,7 @@
 				return gagaAgGrid.toDateTimeFormat(params.value);
 			}
 		},
-		{headerName: "확인ID", field: "ansId", width: 100, cellClass: 'text-center'},
+		{headerName: "확인NO", field: "ansNo", width: 100, cellClass: 'text-center'},
 		{headerName: "확인자", field: "userNm", width: 100, cellClass: 'text-center'}
 	];
 
@@ -627,7 +629,7 @@
 				return gagaAgGrid.toDateTimeFormat(params.value);
 			}
 		},
-		{headerName: "확인ID", field: "ansId", width: 100, cellClass: 'text-center'},
+		{headerName: "확인NO", field: "ansNo", width: 100, cellClass: 'text-center'},
 		{headerName: "확인자", field: "userNm", width: 100, cellClass: 'text-center'}
 	];
 
@@ -663,7 +665,7 @@
 			}
 		},
 		{headerName: "쿠폰발행 상세사유", field: "pubReasonDtl", width: 300, cellClass: 'text-center'},
-		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
+		{headerName: "등록자", field: "regNo", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -704,7 +706,7 @@
 			}
 		},
 		{headerName: "포인트상세사유", field: "occurDtlDesc", width: 300, cellClass: 'text-center'},
-		{headerName: "등록자", field: "regId", width: 100, cellClass: 'text-center'}
+		{headerName: "등록자", field: "regNo", width: 100, cellClass: 'text-center'}
 	];
 
 	//상품권내역 그리드
@@ -814,7 +816,7 @@
 		{headerName: "수령자", field: "recipNm", width: 100, cellClass: 'text-center'},
 		{headerName: "전화번호", field: "recipTelno", width: 130, cellClass: 'text-center'},
 		{headerName: "휴대전화번호", field: "recipPhnno", width: 130, cellClass: 'text-center'},
-		{headerName: "우편번호", field: "recipZipNo", width: 100, cellClass: 'text-center'},
+		{headerName: "우편번호", field: "recipZipcode", width: 100, cellClass: 'text-center'},
 		{headerName: "기본주소", field: "recipBaseAddr", width: 300, cellClass: 'text-left'},
 		{headerName: "상세주소", field: "recipDtlAddr", width: 150, cellClass: 'text-left'},
 		{
@@ -824,7 +826,7 @@
 			}
 		},
 		{headerName: "삭제", field: "delYn", width: 50, cellClass: 'text-center'},
-		{headerName: "수정자", field: "updNm", width: 100, cellClass: 'text-center'},
+		{headerName: "수정자", field: "updNo", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "수정일시", field: "updDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -849,7 +851,7 @@
 			}
 		},
 		{headerName: "내용", field: "contactContents", width: 1000, cellClass: 'text-center'},
-		{headerName: "등록자", field: "regId", width: 100, cellClass: 'text-center'},
+		{headerName: "등록자", field: "regNo", width: 100, cellClass: 'text-center'},
 		{
 			headerName: "등록일", field: "regDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
@@ -862,8 +864,8 @@
 	let gridCounselOptions = gagaAgGrid.getGridOptions(columnCounselDefs);	//1:1문의내역 그리드
 	let gridGoodsQnaOptions = gagaAgGrid.getGridOptions(columnGoodsQnaDefs);//상품문의내역 그리드
 	let gridCouponOptions = gagaAgGrid.getGridOptions(columnCouponDefs);	//쿠폰내역 그리드
-	let gridGiftCardOptions = gagaAgGrid.getGridOptions(columnGiftCardDefs);//상품권내역 그리드
 	let gridPointOptions = gagaAgGrid.getGridOptions(columnPointDefs);		//포인트내역 그리드
+	let gridGiftCardOptions = gagaAgGrid.getGridOptions(columnGiftCardDefs);//상품권내역 그리드
 	let gridReviewOptions = gagaAgGrid.getGridOptions(columnReviewDefs);	//상품평 그리드
 	let gridGradeOptions = gagaAgGrid.getGridOptions(columnGradeDefs);		//등급변경 그리드
 	let gridAddrOptions = gagaAgGrid.getGridOptions(columnAddrDefs);		//주소정보 그리드
@@ -1040,14 +1042,14 @@
 
 	// 회원접촉이력 저장
 	$('#btnSaveContact').on('click', function () {
-		if (!gagajf.validation('#custContact')) {
+		if (!gagajf.validation('#custContactHstForm')) {
 			return;
 		}
 		mcxDialog.confirm("저장하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function () {
-				var jsonData = JSON.stringify($('#custContact').serializeObject());
+				var jsonData = JSON.stringify($('#custContactHstForm').serializeObject());
 				gagajf.ajaxJsonSubmit('/customer/contact/create', jsonData, fnSearchContact);
 			}
 		});
@@ -1113,7 +1115,7 @@
 				$('#custAddrForm input[name=telLastNo]').val(telNoSplit[2]);
 			}
 
-			$('#custAddrForm input[name=recipZipNo]').val(event.data.recipZipNo);
+			$('#custAddrForm input[name=recipZipcode]').val(event.data.recipZipcode);
 			$('#custAddrForm input[name=recipBaseAddr]').val(event.data.recipBaseAddr);
 			$('#custAddrForm input[name=recipDtlAddr]').val(event.data.recipDtlAddr);
 
@@ -1153,7 +1155,7 @@
 					let snsType = fnGetSnsType(data.nvJoinId, data.kkJoinId, data.ysJoinId);
 					$('#snsType').text(snsType);
 
-					$('#homeZipNo').val(data.homeZipNo);
+					$('#homeZipcode').val(data.homeZipcode);
 					$('#homeBaseAddr').val(data.homeBaseAddr);
 					$('#homeDtlAddr').val(data.homeDtlAddr);
 					$('#sexGb').text(gagaAgGrid.lookupValue(genderGbList, data.sexGb));
@@ -1162,10 +1164,7 @@
 					fnDisplaySmsAgree(data.smsAgreeYn);				// SMS 수신여부
 					fnDisplayEmail(data.maskingEmail);				// EMAIL
 					fnDisplayCellPhnno(data.maskingCellPhnno);		// 핸드폰
-					fnDisplayManaged(data.managedRsn);			// 관리대상
-
-					//기존데이트 저장
-					orgData = data;
+					fnDisplayManaged(data.managedRsn);				// 관리대상
 
 				}
 			});
@@ -1238,6 +1237,10 @@
 
 	// 회원접촉이력 조회
 	var fnSearchContact = function () {
+		$('#custContactHstForm select[name=contactType]').val('');
+		$('#custContactHstForm select[name=contactMethod]').val('');
+		$('#custContactHstForm textarea[name=contactContents]').val('');
+
 		const actionUrl = "/customer/contact/list/" + custNo;
 		gagaAgGrid.fetch(actionUrl, gridContactOptions);
 	};
@@ -1251,13 +1254,13 @@
 			oncomplete: function(data) {
 				// 우편번호와 주소 정보를 해당 필드에 넣는다.
 				if (id === 'custInfoForm') {
-					$('#homeZipNo').val(data.zonecode);
+					$('#homeZipcode').val(data.zonecode);
 					$('#homeBaseAddr').val(cfnGetDaumRoadAddr(data));
 					$('#homeDtlAddr').focus();
 				}
 
 				if (id === 'custAddrForm') {
-					$('#recipZipNo').val(data.zonecode);
+					$('#recipZipcode').val(data.zonecode);
 					$('#recipBaseAddr').val(cfnGetDaumRoadAddr(data));
 					$('#recipDtlAddr').focus();
 				}