Merge branch 'develop_tsit' of https://dev.azure.com/style24/style24/_git/style24.core into develop_tsit

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

@@ -147,7 +147,7 @@ public class TscOrderOcmService {
                         double itemOrdAmt	= (itemPrice + optAddPrice) * itemQty;
                         double tempDivD		= (itemOrdAmt / currPrice) * 100;
                         int tempDiv 		= Integer.parseInt(String.valueOf(Math.round(tempDivD)));
-                        
+
                         if (index == length) {
                         	orderDetailItem.setItemPrice(itemPrice);
                             orderDetailItem.setOrdAmt(leftOrdAmt);
@@ -187,7 +187,7 @@ public class TscOrderOcmService {
                             leftRealOrdAmt 		= leftRealOrdAmt 		- ((orderDetail.getRealOrdAmt() * tempDiv) / 100);
                             leftGfcdUseAmt 		= leftGfcdUseAmt 		- ((orderDetail.getGfcdUseAmt() * tempDiv) / 100);
                         }
-                        
+
                         // 2021.05.06 옵션금액 단품 추가
                         orderDetailItem.setOptAddPrice(optAddPrice);
                         orderDetailItem.setCustNo(order.getCustNo());
@@ -329,7 +329,7 @@ public class TscOrderOcmService {
 	    				sendNoti.setCnclAllSoldoutYn("N");
 	    				sendNoti.setSoldoutGoodsNm(soldoutGoodsNm);
 	    				kakaotalkService.sendShoplinkerOrder(sendNoti, 0);
-	    				
+
 	    			}else {
 	    				// 전체성공
 	    			}
@@ -747,7 +747,7 @@ public class TscOrderOcmService {
 
 		// 샵링커 주문번호 중복여부 체크(중복인경우 등록불가)
 		ArrayList<String> arrayList = new ArrayList<>();
-		ArrayList<String> overlapList = new ArrayList<>(); 
+		ArrayList<String> overlapList = new ArrayList<>();
         for (GagaMap item : excelExtmallOrderList) {
         	if(!arrayList.contains(item.getString("agentOrderId"))) {
             	arrayList.add(item.getString("agentOrderId"));
@@ -755,11 +755,11 @@ public class TscOrderOcmService {
             	overlapList.add(item.getString("agentOrderId"));
             }
         }
-        
+
         if( 0 < overlapList.size()) {
         	throw new IllegalStateException(message.getMessage("FAIL_0001")+" \n중복된 물품주문번호가 존재합니다 : "+overlapList);
         }
-       
+
 		int dataIndex = 2;
 		int index = 0;
 		String vendorId = "";
@@ -773,7 +773,7 @@ public class TscOrderOcmService {
 			String[] columns = extmallOrder.getColumns();
 
 			for (int validation = 0; validation < params.length; validation++) {
-				if( validation != 0 && validation != 14 && validation != 21 ) {	// 첫번재열, 이메일 미체크, 배송MEMO
+				if( validation != 0 && validation != 13 && validation != 20 ) {	// 첫번재열, 이메일 미체크, 배송MEMO
 					if ("".equals(params[validation]) || params[validation] == null || "null".equals(params[validation])) {
 						throw new IllegalStateException(dataIndex + "행에 " + columns[validation] + "(을)를 입력해 주세요.");
 					}

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

@@ -812,12 +812,12 @@ public class ExtmallOrder extends TscBaseDomain {
 	}
 
 	public String[] getParams() {
-		String[] params = {this.ordDt, this.extmallId, this.extmallOrderId, this.agentOrderId, this.extmallProdId, this.goodsCd, this.sku, this.optCd, this.currPrice+"", this.ordQty+"", this.delvFee+"", this.ordNm, this.ordTelno, this.ordPhnno, this.ordEmail, this.recipNm, this.recipTelno, this.recipPhnno, this.recipZipcode, this.recipBaseAddr, this.recipDtlAddr, this.delvMemo};
+		String[] params = {this.ordDt, this.extmallId, this.extmallOrderId, this.agentOrderId, this.extmallProdId, this.sku, this.optCd, this.currPrice+"", this.ordQty+"", this.delvFee+"", this.ordNm, this.ordTelno, this.ordPhnno, this.ordEmail, this.recipNm, this.recipTelno, this.recipPhnno, this.recipZipcode, this.recipBaseAddr, this.recipDtlAddr, this.delvMemo};
 		return params;
 	}
 
 	public String[] getColumns() {
-		String[] columns = {"주문일", "제휴몰ID", "제휴주문번호", "샵링커주문번호",  "제휴상품코드", "자사상품코드", "상품명", "옵션코드", "판매가", "주문수량", "배송비", "주문자", "주문자전화번호", "주문자휴대폰번호", "주문자이메일", "수령자명", "수령자전화번호", "수령자휴대폰번호", "수령자우편번호", "수령자기본주소", "수령자상세주소", "배송메시지"};
+		String[] columns = {"주문일", "제휴몰ID", "제휴주문번호", "샵링커주문번호",  "제휴상품코드", "자사상품코드", "옵션코드", "판매가", "주문수량", "배송비", "주문자", "주문자전화번호", "주문자휴대폰번호", "주문자이메일", "수령자명", "수령자전화번호", "수령자휴대폰번호", "수령자우편번호", "수령자기본주소", "수령자상세주소", "배송메시지"};
 		return columns;
 	}
 }

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

@@ -1351,7 +1351,7 @@
 			, #{extmallOrderId}
 			, #{extmallProdId}
 			, #{extmallProdNm}
-			, #{goodsCd}
+			, (SELECT S.GOODS_CD FROM TB_OPTION S WHERE S.OPT_CD = REPLACE(REPLACE(#{optCd}, '[', ''), ']', ''))
 			, #{sku}
 			, IFNULL(#{currPrice}, 0)
 			, IFNULL(#{ordQty}, 0)