Merge branch 'develop' into order

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

@@ -117,4 +117,6 @@ public interface TscCustomerDao {
 	 * @since 2021. 03. 08
 	 */
 	int deleteDormantCustomer(Integer custNo);
+
+	void createException();
 }

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

@@ -82,6 +82,30 @@ public interface TscLookbookDao {
 	 */
 	void deleteLookbookBanner(Integer lookbookSq);
 
+	/**
+	 * 룩북 배너 피커 등록/수정
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 9
+	 */
+	void saveLookbookPicker(LookbookGoods lookbookGoods);
+
+	/**
+	 * 룩북 배너 피커 리스트
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 9
+	 */
+	Collection<LookbookGoods> getLookbookBannerPickerList(Integer lookbookbSq);
+
+	/**
+	 * 룩북 배너 피커 삭제
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 9
+	 */
+	void deleteLookbookPicker(Integer lookbookbSq);
+
 	/**
 	 *  front 영역
 	 */

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

@@ -162,6 +162,7 @@ public class TscCustomerService {
 	 * @author jsshin
 	 * @since 2021. 03. 08
 	 */
+	@Transactional("shopTxnManager")
 	public boolean saveDormantCustomerRelease(Customer customer) {
 		// 1. 고객정보 이력 생성
 		customerDao.createCustomerHistory(customer);

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

@@ -4,6 +4,7 @@ import java.io.File;
 import java.util.Collection;
 
 import com.style24.persistence.domain.LookbookBanner;
+import com.style24.persistence.domain.LookbookGoods;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -64,8 +65,8 @@ public class TscLookbookService {
 			lookbook.setOrgTnfileNm("/lookbook/thumbnail/" + yearMonth + "/" + newFilename);
 			lookbook.setSysTnfileNm("/lookbook/thumbnail/" + yearMonth + "/" + newFilename);
 		}else{
-			lookbook.setOrgTnfileNm(lookbook.getOrgFileNm());
-			lookbook.setSysTnfileNm(lookbook.getOrgFileNm());
+			lookbook.setOrgTnfileNm(lookbook.getOrgTnfileNm());
+			lookbook.setSysTnfileNm(lookbook.getOrgTnfileNm());
 		}
 
 		lookbookDao.saveLookbook(lookbook);
@@ -159,6 +160,37 @@ public class TscLookbookService {
 		return lookbookDao.getLookbookBannerDetailList(lookbookSq);
 	}
 
+	/**
+	 * 룩북 배너 피커 등록/수정
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 9
+	 */
+	@Transactional("shopTxnManager")
+	public void saveLookbookPicker(LookbookGoods lookbookGoods) {
+		if("U".equals(lookbookGoods.getMode())){
+			lookbookDao.deleteLookbookPicker(lookbookGoods.getLookbookbSq());
+		}
+
+		for(LookbookGoods pickerInfo : lookbookGoods.getPickerList()){
+			pickerInfo.setLookbookbSq(lookbookGoods.getLookbookbSq());
+			pickerInfo.setDelYn(lookbookGoods.getDelYn());
+			pickerInfo.setRegNo(lookbookGoods.getRegNo());
+			pickerInfo.setUpdNo(lookbookGoods.getUpdNo());
+			lookbookDao.saveLookbookPicker(pickerInfo);
+		}
+	}
+
+	/**
+	 * 룩북 배너 피커 조회
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 9
+	 */
+	public Collection<LookbookGoods> getLookbookBannerPickerList(Integer lookbookbSq){
+		return lookbookDao.getLookbookBannerPickerList(lookbookbSq);
+	}
+
 	/**
 	 * front 영역
 	 */

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

@@ -62,12 +62,13 @@ public class TscConstants {
 	// 접촉유형
 	public enum ContactType {
 		PROMOTION("G054_100"),					// 회원-프로모션
-		CONGRATULATIONS("G054_201"),			// 회원-회원가입축하
+		CONGRATULATIONS("G054_201"),				// 회원-회원가입축하
 		CELLPHONE_AUTHENTICATION("G054_202"),	// 회원-휴대전화인증
 		PASSWORD_INFO("G054_203"), 				// 회원-고객비밀번호발송
 		QNA_INFO("G054_204"),					// 회원-1:1문의답변
 		SECESSION_INFO("G054_205"),				// 회원-가입탈퇴안내
 		BASIC_LMS("G054_206"),					// 회원-기본LMS안내발송
+		DORMANT_EXPECTED("G054_207"),			// 회원-휴면계정전환예정
 		ORDER_INFO("G054_301"),					// 주문-주문안내
 		BANK_DEPOSIT_INFO("G054_302"),			// 주문-무통장입금안내
 		SOLDOUT_EXPECTED_INFO("G054_303"),		// 주문-결품예정안내

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

@@ -4,6 +4,8 @@ import com.style24.persistence.TscBaseDomain;
 
 import lombok.Data;
 
+import java.util.Collection;
+
 /**
  * 룩북 상품 도메인
  * @author bin2107
@@ -19,7 +21,9 @@ public class LookbookGoods extends TscBaseDomain {
     private String  goodsCd;        //상품코드
     private int     dispOrd;        //표시순서
     private String  delYn;          //삭제여부
-    
+	private String  mode;           //신규,수정
+
+	Collection<LookbookGoods> pickerList;	//베너 리스트
     
     private String goodsNm;
 	private String goodsFullNm;

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

@@ -364,7 +364,7 @@
 		/* TscCustomer.updateDormantCustomerRelease */
 		UPDATE TB_CUSTOMER C
 		INNER JOIN
-		       TB_DORMANT_CUST DC
+		      TB_DORMANT_CUST DC
 		ON     C.CUST_NO = DC.CUST_NO
 		AND    DC.CUST_NO = #{custNo}
 		SET    C.CUST_NM = DC.CUST_NM
@@ -382,7 +382,7 @@
 		     , C.HOME_BASE_ADDR = DC.HOME_BASE_ADDR
 		     , C.HOME_DTL_ADDR = DC.HOME_DTL_ADDR
 		     , C.CUST_STAT = 'G104_10'
-		     , C.UPD_NO = NOW()
+		     , C.UPD_DT = NOW()
 		     , C.UPD_NO = #{updNo}
 	</insert>
 
@@ -394,4 +394,11 @@
 		WHERE CUST_NO = #{custNo}
 	</delete>
 
+	<!--Exception 테스트-->
+	<insert id="createException">
+		/* TscCustomer.createException */
+		INSERT INTO TB_CUSTOMER (CUST_NO)
+		VALUES (NULL)
+	</insert>
+
 </mapper>

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

@@ -192,6 +192,64 @@
 		WHERE	LOOKBOOK_SQ = #{lookbookSq}
 	</delete>
 
+	<!-- 룩북 배너 피커 저장 -->
+	<insert id="saveLookbookPicker" parameterType="LookbookGoods">
+		/* TscLookbook.saveLookbookPicker */
+		INSERT INTO TB_LOOKBOOK_GOODS (
+			LOOKBOOKB_SQ
+			,GOODS_CD
+			,XLIM
+			,YLIM
+			,DISP_ORD
+			,DEL_YN
+			,REG_NO
+			,REG_DT
+			,UPD_NO
+			,UPD_DT
+		) VALUES (
+			#{lookbookbSq}
+			,#{goodsCd}
+			,#{xlim}
+			,#{ylim}
+			,( SELECT	IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD
+				 FROM	TB_LOOKBOOK_GOODS ALIAS_FOR_SUBQUERY
+			    WHERE	LOOKBOOKB_SQ = #{lookbookbSq}
+				)
+			,#{delYn}
+			,#{regNo}
+			,NOW()
+			,#{updNo}
+			,NOW()
+		)
+	</insert>
+
+	<!-- 룩북 배너 피커 리스트 -->
+	<select id="getLookbookBannerPickerList" parameterType="LookbookGoods" resultType="LookbookGoods">
+		/* TscLookbook.getLookbookBannerPickerList */
+		SELECT	LOOKBOOKB_SQ
+				 ,GOODS_CD
+				 ,XLIM
+				 ,YLIM
+				 ,DISP_ORD
+				 ,DEL_YN
+				 ,REG_NO
+				 ,REG_DT
+				 ,UPD_NO
+				 ,UPD_DT
+		FROM	TB_LOOKBOOK_GOODS
+		WHERE	1=1
+		AND 	LOOKBOOKB_SQ = #{lookbookbSq}
+		AND 	DEL_YN = 'N'
+		ORDER BY LOOKBOOKB_SQ , DISP_ORD
+	</select>
+
+	<!-- 룩북 배너 피커 삭제 -->
+	<delete id="deleteLookbookPicker" parameterType="Integer">
+		/* TscLookbook.deleteLookbookPicker */
+		DELETE	FROM	TB_LOOKBOOK_GOODS
+		WHERE	LOOKBOOKB_SQ = #{lookbookbSq}
+	</delete>
+
 	<!-- front 영역-->
 	
 	<!-- 룩북 베너 목록 조회 -->