Merge branch 'develop' into bin2107

# Conflicts:
#	src/main/java/com/style24/core/biz/service/TscFreegiftService.java
#	src/main/java/com/style24/persistence/domain/LookbookPicker.java

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

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository;
 
 import com.style24.core.support.annotation.ShopDs;
 import com.style24.persistence.domain.Lookbook;
-import com.style24.persistence.domain.LookbookGoods;
+import com.style24.persistence.domain.LookbookPicker;
 
 /**
  * 룩북 Dao
@@ -17,45 +17,43 @@ import com.style24.persistence.domain.LookbookGoods;
 @ShopDs
 @Repository
 public interface TscLookbookDao {
-    /**
-     * 룩북 등록/수정
-     * @return
-     * @author bin2107
-     * @since 2021. 3. 5
-     */
-    void saveLookbook(Lookbook lookbook);
-    
+	/**
+	 * 룩북 등록/수정
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 5
+	 */
+	void saveLookbook(Lookbook lookbook);
+
+	/**
+	 * 룩북 리스트 카운트
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 5
+	 */
+	int getLookbookListCount(Lookbook lookbook);
+
+	/**
+	 * 룩북 리스트
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 5
+	 */
+	Collection<Lookbook> getLookbookList(Lookbook lookbook);
 
-    /**
-     * 룩북 리스트 카운트
-     * @return
-     * @author bin2107
-     * @since 2021. 3. 5
-     */
-    int getLookbookListCount(Lookbook lookbook);
+	/**
+	 * 룩북 삭제
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 5
+	 */
+	void deleteLookbook(Lookbook lookbook);
 
-    /**
-     * 룩북 리스트
-     * @return
-     * @author bin2107
-     * @since 2021. 3. 5
-     */
-    Collection<Lookbook> getLookbookList(Lookbook lookbook);
+	/**
+	 *  front 영역
+	 */
 
-    /**
-     * 룩북 삭제
-     * @return
-     * @author bin2107
-     * @since 2021. 3. 5
-     */
-    void deleteLookbook(Lookbook lookbook);
-    
-    
-    /**
-     *  front 영역
-     */
-    
-    /**
+	/**
 	 * 룩북 베너 목록
 	 *
 	 * @param lookbook
@@ -64,7 +62,7 @@ public interface TscLookbookDao {
 	 * @date 2021. 2. 18
 	 */
 	Collection<Lookbook> getLookbookBannerList(Lookbook lookbook);
-	
+
 	/**
 	 * 룩북 베너별 상품 목록
 	 *
@@ -73,5 +71,5 @@ public interface TscLookbookDao {
 	 * @author eskim
 	 * @date 2021. 2. 18
 	 */
-	Collection<LookbookGoods> getLookbookBannerGoodsList(Lookbook lookbook);
+	Collection<LookbookPicker> getLookbookBannerGoodsList(Lookbook lookbook);
 }

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

@@ -49,9 +49,9 @@ public class TscFreegiftService {
 		
 		// 1. 장바구니 담긴 상품으로 적용된 사은품 프로모션 정보 조회 (with 상품금액)
 		Collection<Order> fregiftGoodsApplyAmtList = freegiftDao.getFreeGiftGoodsApplyAmt(order);
-
+		
 		log.info("fregiftGoodsApplyAmtList.size() ::: {}", fregiftGoodsApplyAmtList.size());
-
+		
 		// 1.1 장바구니 상품으로 적용된 사은품 여부 판단
 		if (fregiftGoodsApplyAmtList.size() > 0) {
 			int[] freegiftSqArr = new int[fregiftGoodsApplyAmtList.size()];
@@ -88,7 +88,7 @@ public class TscFreegiftService {
 						
 						// 같은 사은품 프로모션끼리 등록
 						if (fregiftGoodsApplyAmt.getFreegiftSq() == freegiftGoodsApplySection.getFreegiftSq()) {
-
+							
 							log.info("fregiftGoodsApplyAmt.getFreegiftSq() ::: {}", fregiftGoodsApplyAmt.getFreegiftSq());
 							log.info("freegiftAmt ::: {}", freegiftAmt);
 							log.info("sectionVal ::: {}", sectionVal);
@@ -104,7 +104,7 @@ public class TscFreegiftService {
 							}
 						}
 					}
-
+					
 					freegiftSectionSqArr[k] = tempFreegiftSectionSq;
 				}