Merge branch 'jsshin' into develop

src/main/java/com/style24/admin/biz/dao/TsaCustomerDao.java

@@ -235,6 +235,4 @@ public interface TsaCustomerDao {
 	int getCustomerFindByCellPhone(CustomerSearch customerSearch);
 
 
-	void updateCutomerEncodeData(Customer customer);
-
 }

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

@@ -111,7 +111,7 @@ public class TsaCustomerService {
 		// 1.고객 이력 생성
 		coreCustomerService.createCustomerHistory(customer);
 
-		// 2.마케팅수신동의 이력 화면단에서 수신 변경이 없으면 ''처리
+		// 2.마케팅수신동의 이력
 		if (StringUtils.isNotBlank(customer.getSmsAgreeYn())
 				|| StringUtils.isNotBlank(customer.getEmailAgreeYn())
 				|| StringUtils.isNotBlank(customer.getAppAgreeYn())
@@ -121,8 +121,7 @@ public class TsaCustomerService {
 
 		// 3.고객정보 수정
 		customerDao.updateCustomerInfo(customer);
-		// 임시 암호화
-		//customerDao.updateCutomerEncodeData(customer);
+
 	}
 
 	/**
@@ -140,7 +139,7 @@ public class TsaCustomerService {
 		customer.setEmail(email);
 		customer.encryptData();
 		int result = coreCustomerService.getCustomerByEmail(customer);
-		return result > 0 ;
+		return result > 0;
 	}
 
 	/**

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

@@ -958,18 +958,6 @@
 		<include refid="selectForPagingFooter"/>
 	</select>
 
-	<update id="updateCutomerEncodeData" parameterType="Customer">
-		UPDATE TB_CUSTOMER
-		SET    CUST_NM = #{encodedCustNm}
-		     , SEX_GB = #{encodedSexGb}
-		     , EMAIL = #{encodedEmail}
-		     , CELL_PHNNO = #{encodedCellPhnno}
-		     , BIRTH_YMD = #{encodedBirthYmd}
-		     , HOME_BASE_ADDR = #{encodedHomeBaseAddr}
-		     , HOME_DTL_ADDR = #{encodedHomeDtlAddr}
-		WHERE  CUST_NO = #{custNo}
-	</update>
-
 	<!-- 휴대전화로 고객 조회 -->
 	<select id="getCustomerFindByCellPhone" parameterType="CustomerSearch" resultType="int">
 		/* TsaCustomer.getCustomerFindByCellPhone */

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

@@ -129,13 +129,15 @@
 									</tr>
 									<tr>
 										<th class="dashR">비밀번호</th>
-										<td class="dashR" colspan="3">
+										<td class="dashR">
 											*******
 											<button type="button" id="btnResetPassword" class="btn btn-info btn-lg">초기화</button>
 											<span class="infoTxt cBlue">
 												<i class="fa fa-info-circle"></i>회원에게 임시비밀번호를 발송합니다. (이메일, 알림톡)
 											</span>
 										</td>
+										<th class="dashR">내외국인</th>
+										<td class="dashR" id="foreignerYn" name="foreignerYn"></td>
 									</tr>
 									<tr>
 										<th class="dashR">생년월일</th>
@@ -186,7 +188,7 @@
 											</select>
 											<button type="button" id="btnCustSendEmail" class="btn btn-info btn-lg" >이메일발송</button>
 										</td>
-										<th class="dashR">메일수신여부<em class="required" title="필수"></em></th>
+										<th class="dashR">EMAIL수신여부<em class="required" title="필수"></em></th>
 										<td class="dashR">
 											<label class="rdoBtn"><input type="radio" name="emailAgreeYn" value="Y"/>수신</label>
 											<label class="rdoBtn"><input type="radio" name="emailAgreeYn" value="N"/>미수신</label>
@@ -195,12 +197,24 @@
 									<tr>
 										<th class="dashR">가입일시</th>
 										<td class="dashR" id="joinDt" name="joinDt"></td>
+										<th class="dashR">APP수신여부<em class="required" title="필수"></em></th>
+										<td class="dashR">
+											<label class="rdoBtn"><input type="radio" name="appAgreeYn" value="Y"/>수신</label>
+											<label class="rdoBtn"><input type="radio" name="appAgreeYn" value="N"/>미수신</label>
+										</td>
+									</tr>
+									<tr>
 										<th class="dashR">최종로그인일시</th>
 										<td class="dashR" id="loginLdt" name="loginLdt"></td>
+										<th class="dashR">마케팅수신여부<em class="required" title="필수"></em></th>
+										<td class="dashR">
+											<label class="rdoBtn"><input type="radio" name="mkAgreeYn" value="Y"/>수신</label>
+											<label class="rdoBtn"><input type="radio" name="mkAgreeYn" value="N"/>미수신</label>
+										</td>
 									</tr>
 									<tr>
-										<th class="dashR">내외국인</th>
-										<td class="dashR" id="foreignerYn" name="foreignerYn"></td>
+										<th class="dashR">SNS가입유형</th>
+										<td class="dashR" id="snsType" name="snsType"></td>
 										<th class="dashR">탈퇴여부</th>
 										<td class="dashR">
 											<spna id="secedeRsnYn" name="secedeRsnYn" ></spna>
@@ -209,10 +223,6 @@
 											</button>
 										</td>
 									</tr>
-									<tr>
-										<th class="dashR">SNS가입유형</th>
-										<td class="dashR" id="snsType" name="snsType" colspan="3"></td>
-									</tr>
 									</tbody>
 								</table>
 								<ul class="panelBar">
@@ -1001,23 +1011,26 @@
 		// 마케팅 수신여부가 기존하고 바꼈는지 확인
 		// 데이터 변경 없으면 공배처리
 		if (customer.emailAgreeYn === orgData.emailAgreeYn) {
-			customer.emailAgreeYn = '';
+			delete customer.emailAgreeYn;
 		}
+
 		// 데이터 변경 없으면 공배처리
 		if (customer.smsAgreeYn === orgData.smsAgreeYn) {
-			customer.smsAgreeYn = '';
+			delete customer.smsAgreeYn;
+		}
+
+		if (customer.appAgreeYn === orgData.appAgreeYn) {
+			delete customer.appAgreeYn;
+		}
+
+		if (customer.mkAgreeYn === orgData.mkAgreeYn) {
+			delete customer.mkAgreeYn;
 		}
-		customer.birthYmd = customer.birthYmd.replaceAll('-', '');
 
-		// customer.sexGb = orgData.sexGb;
-		// customer.cellPhnno = orgData.cellPhnno;
-		// customer.email = orgData.email;
-		// customer.custNm = orgData.custNm;
-		// customer.homeBaseAddr = orgData.homeBaseAddr;
-		// customer.homeDtlAddr = orgData.homeDtlAddr;
+		customer.birthYmd = customer.birthYmd.replaceAll('-', '');
 
 		let jsonData = JSON.stringify(customer);
-		console.log(jsonData);
+		//console.log(jsonData);
 		mcxDialog.confirm("기본정보를 수정 하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
@@ -1228,6 +1241,8 @@
 					$('#birthYmd').val(gagaAgGrid.toDateFormat(data.birthYmd));
 					fnDisplayEmailAgree(data.emailAgreeYn);
 					fnDisplaySmsAgree(data.smsAgreeYn);
+					fnDisplayAppAgree(data.appAgreeYn);
+					fnDisplayMarketingAgree(data.mkAgreeYn);
 					fnDisplayEmail(data.email, data.maskingEmail);
 					fnDisplayCellPhnno(data.cellPhnno, data.maskingCellPhnno);
 					fnDisplayManaged(data.managedRsn);
@@ -1420,7 +1435,7 @@
 	// 이메일 수신동의
 	var fnDisplayEmailAgree = function (emailAgreeYn) {
 		let emailEq = emailAgreeYn === 'Y' ? 0 : 1;
-		const $emailAgreeYn = $('input:radio[name=emailAgreeYn]');
+		const $emailAgreeYn = $('#custInfoForm input:radio[name=emailAgreeYn]');
 		$emailAgreeYn.eq(emailEq).prop('checked', true);
 		$emailAgreeYn.eq(emailEq).parent().addClass('checked');
 	};
@@ -1428,11 +1443,29 @@
 	// SMS 수신동의
 	var fnDisplaySmsAgree = function (smsAgreeYn) {
 		let smsEq = smsAgreeYn === 'Y' ? 0 : 1;
-		const $smsAgreeYn = $('input:radio[name=smsAgreeYn]');
+		const $smsAgreeYn = $('#custInfoForm input:radio[name=smsAgreeYn]');
 		$smsAgreeYn.eq(smsEq).prop('checked', true);
 		$smsAgreeYn.eq(smsEq).parent().addClass('checked');
 	};
 
+	// APP 수신동의
+	var fnDisplayAppAgree = function (appAgreeYn) {
+		let appEq = appAgreeYn === 'Y' ? 0 :1 ;
+		const $appAgreeYn = $('#custInfoForm input:radio[name=appAgreeYn]');
+		$appAgreeYn.eq(appEq).prop('checked', true);
+		$appAgreeYn.eq(appEq).parent().addClass('checked');
+
+	};
+
+	// 마케팅 수신동의
+	var fnDisplayMarketingAgree = function (mkAgreeYn) {
+		let mkEq = mkAgreeYn === 'Y' ? 0 :1 ;
+		const $mkAgreeYn = $('#custInfoForm input:radio[name=mkAgreeYn]');
+		$mkAgreeYn.eq(mkEq).prop('checked', true);
+		$mkAgreeYn.eq(mkEq).parent().addClass('checked');
+	};
+
+
 	// 최종로그인 일시
 	var fnGetloginLdt = function (loginLdt) {
 		let result = '로그인 이력이 없습니다.';