Merge remote-tracking branch 'origin/develop' into card007

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

@@ -1208,17 +1208,17 @@ 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", "SHIP_COMP_NM", "DELIVERY_INVOICE", "REG_DT"};
+		String[] cellNames = {"API_RESULT", "API_MESSAGE", "AGENT_ORDER_ID", "EXTMALL_ORDER_ID", "ORD_NO", "ORD_DTL_NO", "ORD_DTL_STAT_NM", "SHIP_COMP_NM", "DELIVERY_INVOICE", "REG_DT"};
 
 		String[] cellTypes = {
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_LEFT.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_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

@@ -249,7 +249,11 @@
 				  WHEN 'CERT' =  A.API_TYPE THEN '인증'
 				  WHEN 'IMAGE' =  A.API_TYPE THEN '이미지'
 			  END API_TYPE
-			, IFNULL(A.API_RESULT, '') AS API_RESULT
+			, CASE WHEN 'true' = A.API_RESULT THEN '전송완료'
+  		    	   WHEN 'false' = A.API_RESULT THEN '전송실패'
+  		    	   WHEN 'error' = A.API_RESULT THEN '오류'
+  		    	   ELSE IFNULL(A.API_RESULT, '')
+			  END API_RESULT
 			, IFNULL(A.API_MESSAGE, '') AS API_MESSAGE
 			, IFNULL(A.API_PRODUCT_ID, '') AS API_PRODUCT_ID
 			, IFNULL(A.GOODS_CD, '') AS GOODS_CD
@@ -346,7 +350,11 @@
 	/* TsaShoplinker.getStockList */
 		SELECT
 			A.API_TYPE
-			, A.API_RESULT
+			, CASE WHEN 'true' = A.API_RESULT THEN '전송완료'
+  		    	   WHEN 'false' = A.API_RESULT THEN '전송실패'
+  		    	   WHEN 'error' = A.API_RESULT THEN '오류'
+  		    	   ELSE IFNULL(A.API_RESULT, '')
+			  END API_RESULT
 			, A.API_MESSAGE
 			, A.GOODS_CD
 			, A.OPT_CD
@@ -680,6 +688,7 @@
 			TB_ORDER_DETAIL OD
 			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 		WHERE OD.VENDOR_ID = 'G003_V001'
+		AND (OD.ORD_DTL_STAT = 'G013_50' OR SL.ORD_DTL_NO IS NOT NULL)
 		AND OD.INVOICE_NO IS NOT NULL
 		AND OD.DELV_STDT IS NOT NULL
 
@@ -709,7 +718,11 @@
 			, FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT) AS ORD_DTL_STAT_NM
 			, OD.DELV_STDT
 
-			, SL.API_RESULT
+			, CASE WHEN 'true' = SL.API_RESULT THEN '전송완료'
+  		    	   WHEN 'false' = SL.API_RESULT THEN '전송실패'
+  		    	   WHEN 'error' = SL.API_RESULT THEN '오류'
+  		    	   ELSE IFNULL(SL.API_RESULT, '')
+			  END API_RESULT
 			, SL.API_MESSAGE
 			, SL.XML_TXT
 			, SL.REG_DT
@@ -717,6 +730,9 @@
 			TB_ORDER_DETAIL OD
 			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 		WHERE OD.VENDOR_ID = 'G003_V001'
+		AND (OD.ORD_DTL_STAT = 'G013_50' OR SL.ORD_DTL_NO IS NOT NULL)
+		AND OD.INVOICE_NO IS NOT NULL
+		AND OD.DELV_STDT IS NOT NULL
 
 		<include refid="getSlkInvoiceCondition_sql"/>
 

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -912,6 +912,7 @@ var fnCalculateRefundAmt = function (obj) {
 	var chgerTelno 	= orderInfoList[0].ordTelno;
 	var custNo		= orderInfoList[0].custNo;
 	var delvFeeCd	= orderInfoList[0].delvFeeCd;
+	var delvFeeCdGrp = $('#cancelRequestFrm input[name=delvFeeCdGrp]').val();
 	
 	// 환불금액계산호출
 	var jsonObj = {
@@ -925,7 +926,7 @@ var fnCalculateRefundAmt = function (obj) {
 		,"custNo"				: custNo
 		,"ordNm"				: chgerNm
 		,"ordPhnno"				: chgerPhnno
-		,"delvFeeCd"			: delvFeeCd
+		,"delvFeeCdGrp"			: delvFeeCdGrp
 	}
 	
 	var jsonData = JSON.stringify(jsonObj);
@@ -1181,6 +1182,7 @@ var fnCnclReq = function (reqGbn) {
 	var ordPhnno 	= orderInfoList[0].ordPhnno;
 	var custNo		= orderInfoList[0].custNo;
 	var delvFeeCd	= orderInfoList[0].delvFeeCd;
+	var delvFeeCdGrp = $('#cancelRequestFrm input[name=delvFeeCdGrp]').val();
 
 	var jsonObj = {
 		"ordNo"						: $('#cancelRequestFrm input[name=ordNo]').val()
@@ -1204,7 +1206,7 @@ var fnCnclReq = function (reqGbn) {
 		,"chgerRtnMemo"				: chgerRtnMemo
 		,"ordChgSq"					: ordChgSq
 		,"wdGb"						: $('#wdGb:checked').val()
-		,"delvFeeCd"				: delvFeeCd
+		,"delvFeeCdGrp"				: delvFeeCdGrp
 		,"custNo"					: custNo
 		,"ordNm"					: ordNm
 		,"ordPhnno"					: ordPhnno

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

@@ -149,13 +149,13 @@
 	let extmallList = gagajf.convertToArray([[${extmallList}]]);
 
 	let columnDefs = [
-		{headerName: "No", width: 60, cellClass: 'text-center',
+		{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',
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(procGbValue, params.value); }
 		},
-		{headerName: "전송결과메세지", field: "apiMessage", width: 300, cellClass: 'text-center'},
+		{headerName: "전송결과메세지", field: "apiMessage", width: 250, cellClass: 'text-center'},
 		{headerName: "샵링커주문번호", field: "agentOrderId", width: 130, cellClass: 'text-center'},
 		{headerName: "쇼핑몰주문번호", field: "extmallOrderId", width: 130, cellClass: 'text-center'},
 		{
@@ -174,6 +174,7 @@
 			}
 		},
 		{headerName: "주문상세번호", field: "ordDtlNo", width: 120, cellClass: 'text-center'},
+		{headerName: "주문상세상태", field: "ordDtlStatNm", width: 100, cellClass: 'text-center'},
 		{headerName: "배송업체", field: "shipCompNm", width: 150, cellClass: 'text-center'},
 		{headerName: "송장번호", field: "deliveryInvoice", width: 130, cellClass: 'text-center'},
 		{headerName: "배송시작일자", field: "delvStdt", width: 140, cellClass: 'text-center'},