샵링커주문수집. 등록자 표시 / 송장전송 참고텍스트추가

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

@@ -1048,11 +1048,11 @@ public class TsaShoplinkerService {
 
 		// 헤더 title 설정
 		String[] listTitles = { "제휴몰주문등록상태", "실패사유", "업로드실패사유", "스타일24 주문번호", "샵링커 주문번호", "쇼핑몰 주문번호", "쇼핑몰 명", "배송상태[발주확인]"
-				,"주문 상품번호", "샵링커 상품번호", "자사 상품코드", "상품명", "주문수량", "주문금액", "판매단가", "공급가", "옵션코드", "옵션명", "주문수집일자", "제휴몰등록일"};
+				,"주문 상품번호", "샵링커 상품번호", "자사 상품코드", "상품명", "주문수량", "주문금액", "판매단가", "공급가", "옵션코드", "옵션명", "주문수집일자", "제휴몰등록일", "등록자"};
 
 		// 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"};
+				, "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"};
 
 		String[] cellTypes = {
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_CENTER.name(),
@@ -1064,7 +1064,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

@@ -592,6 +592,7 @@
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
+				, 'SYSTEM' AS REG_NM
 			FROM SHOPLINKER_ORDER A
 				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B
 					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
@@ -648,6 +649,7 @@
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
+				, FN_GET_USER_NM(B.REG_NO) AS REG_NM 
 			FROM 
 				TB_EXTMALL_ORDER_UPLOAD B LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL
@@ -792,12 +794,13 @@
 				, B.EXTMALL_NM
 				, B.AGENT_ORDER_ID
 				, B.EXTMALL_ORDER_ID
-				, IFNULL(B.UPLOAD_STAT, 'G021_50') AS UPLOAD_STAT
-				, B.UPLOAD_FAIL_CD
+				, FN_GET_CODE_NM('G021', IFNULL(B.UPLOAD_STAT, 'G021_50')) AS UPLOAD_STAT
+				, FN_GET_CODE_NM('G022', B.UPLOAD_FAIL_CD) AS UPLOAD_FAIL_CD
 				, B.UPLOAD_FAIL_REASON
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
+				, 'SYSTEM' AS REG_NM
 			FROM SHOPLINKER_ORDER A
 				LEFT OUTER JOIN TB_EXTMALL_ORDER_UPLOAD B
 					ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID
@@ -848,12 +851,13 @@
 				, B.EXTMALL_NM
 				, B.AGENT_ORDER_ID
 				, B.EXTMALL_ORDER_ID
-				, IFNULL(B.UPLOAD_STAT, 'G021_50') AS UPLOAD_STAT
-				, B.UPLOAD_FAIL_CD
+				, FN_GET_CODE_NM('G021', IFNULL(B.UPLOAD_STAT, 'G021_50')) AS UPLOAD_STAT
+				, FN_GET_CODE_NM('G022', B.UPLOAD_FAIL_CD) AS UPLOAD_FAIL_CD
 				, B.UPLOAD_FAIL_REASON
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
+				, FN_GET_USER_NM(B.REG_NO) AS REG_NM 
 			FROM 
 				TB_EXTMALL_ORDER_UPLOAD B LEFT OUTER JOIN SHOPLINKER_ORDER A ON A.SHOPLINKER_ORDER_ID = B.AGENT_ORDER_ID 
 			WHERE A.SHOPLINKER_ORDER_ID IS NULL

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

@@ -100,6 +100,7 @@
 							<!-- <button type="button" class="btn btn-primary btn-lg" id="btnInvoiceUpload">엑셀업로드</button> -->
 						</li>
 					</ul>
+					<p class="dot">'송장전송' 클릭 후 약 10분 후 확인해주세요.(실시간 확인가능/ 처리건 수가 많아질수록 소요시간 증가)</p>
 				</div>
 			</div>
 			<!-- 검색조건 영역 -->

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

@@ -303,7 +303,8 @@
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
-		{headerName: "제휴몰등록일", field: "extmallRegDt", width: 130, cellClass: 'text-center'}
+		{headerName: "제휴몰등록일", field: "extmallRegDt", width: 130, cellClass: 'text-center'},
+		{headerName: "등록자", field: "regNm", width: 80, cellClass: 'text-center'}
 	];
 
 	let gridOptions = gagaAgGrid.getGridOptions(columnDefs);