Przeglądaj źródła

샵링커수정

jmh 4 lat temu
rodzic
commit
005a13c4a4

+ 4 - 4
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);
 

+ 15 - 3
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
@@ -710,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