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

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

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

@@ -69,8 +69,8 @@ public class TscFreegiftService {
 			Collection<Order> freegiftGoodsApplySectionList = freegiftDao.getFreeGiftGoodsApplySection(order);
 			
 			// 2.1 사은품 적용구간이 있는지 판단
-			if (fregiftGoodsApplyAmtList.size() > 0) {
-				int[] freegiftSectionSqArr = new int[fregiftGoodsApplyAmtList.size()];
+			if (freegiftGoodsApplySectionList.size() > 0) {
+				int[] freegiftSectionSqArr = new int[freegiftGoodsApplySectionList.size()];
 				
 				int tempFreegiftSectionSq = 0;
 				int k = 0;

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

@@ -686,7 +686,7 @@ public class TscOrderService {
 		
 		Collection<Order> goodsCpnApplyList = new ArrayList<Order>();
 		
-		// 쿠폰대상이 있는 상품들만 정리
+		// 쿠폰대상이 있는 상품만 정리
 		for (Order tmtbGoods : tmtbGoodsApplyList) {
 			for (Order goodsCartCpn : goodsCartCpnApplyGoodsList) {
 				

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

@@ -38,6 +38,7 @@ public class Order extends TscBaseDomain {
 	private String cellPhnno;						// 회원핸드폰
 	private String email;							// 이메일
 	private String delvAddrNm;						// 배송지명
+	private String ci;								// 회원CI값
 
 	// 주문상세
 	private int ordDtlNo;							// 주문상세번호

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

@@ -104,7 +104,8 @@
 	<!-- 사은품 : 3차조건 적용된 구간정보의 사은품정보조회 -->
 	<select id="getFreeGiftGoodsApplyVal" parameterType="Order" resultType="Order">
 		/* freegift.getFreeGiftGoodsApplyVal */
-		SELECT FG.FREEGIFT_NM 
+		SELECT FGV.FREEGIFT_VAL_SQ
+		     , FG.FREEGIFT_NM 
 		     , FGV.FREEGIFT_SECTION_SQ 
 		     , FGV.FREEGIFT_SQ 
 		     , FGV.USE_POINT

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

@@ -1766,6 +1766,7 @@
 		SELECT CU.CUST_NM
 		     , CU.EMAIL
 		     , CU.CELL_PHNNO
+		     , CU.CI
 		  FROM TB_CUSTOMER CU
 		 WHERE 1=1
 		   AND CU.CUST_NO = #{custNo}