샵링커, 엑셀 옵션코드 표기, 교환여부 표기

src/main/java/com/style24/admin/biz/service/TsaShoplinkerService.java

@@ -1048,11 +1048,13 @@ public class TsaShoplinkerService {
 
 		// 헤더 title 설정
 		String[] listTitles = { "제휴몰주문등록상태", "실패사유", "업로드실패사유", "스타일24 주문번호", "샵링커 주문번호", "쇼핑몰 주문번호", "쇼핑몰 명", "배송상태[발주확인]"
-				,"주문 상품번호", "샵링커 상품번호", "자사 상품코드", "상품명", "주문수량", "주문금액", "판매단가", "공급가", "옵션코드", "옵션명", "주문수집일자", "제휴몰등록일", "등록자"};
+				,"주문 상품번호", "샵링커 상품번호", "자사 상품코드", "상품명", "주문수량", "주문금액", "판매단가", "공급가"
+				, "옵션코드", "옵션명", "옵션1", "옵션2", "교환접수여부", "주문수집일자", "제휴몰등록일", "등록자"};
 
 		// DB 처리 시 사용되는 파라미터명(셀명) 설정
 		String[] cellNames = {"UPLOAD_STAT", "UPLOAD_FAIL_CD", "UPLOAD_FAIL_REASON", "ORD_NO", "SHOPLINKER_ORDER_ID", "MALL_ORDER_ID", "MALL_NAME", "BAESONG_STATUS"
-				, "ORDER_PRODUCT_ID", "SHOPLINKER_PRODUCT_ID", "PARTNER_PRODUCT_ID", "PRODUCT_NAME", "QUANTITY", "ORDER_PRICE", "SALE_PRICE", "SUPPLY_PRICE", "SKU_MATCH_CODE", "SKU", "ORDER_REG_DATE", "EXTMALL_REG_DT", "REG_NM"};
+				, "ORDER_PRODUCT_ID", "SHOPLINKER_PRODUCT_ID", "PARTNER_PRODUCT_ID", "PRODUCT_NAME", "QUANTITY", "ORDER_PRICE", "SALE_PRICE", "SUPPLY_PRICE"
+				, "SKU_MATCH_CODE", "SKU", "OPT_CD1", "OPT_CD2", "EXCHANGE_ORDER_YN", "ORDER_REG_DATE", "EXTMALL_REG_DT", "REG_NM"};
 
 		String[] cellTypes = {
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
@@ -1065,7 +1067,8 @@ public class TsaShoplinkerService {
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
-			GagaExcelConstants.CellType.CHAR_CENTER.name()};
+			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
+			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 		Collection<GagaMap> dataList = admShoplinkerDao.getOrderExcelList(shoplinkerOrder);
 

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

@@ -593,9 +593,12 @@
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
 				, 'SYSTEM' AS REG_NM
+				
+				, OP.OPT_CD1 
+				, OP.OPT_CD2 
 			FROM SHOPLINKER_ORDER A
-				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B
-					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
+				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
+				LEFT OUTER JOIN TB_OPTION OP ON A.SKU_MATCH_CODE = OP.OPT_CD
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             <include refid="getSlkOrderListCondition_sql"/>
@@ -650,8 +653,13 @@
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
 				, FN_GET_USER_NM(B.REG_NO) AS REG_NM 
+				
+				, OP.OPT_CD1 
+				, OP.OPT_CD2 
 			FROM 
-				TB_EXTMALL_ORDER_UPLOAD B LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
+				TB_EXTMALL_ORDER_UPLOAD B 
+				INNER JOIN TB_OPTION OP ON B.OPT_CD = OP.OPT_CD
+				LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
@@ -742,9 +750,13 @@
 			, FN_GET_CODE_NM('G021', UPLOAD_STAT) AS UPLOAD_STAT_NM
 			, FN_GET_CODE_NM('G022', UPLOAD_FAIL_CD) AS UPLOAD_FAIL_NM
 			, FN_GET_CODE_NM('G003', A.VENDOR_ID) AS VENDOR_NM
+			, B.OPT_CD1
+			, B.OPT_CD2
 		FROM TB_EXTMALL_ORDER_UPLOAD A
+			INNER JOIN TB_OPTION B ON A.OPT_CD = B.OPT_CD
 		WHERE AGENT_ORDER_ID = #{agentOrderId}
-		AND A.UPLOAD_GB = 'S'
+		ORDER BY UPLOAD_STAT
+		LIMIT 1
 
 	</select>
 
@@ -801,9 +813,12 @@
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
 				, 'SYSTEM' AS REG_NM
+				
+				, OP.OPT_CD1 
+				, OP.OPT_CD2 
 			FROM SHOPLINKER_ORDER A
-				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B
-					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
+				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
+				LEFT OUTER JOIN TB_OPTION OP ON A.SKU_MATCH_CODE = OP.OPT_CD
 			WHERE A.ORDER_REG_DATE >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND A.ORDER_REG_DATE <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')
             <include refid="getSlkOrderListCondition_sql"/>
@@ -858,8 +873,13 @@
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
 				, FN_GET_USER_NM(B.REG_NO) AS REG_NM 
+				
+				, OP.OPT_CD1 
+				, OP.OPT_CD2 
 			FROM 
-				TB_EXTMALL_ORDER_UPLOAD B LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
+				TB_EXTMALL_ORDER_UPLOAD B 
+				INNER JOIN TB_OPTION OP ON B.OPT_CD = OP.OPT_CD
+				LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
 			AND B.REG_DT >= DATE_FORMAT(replace(#{stDate}, '-', ''), '%Y%m%d%H%i%S')
             AND B.REG_DT <![CDATA[<]]> DATE_FORMAT(DATE_ADD(replace(#{edDate}, '-', ''), INTERVAL 1 DAY), '%Y%m%d%H%i%S')

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderDetailForm.html

@@ -21,162 +21,165 @@
 		</div>
 
 		<div class="panelContent" style="height:90%; overflow-y:auto; padding:0px 20px !important; ">
-			<h4>샵링커 기본정보</h4>
-			<!-- TABLE -->
-			<table class="tableStyle">
-				<colgroup>
-					<col width="10%">
-					<col width="23%">
-					<col width="10%">
-					<col width="23%">
-					<col width="10%">
-					<col width="23%">
-				</colgroup>
-				<tbody>
-					<tr>
-						<th>주문수집차수</th>
-						<td class="aL padL10" th:text=" ${slkOrderInfo.orderIfIdx}"></td>
-						<th>샵링커주문번호</th>
-						<td class="aL padL10" th:text=" ${slkOrderInfo.shoplinkerOrderId}"></td>
-						<th>쇼핑몰주문번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.mallOrderId}"></td>
-					</tr>
-					<tr>
-						<th>쇼핑몰명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.mallName}"></td>
-						<th>배송상태[발주확인]</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.baesongStatus}"></td>
-						<th>주문자명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderName}"></td>
-					</tr>
-					<tr>
-						<th>주문자전화번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderTel}"></td>
-						<th>주문자핸드폰번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderCel}"></td>
-						<th>주문자이메일주소</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderEmail}"></td>
-					</tr>
-					<tr>
-						<th>수취인명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receive}"></td>
-						<th>수취인전화번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receiveTel}"></td>
-						<th>수취인핸드폰번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receiveCel}"></td>
-					</tr>
-					<tr>
-						<th>수취인우편번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receiveZipcode}"></td>
-						<th>수취인주소</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.receiveAddr}"></td>
-						<th>배송비결제방식</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.baesongType}"></td>
-					</tr>
-					<tr>
-						<th>배송비</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.baesongBi}"></td>
-						<th>배송메세지</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.deliveryMsg}"></td>
-						<th>주문상품번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderProductId}"></td>
-					</tr>
-					<tr>
-						<th>샵링커상품번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.shoplinkerProductId}"></td>
-						<th>자사상품코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.partnerProductId}"></td>
-						<th>상품명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.productName}"></td>
-					</tr>
-					<tr>
-						<th>주문수량</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.quantity}"></td>
-						<th>주문금액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.orderPrice, 0,'COMMA', 0,'POINT')}"></td>
-						<th>판매단가</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.salePrice, 0,'COMMA', 0,'POINT')}"></td>
-					</tr>
-					<tr>
-						<th>공급가</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.supplyPrice, 0,'COMMA', 0,'POINT')}"></td>
-						<th>옵션명</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.sku}"></td>
-						<th>주문일자</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderdate}"></td>
-					</tr>
-					<tr>
-						<th>주문수집일자</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderRegDate}"></td>
-						<th>송장번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.deliveryInvoice}"></td>
-						<th>쇼핑몰계정</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.sellerId}"></td>
-					</tr>
-					<tr>
-						<th>필수옵션</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.onlySku}"></td>
-						<th>추가옵션</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.addSku}"></td>
-						<th>샵링커쇼핑몰코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.mallId}"></td>
-					</tr>
-					<tr>
-						<th>쇼핑몰부담할인액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceMall, 0,'COMMA', 0,'POINT')}"></td>
-						<th>판매자부담할인액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceSeller, 0,'COMMA', 0,'POINT')}"></td>
-						<th>쿠폰할인액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceCoupon, 0,'COMMA', 0,'POINT')}"></td>
-					</tr>
-					<tr>
-						<th>포인트할인액</th>
-						<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPricePoint, 0,'COMMA', 0,'POINT')}"></td>
-						<th>물류배송여부</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.distributionDelivery}"></td>
-						<th>옵션매칭코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.skuMatchCode}"></td>
-					</tr>
-					<tr>
-						<th>옵션바코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.skuBarcode}"></td>
-						<th>개인고유통관번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderCustomsNumber}"></td>
-						<th>주문서타입</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderInputType}"></td>
-					</tr>
-					<tr>
-						<th>매입처아이디</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.supplyId}"></td>
-						<th>택배사코드</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.delivery}"></td>
-						<th>구매자계정</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderUserId}"></td>
-					</tr>
-					<tr>
-						<th>크로스픽주문</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.crspikUse}"></td>
-						<th>배송번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.shipNo}"></td>
-						<th>딜번호</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.dealNo}"></td>
-					</tr>
-					<tr>
-						<th>교환접수여부</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.exchangeOrderYn}"></td>
-						<th>추가상품</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.orderMainKey}"></td>
-						<th>네이버페이결제수단</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.panType}"></td>
-					</tr>
-					<tr>
-						<th>채널구분</th>
-						<td class="aL padL10" th:text="${slkOrderInfo.channelType}"></td>
-						<th>배송예정일</th>
-						<td class="aL padL10" colspan="3" th:text="${slkOrderInfo.shipRsvDate}"></td>
-					</tr>
-				</tbody>
-			</table>
+			
+			<div th:if="${slkOrderInfo}">
+				<h4>샵링커 기본정보</h4>
+				<!-- TABLE -->
+				<table class="tableStyle">
+					<colgroup>
+						<col width="10%">
+						<col width="23%">
+						<col width="10%">
+						<col width="23%">
+						<col width="10%">
+						<col width="23%">
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>주문수집차수</th>
+							<td class="aL padL10" th:text=" ${slkOrderInfo.orderIfIdx}"></td>
+							<th>샵링커주문번호</th>
+							<td class="aL padL10" th:text=" ${slkOrderInfo.shoplinkerOrderId}"></td>
+							<th>쇼핑몰주문번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.mallOrderId}"></td>
+						</tr>
+						<tr>
+							<th>쇼핑몰명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.mallName}"></td>
+							<th>배송상태[발주확인]</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.baesongStatus}"></td>
+							<th>주문자명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderName}"></td>
+						</tr>
+						<tr>
+							<th>주문자전화번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderTel}"></td>
+							<th>주문자핸드폰번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderCel}"></td>
+							<th>주문자이메일주소</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderEmail}"></td>
+						</tr>
+						<tr>
+							<th>수취인명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receive}"></td>
+							<th>수취인전화번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receiveTel}"></td>
+							<th>수취인핸드폰번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receiveCel}"></td>
+						</tr>
+						<tr>
+							<th>수취인우편번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receiveZipcode}"></td>
+							<th>수취인주소</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.receiveAddr}"></td>
+							<th>배송비결제방식</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.baesongType}"></td>
+						</tr>
+						<tr>
+							<th>배송비</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.baesongBi}"></td>
+							<th>배송메세지</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.deliveryMsg}"></td>
+							<th>주문상품번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderProductId}"></td>
+						</tr>
+						<tr>
+							<th>샵링커상품번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.shoplinkerProductId}"></td>
+							<th>자사상품코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.partnerProductId}"></td>
+							<th>상품명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.productName}"></td>
+						</tr>
+						<tr>
+							<th>주문수량</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.quantity}"></td>
+							<th>주문금액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.orderPrice, 0,'COMMA', 0,'POINT')}"></td>
+							<th>판매단가</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.salePrice, 0,'COMMA', 0,'POINT')}"></td>
+						</tr>
+						<tr>
+							<th>공급가</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.supplyPrice, 0,'COMMA', 0,'POINT')}"></td>
+							<th>옵션명</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.sku}"></td>
+							<th>주문일자</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderdate}"></td>
+						</tr>
+						<tr>
+							<th>주문수집일자</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderRegDate}"></td>
+							<th>송장번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.deliveryInvoice}"></td>
+							<th>쇼핑몰계정</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.sellerId}"></td>
+						</tr>
+						<tr>
+							<th>필수옵션</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.onlySku}"></td>
+							<th>추가옵션</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.addSku}"></td>
+							<th>샵링커쇼핑몰코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.mallId}"></td>
+						</tr>
+						<tr>
+							<th>쇼핑몰부담할인액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceMall, 0,'COMMA', 0,'POINT')}"></td>
+							<th>판매자부담할인액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceSeller, 0,'COMMA', 0,'POINT')}"></td>
+							<th>쿠폰할인액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPriceCoupon, 0,'COMMA', 0,'POINT')}"></td>
+						</tr>
+						<tr>
+							<th>포인트할인액</th>
+							<td class="aL padL10" th:text="${#numbers.formatDecimal(slkOrderInfo.disPricePoint, 0,'COMMA', 0,'POINT')}"></td>
+							<th>물류배송여부</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.distributionDelivery}"></td>
+							<th>옵션매칭코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.skuMatchCode}"></td>
+						</tr>
+						<tr>
+							<th>옵션바코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.skuBarcode}"></td>
+							<th>개인고유통관번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderCustomsNumber}"></td>
+							<th>주문서타입</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderInputType}"></td>
+						</tr>
+						<tr>
+							<th>매입처아이디</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.supplyId}"></td>
+							<th>택배사코드</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.delivery}"></td>
+							<th>구매자계정</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderUserId}"></td>
+						</tr>
+						<tr>
+							<th>크로스픽주문</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.crspikUse}"></td>
+							<th>배송번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.shipNo}"></td>
+							<th>딜번호</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.dealNo}"></td>
+						</tr>
+						<tr>
+							<th>교환접수여부</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.exchangeOrderYn}"></td>
+							<th>추가상품</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.orderMainKey}"></td>
+							<th>네이버페이결제수단</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.panType}"></td>
+						</tr>
+						<tr>
+							<th>채널구분</th>
+							<td class="aL padL10" th:text="${slkOrderInfo.channelType}"></td>
+							<th>배송예정일</th>
+							<td class="aL padL10" colspan="3" th:text="${slkOrderInfo.shipRsvDate}"></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
 			<!-- //TABLE -->
 			<br>
 
@@ -232,6 +235,15 @@
 							<th>옵션명</th>
 							<td class="aL padL10" th:text="${extOrderInfo.sku}"></td>
 						</tr>
+						<tr>
+							<th>옵션코드</th>
+							<td class="aL padL10" th:text="${extOrderInfo.optCd}"></td>
+							<th>옵션1</th>
+							<td class="aL padL10" th:text="${extOrderInfo.optCd1}"></td>
+							<th>옵션2</th>
+							<td class="aL padL10" th:text="${extOrderInfo.optCd2}"></td>
+						</tr>
+						
 						<tr>
 							<th>현재판매가</th>
 							<td class="aL padL10" th:text="${#numbers.formatDecimal(extOrderInfo.currPrice, 0,'COMMA', 0,'POINT')}"></td>

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderForm.html

@@ -298,6 +298,9 @@
 		},
 		{headerName: "옵션코드", field: "skuMatchCode", width: 130, cellClass: 'text-center'},
 		{headerName: "옵션명", field: "sku", width: 130, cellClass: 'text-center'},
+		{headerName: "옵션1", field: "optCd1", width: 100, cellClass: 'text-center'},
+		{headerName: "옵션2", field: "optCd2", width: 100, cellClass: 'text-center'},
+		{headerName: "교환접수여부", field: "exchangeOrderYn", width: 100, cellClass: 'text-center'},
 		{headerName: "주문수집일자", field: "orderRegDate", width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';