Merge branch 'develop' into order

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -769,4 +769,17 @@ public class TscConstants {
 		}
 	}
 
+	// 인증방법
+	public enum AuthMethod {
+		MOBILE("mobile"),
+		IPIN("ipin"),
+		CUSTINFO("custInfo");
+
+		private String value;
+
+		AuthMethod(String value) { this.value = value; }
+
+		public String value() {return value;}
+	}
+
 }

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

@@ -81,6 +81,7 @@ public class Customer extends TscBaseDomain {
 
 	// 나이스 인증
 	private String encData;
+	private String authMethod;		// 인증방법(고객정보, 휴대폰인증, 아이핀 인증)
 
 	// 암호화 대상 복호화 처리
 	public String getCustNm() {

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

@@ -52,26 +52,32 @@
 		     , SECEDE_RSN
 		     , SECEDE_DTL_RSN
 		     , DATE_FORMAT(SECEDE_DT, '%Y%m%d%H%i%S') AS SECEDE_DT
-		     , FN_GET_USER_NM(REG_NO)              AS REG_NM
-		     , DATE_FORMAT(REG_DT, '%Y%m%d%H%i%S') AS REG_DT
-		     , FN_GET_USER_NM(UPD_NO)              AS UPD_NM
-		     , DATE_FORMAT(UPD_DT, '%Y%m%d%H%i%S') AS UPD_DT
+		     , FN_GET_USER_NM(REG_NO)                 AS REG_NM
+		     , DATE_FORMAT(REG_DT, '%Y%m%d%H%i%S')    AS REG_DT
+		     , FN_GET_USER_NM(UPD_NO)                 AS UPD_NM
+		     , DATE_FORMAT(UPD_DT, '%Y%m%d%H%i%S')    AS UPD_DT
 		FROM   TB_CUSTOMER
-		WHERE  CUST_NO = #{custNo}
+		WHERE  SITE_CD = #{siteCd}
+		<if test="custNo != null and custNo != ''">
+		AND    CUST_NO = #{custNo}
+		</if>
 		<if test="custStat != null and custStat != ''">
 		AND    CUST_STAT = #{custStat}
 		</if>
-		<if test="siteCd != null and siteCd != ''">
-		AND    SITE_CD = #{siteCd}
-		</if>
-		<if test="email != null and email != ''">
-		AND    EMAIL = #{email}
+		<if test="encodedEmail != null and encodedEmail != ''">
+		AND    EMAIL = #{encodedEmail}
 		</if>
 		<if test="custId != null and custId !=''">
 		AND    CUST_ID = #{custId}
 		</if>
-		<if test="custNm != null and custNm != ''">
-		AND    CUST_NM = #{custNm}
+		<if test="encodedCustNm != null and encodedCustNm != ''">
+		AND    CUST_NM = #{encodedCustNm}
+		</if>
+		<if test="encodedBirthYmd != null and encodedBirthYmd != ''">
+		AND    BIRTH_YMD = #{encodedBirthYmd}
+		</if>
+		<if test="ci != null and ci != ''">
+		AND    CI = #{ci}
 		</if>
 	</select>