Merge branch 'style' of http://112.172.147.34:4936/style24/style24.admin into style

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

@@ -1284,10 +1284,10 @@ public class TsaShoplinkerService {
 	public void getInvoiceExcelList(ShoplinkerInvoice shoplinkerInvoice, String excelFilenameWithPath) {
 
 		// 헤더 title 설정
-		String[] listTitles = {"IF결과", "IF결과메세지", "샵링커 주문번호", "쇼핑몰 주문번호", "스타일24 주문번호", "주문상세번호", "주문상세상태", "주문자명", "주문자연락처", "배송업체", "송장번호", "전송일시"};
+		String[] listTitles = {"IF결과", "IF결과메세지", "쇼핑몰명", "샵링커 주문번호", "쇼핑몰 주문번호", "스타일24 주문번호", "주문상세번호", "주문상세상태", "주문자명", "주문자연락처", "배송업체", "송장번호", "전송일시"};
 
 		// DB 처리 시 사용되는 파라미터명(셀명) 설정
-		String[] cellNames = {"API_RESULT", "API_MESSAGE", "AGENT_ORDER_ID", "EXTMALL_ORDER_ID", "ORD_NO", "ORD_DTL_NO", "ORD_DTL_STAT_NM", "ORDER_NAME", "ORDER_CEL", "SHIP_COMP_NM", "DELIVERY_INVOICE", "REG_DT"};
+		String[] cellNames = {"API_RESULT", "API_MESSAGE", "EXTMALL_NM", "AGENT_ORDER_ID", "EXTMALL_ORDER_ID", "ORD_NO", "ORD_DTL_NO", "ORD_DTL_STAT_NM", "ORDER_NAME", "ORDER_CEL", "SHIP_COMP_NM", "DELIVERY_INVOICE", "REG_DT"};
 
 		String[] cellTypes = {
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_LEFT.name(),
@@ -1295,7 +1295,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_LEFT.name(), GagaExcelConstants.CellType.CHAR_CENTER.name()};
+			GagaExcelConstants.CellType.CHAR_CENTER.name(),GagaExcelConstants.CellType.CHAR_LEFT.name(), 
+			GagaExcelConstants.CellType.CHAR_CENTER.name()};
 
 		Collection<GagaMap> dataList = admShoplinkerDao.getInvoiceExcelList(shoplinkerInvoice);
 

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

@@ -984,6 +984,7 @@
 		FROM
 			TB_ORDER O
 			INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO
+			INNER JOIN TB_EXTMALL EX ON OD.VENDOR_ID = EX.VENDOR_ID AND OD.EXTMALL_ID = EX.EXTMALL_ID
 			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 		WHERE O.MALL_GB = 'G011_20'
 		AND OD.VENDOR_ID = 'G003_V001'
@@ -1021,9 +1022,11 @@
 			
 			, O.ORD_NM AS ORDER_NAME
 			, O.ORD_PHNNO AS ORDER_CEL
+			, EX.EXTMALL_NM 
 		FROM
 			TB_ORDER O
 			INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO
+			INNER JOIN TB_EXTMALL EX ON OD.VENDOR_ID = EX.VENDOR_ID AND OD.EXTMALL_ID = EX.EXTMALL_ID 
 			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 		WHERE O.MALL_GB = 'G011_20'
 		AND OD.VENDOR_ID = 'G003_V001'
@@ -1068,9 +1071,11 @@
 			
 			, O.ORD_NM AS ORDER_NAME
 			, O.ORD_PHNNO AS ORDER_CEL
+			, EX.EXTMALL_NM 
 		FROM
 			TB_ORDER O
 			INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO
+			INNER JOIN TB_EXTMALL EX ON OD.VENDOR_ID = EX.VENDOR_ID AND OD.EXTMALL_ID = EX.EXTMALL_ID
 			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 		WHERE O.MALL_GB = 'G011_20'
 		AND OD.VENDOR_ID = 'G003_V001'

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

@@ -163,10 +163,11 @@
 		{headerName: "No", width: 50, cellClass: 'text-center',
 			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
 		},
-		{headerName: "IF결과", field: "apiResult", width: 100, cellClass: 'text-center',
+		{headerName: "IF결과", field: "apiResult", width: 90, cellClass: 'text-center',
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(procGbValue, params.value); }
 		},
-		{headerName: "전송결과메세지", field: "apiMessage", width: 250, cellClass: 'text-center'},
+		{headerName: "전송결과메세지", field: "apiMessage", width: 180, cellClass: 'text-left'},
+		{headerName: "쇼핑몰명", field: "extmallNm", width: 100, cellClass: 'text-center'},
 		{headerName: "샵링커주문번호", field: "agentOrderId", width: 130, cellClass: 'text-center'},
 		{headerName: "쇼핑몰주문번호", field: "extmallOrderId", width: 130, cellClass: 'text-center'},
 		{
@@ -184,12 +185,12 @@
 				}
 			}
 		},
-		{headerName: "주문상세번호", field: "ordDtlNo", width: 120, cellClass: 'text-center'},
+		{headerName: "주문상세번호", field: "ordDtlNo", width: 110, cellClass: 'text-center'},
 		{headerName: "주문상세상태", field: "ordDtlStatNm", width: 100, cellClass: 'text-center'},
 		{headerName: "주문자명", field: "orderName", width: 90, cellClass: 'text-center'},
 		{headerName: "주문자연락처", field: "orderCel", width: 120, cellClass: 'text-center'},
-		{headerName: "배송업체", field: "shipCompNm", width: 150, cellClass: 'text-center'},
-		{headerName: "송장번호", field: "deliveryInvoice", width: 130, cellClass: 'text-center'},
+		{headerName: "배송업체", field: "shipCompNm", width: 100, cellClass: 'text-center'},
+		{headerName: "송장번호", field: "deliveryInvoice", width: 120, cellClass: 'text-center'},
 		{headerName: "배송시작일자", field: "delvStdt", width: 140, cellClass: 'text-center'},
 		{headerName: "전송일시", field: "regDt", width: 140, cellClass: 'text-center'}
 		/*{headerName: "xml", field: "xmlTxt", width: 100, cellClass: 'text-center', editable: true,