Merge remote-tracking branch 'origin/develop' into xodud1202

pom.xml

@@ -7,9 +7,10 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<groupId>com.style24.core</groupId>
-	<artifactId>style24.core</artifactId>
+	<artifactId>style24-core</artifactId>
+	<version>0.0.1</version>
 	<packaging>jar</packaging>
-	<name>style24.core</name>
+	<name>style24-core</name>
 	<description>STYLE24 Core</description>
 	
 	<dependencies>
@@ -60,7 +61,7 @@
 	</dependencies>
 	
 	<build>
-		<finalName>${project.name}</finalName>
+		<finalName>${project.name}-${project.version}</finalName>
 		<resources>
 			<resource>
 				<directory>src/main/java</directory>

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

@@ -89,4 +89,12 @@ public interface TscCustomerDao {
 	 * @since 2021. 1. 27
 	 */
 	int deleteWishList(Integer custNo);
+
+	/**
+	 * 임시비밀번호 조회
+	 * @param length - 비밀번호 자릿수
+	 * @return String
+	 * @since 2021. 02. 15
+	 */
+	String getTemporaryPassword(int length);
 }

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

@@ -68,7 +68,8 @@ public class TscCustomerService {
 	 * @since 2020. 01. 20
 	 */
 	@Transactional("shopTxnManager")
-	public void updateCustomerPassword(Customer customer) {
+	public void saveCustomerPassword(Customer customer) {
+		customerDao.createCustomerHistory(customer);
 		customerDao.updateCustomerPassword(customer);
 	}
 
@@ -141,4 +142,16 @@ public class TscCustomerService {
 	}
 
 
+	/**
+	 * 임시비밀번호 조회
+	 * @param length - 비밀번호 자릿수
+	 * @return 임시비밀번호
+	 * @author jsshin
+	 * @since 2021. 02. 15
+	 */
+	public String getTemporaryPassword(int length) {
+		return customerDao.getTemporaryPassword(length);
+	}
+
+
 }

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

@@ -221,9 +221,7 @@
 		UPDATE TB_CUSTOMER
 		SET    PASSWD = #{encodedPasswd}
 		     , PASSWD_CHG_DT = NOW()
-		<if test="tempPasswdYn == 'Y'">
 		     , TEMP_PASSWD_YN = #{tempPasswdYn}
-		</if>
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
 		WHERE  CUST_NO = #{custNo}
@@ -396,4 +394,10 @@
 	</delete>
 
 
+	<!-- 임시비밀번호 조회 -->
+	<select id="getTemporaryPassword" parameterType="int" resultType="String">
+		/* TscCustomer.getTemporaryPassword */
+		SELECT CONVERT(TRUNCATE(RAND() * CAST(CONCAT(1,LPAD(0,(#{length} - 1),'0')) AS UNSIGNED),0),CHAR) AS PASSWD FROM DUAL
+	</select>
+
 </mapper>