Merge branch 'develop' into order

src/main/java/com/style24/core/biz/dao/TscCustomerDao.java

@@ -99,7 +99,7 @@ public interface TscCustomerDao {
 	String getTemporaryPassword(int length);
 
 	/**
-	 * 휴면해제 처리
+	 * 휴면해제
 	 *
 	 * @param customer - 고객정보
 	 * @return int - 처리결과
@@ -118,5 +118,25 @@ public interface TscCustomerDao {
 	 */
 	int deleteDormantCustomer(Integer custNo);
 
+	/**
+	 * 주문정보 휴면해제
+	 *
+	 * @param customer - 고객정보
+	 * @return int - 처리결과
+	 * @author jsshin
+	 * @since 2021. 03. 11
+	 */
+	int updateDormantOrderRelease(Customer customer);
+
+	/**
+	 * 휴면주문 정보 삭제
+	 *
+	 * @param custNo - 고객번호
+	 * @return int - 처리결과
+	 * @author jsshin
+	 * @since 2021. 03. 11
+	 */
+	int deleteDormantOrder(Integer custNo);
+
 	void createException();
 }

src/main/java/com/style24/core/biz/service/TscCustomerService.java

@@ -2,6 +2,7 @@ package com.style24.core.biz.service;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.style24.core.biz.dao.TscCustomerDao;
+import com.style24.core.support.util.CryptoUtils;
 import com.style24.persistence.domain.CustContactHst;
 import com.style24.persistence.domain.Customer;
 import lombok.extern.slf4j.Slf4j;
@@ -102,6 +103,7 @@ public class TscCustomerService {
 			result.setString("resultMessage", "진행중인 거래가 있습니다. 진행중인 거래를 완료 후 탈퇴 신청을 해주세요.");
 			return result;
 		}
+		customer.setEncodedCustNm(CryptoUtils.encryptAES("탈퇴"));
 
 		// 3.고객정보 이력 생성
 		customerDao.createCustomerHistory(customer);
@@ -173,6 +175,12 @@ public class TscCustomerService {
 		// 3. 휴면 테이블 삭제
 		customerDao.deleteDormantCustomer(customer.getCustNo());
 
+		// 4. 주문정보 휴면해제
+		customerDao.updateDormantOrderRelease(customer);
+
+		// 5. 휴면주문정보 삭제
+		customerDao.deleteDormantOrder(customer.getCustNo());
+
 		return resultCnt > 0;
 	}
 

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

@@ -86,6 +86,8 @@ public class Customer extends TscBaseDomain {
 	private String encData;
 	private String authMethod;		// 인증방법(고객정보, 휴대폰인증, 아이핀 인증)
 
+	// 비밀번호 변경일자
+	private int pwdChangeDay;		// 비밀번호 캠페인 화면 - ?일간 보지않기
 
 	// 암호화 대상 복호화 처리
 	public String getCustNm() {

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

@@ -30,7 +30,7 @@ public class Lookbook extends TscBaseDomain {
 	private String dispEddt;       //전시종료일
 	private String dispEdTime;
 	private String dispYn;         //표시여부
-	private Integer dispOrd;        //표시순서
+	private int dispOrd;        //표시순서
 	private String mainDispYn;     //메인노출여부
 	private String mode;			//신규,수정
 

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

@@ -304,11 +304,12 @@
 		WHERE  CUST_NO = #{custNo}
 	</insert>
 
-	<!-- 회원 탈퇴 개인정보 공백 처리 -->
+	<!-- 회원 탈퇴 개인정보 처리 -->
 	<update id="updateCustomerSecedeInfo" parameterType="Customer">
 		/* TscCustomer.updateCustomerSecedeInfo */
 		UPDATE TB_CUSTOMER
 		SET    CUST_ID = CONCAT('secede_cust_',#{custNo})
+		     , CUST_NM = #{encodedCustNm}
 		     , CUST_STAT = #{custStat}
 		     , SECEDE_RSN = #{secedeRsn}
 		     , SECEDE_DTL_RSN = #{secedeDtlRsn}
@@ -317,10 +318,15 @@
 		     , SEX_GB = NULL
 		     , CELL_PHNNO = NULL
 		     , EMAIL = NULL
+		     , EMAIL_AGREE_YN = 'N'
+		     , EMAIL_AGREE_DT = NULL
+		     , APP_AGREE_YN = 'N'
+		     , APP_AGREE_DT = NULL
 		     , HOME_ZIPCODE = NULL
 		     , HOME_BASE_ADDR = NULL
 		     , HOME_DTL_ADDR = NULL
 		     , CI = NULL
+		     , CUST_STAT = #{custStat} -- G104_30
 		WHERE  CUST_NO = #{custNo}
 	</update>
 
@@ -360,7 +366,7 @@
 	</select>
 
 	<!--휴면 해제처리-->
-	<insert id="updateDormantCustomerRelease" parameterType="Customer">
+	<update id="updateDormantCustomerRelease" parameterType="Customer">
 		/* TscCustomer.updateDormantCustomerRelease */
 		UPDATE TB_CUSTOMER C
 		INNER JOIN
@@ -384,7 +390,7 @@
 		     , C.CUST_STAT = 'G104_10'
 		     , C.UPD_DT = NOW()
 		     , C.UPD_NO = #{updNo}
-	</insert>
+	</update>
 
 	<!--휴면 테이블 삭제-->
 	<delete id="deleteDormantCustomer" parameterType="Integer">
@@ -394,6 +400,28 @@
 		WHERE CUST_NO = #{custNo}
 	</delete>
 
+	<!--주문정보 휴면 해제-->
+	<update id="updateDormantOrderRelease" parameterType="Customer">
+		/* TscCustomer.updateDormantOrderRelease */
+		UPDATE  TB_ORDER O
+		INNER JOIN
+		        TB_ORDER_DORMANT OD
+		ON      O.CUST_NO = OD.CUST_NO
+		AND     O.CUST_NO = #{custNo}
+		SET     O.ORD_NM = OD.ORD_NM
+		      , O.ORD_PHNNO = OD.ORD_PHNNO
+		      , O.ORD_TELNO = OD.ORD_TELNO
+		      , O.ORD_EMAIL = OD.ORD_EMAIL
+	</update>
+
+	<!--휴면 테이블 삭제-->
+	<delete id="deleteDormantOrder" parameterType="Integer">
+		/* TscCustomer.deleteDormantOrder */
+		DELETE
+		FROM  TB_ORDER_DORMANT
+		WHERE CUST_NO = #{custNo}
+	</delete>
+
 	<!--Exception 테스트-->
 	<insert id="createException">
 		/* TscCustomer.createException */