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

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/core/support/env/TscConstants.java

@@ -675,6 +675,23 @@ public class TscConstants {
 		}
 	}
 
+	// 장바구니 구분
+	public enum DelvFeeCrite {
+		NORMAL("G078_10"),		// 조건부 무료
+		FREE("G078_20"),			// 무료
+		PAY("G078_30");			// 유료
+
+		private String value;
+
+		private DelvFeeCrite(String value) {
+			this.value = value;
+		}
+
+		public String value() {
+			return value;
+		}
+	}
+
 	// 회사 정보
 	public enum Style24Infomation {
 		COMPANY_NAME("아이스타일이십사(주)"),

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

@@ -426,13 +426,15 @@ public class Order extends TscBaseDomain {
 	private String[] optCdArr;		// 옵션코드
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] itemQtyArr;	// 구성상품번호
-	private int cartSq;				// 장바구니 일련번호
-	private int qtySumCurrPrice;		// PC 즉시할인 적용가
-	private int goodsQty;			// 장바구니 등록 수량
 	private String jsessionId;		// SessionId
 	private String itemQtyr;		// itemQty GROUP_CONCAT
-	private List<Integer> applyMoreBetterAmtList;	// 다다익선 금액 적용상품 리스트
-	private List<Integer> applyMoreBetterQtyList;	// 다다익선 수량 적용상품 리스트
+	private String delvResDt;		// 예약배송일자
+	private String firstCompYn;		// 업체 중 첫번째 상품 여부
+	private String delvFeeCrite;	// 배송비구분 (G078_10 : 조건부 무료, G078_20 : 무료, G078_30 : 유료)
+	private int cartSq;				// 장바구니 일련번호
+	private int goodsQty;			// 장바구니 등록 수량
+	private int compCnt;			// 장바구니 업체 수
+	private int compSumPrice;		// 업체별 금액 합계
 
 	// 다다익선
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
@@ -446,7 +448,6 @@ public class Order extends TscBaseDomain {
 	private int sectionVal;							// 다다익선 조건
 	private int tmtbSumQty;							// 장바구니 수량 다다익선 총계
 	private int tmtbSumAmt;							// 장바구니 금액 다다익선 총계
-	private int tmtbCurrPrice;						// 다다익선 적용 후 금액
 	private String qtyTmtbNm;						// 수량 적용 다다익선명
 	private String amtTmtbNm;						// 금액 적용 다다익선명
 	private String goodsGb;

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>

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

@@ -1678,7 +1678,7 @@
 					 , CASE WHEN GRS.DELV_RES_DT IS NOT NULL THEN 'RES'
 							WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
 							ELSE DFP.DELV_FEE_CD END AS RES_DELV_FEE_CD
-					 , GRS.DELV_RES_DT
+		             , DATE_FORMAT(GRS.DELV_RES_DT, '%Y.%m.%d') AS DELV_RES_DT
 					 , DFP.MIN_ORD_AMT
 					 , DFP.DELV_FEE
 					 , VS.CURR_STOCK_QTY