샵링커 주문수집- 1.배송비(팩번호) 목록&엑셀에 보이도록 항목추가 2. 배송번호 관련 참고 텍스트추가 3.등록자 잘못나오던

부분수정

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

@@ -1047,12 +1047,12 @@ public class TsaShoplinkerService {
 	public void getOrderExcelList(ShoplinkerOrder shoplinkerOrder, String excelFilenameWithPath) {
 
 		// 헤더 title 설정
-		String[] listTitles = { "제휴몰주문등록상태", "실패사유", "업로드실패사유", "스타일24 주문번호", "샵링커 주문번호", "쇼핑몰 주문번호", "쇼핑몰 명", "배송상태[발주확인]"
+		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"
+		String[] cellNames = {"UPLOAD_STAT", "UPLOAD_FAIL_CD", "UPLOAD_FAIL_REASON", "ORD_NO", "SHOPLINKER_ORDER_ID", "MALL_ORDER_ID", "SHIP_NO", "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", "OPT_CD1", "OPT_CD2", "EXCHANGE_ORDER_YN", "ORDER_REG_DATE", "EXTMALL_REG_DT", "REG_NM"};
 
@@ -1068,8 +1068,10 @@ 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()};
 
+		shoplinkerOrder.setExcelDownType("1");
 		Collection<GagaMap> dataList = admShoplinkerDao.getOrderExcelList(shoplinkerOrder);
 
 		try {
@@ -1093,7 +1095,7 @@ public class TsaShoplinkerService {
 	public void getOrderExcelExtmallFormList(ShoplinkerOrder shoplinkerOrder, String excelFilenameWithPath) {
 
 		// 헤더 title 설정
-		String[] listTitles = { "일련번호", "제휴몰ID", "제휴주문번호", "물품주문번호", "제휴상품코드", "상품명", "SKUCode"
+		String[] listTitles = { "일련번호", "제휴몰ID", "제휴주문번호(배송번호)", "물품주문번호", "제휴상품코드", "상품명", "SKUCode"
 				,"판매가", "주문수량", "배송비", "주문자", "주문자-전화", "주문자-휴대폰", "주문자-이메일", "수령자", "수령자-전화", "수령자-휴대폰"
 				, "수령자-우편번호","수령자-도로명주소", "수령자-상세주소", "배송메시지"};
 
@@ -1115,6 +1117,7 @@ public class TsaShoplinkerService {
 			GagaExcelConstants.CellType.CHAR_CENTER.name(), GagaExcelConstants.CellType.CHAR_LEFT.name(),
 			GagaExcelConstants.CellType.CHAR_LEFT.name(), GagaExcelConstants.CellType.CHAR_LEFT.name()};
 
+		shoplinkerOrder.setExcelDownType("2");
 		Collection<GagaMap> dataList = admShoplinkerDao.getOrderExcelList(shoplinkerOrder);
 		
 		GagaMap addrMap; 	//주소 분리

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

@@ -428,7 +428,8 @@
 		/* TsaShoplinker.getShoplinkerOrderListCount */
 		select count(1) from (
 			SELECT
-				ROW_NUMBER() OVER(PARTITION BY B.VENDOR_ID, B.EXTMALL_ID, B.AGENT_ORDER_ID, B.EXTMALL_ORDER_ID ORDER by B.UPLOAD_GB desc, B.UPLOAD_STAT) AS RANKING
+				ROW_NUMBER() OVER(PARTITION BY B.VENDOR_ID, ifnull(B.EXTMALL_ID, A.MALL_ID), ifnull(B.AGENT_ORDER_ID, A.SHOPLINKER_ORDER_ID)
+								, ifnull(B.EXTMALL_ORDER_ID, A.MALL_ORDER_ID) ORDER by B.UPLOAD_GB desc, B.UPLOAD_STAT) AS RANKING
 				, IFNULL(A.SHOPLINKER_ORDER_ID, B.AGENT_ORDER_ID) AS SHOPLINKER_ORDER_ID
 				, IFNULL(A.MALL_ORDER_ID, B.EXTMALL_ORDER_ID) AS MALL_ORDER_ID
 				, CASE 
@@ -546,9 +547,11 @@
 		SELECT * FROM
 		(
 			SELECT
-				ROW_NUMBER() OVER(PARTITION BY B.VENDOR_ID, B.EXTMALL_ID, B.AGENT_ORDER_ID, B.EXTMALL_ORDER_ID ORDER by B.UPLOAD_GB desc, B.UPLOAD_STAT) AS RANKING
+				ROW_NUMBER() OVER(PARTITION BY B.VENDOR_ID, ifnull(B.EXTMALL_ID, A.MALL_ID), ifnull(B.AGENT_ORDER_ID, A.SHOPLINKER_ORDER_ID)
+								, ifnull(B.EXTMALL_ORDER_ID, A.MALL_ORDER_ID) ORDER by B.UPLOAD_GB desc, B.UPLOAD_STAT) AS RANKING
 				, IFNULL(A.SHOPLINKER_ORDER_ID, B.AGENT_ORDER_ID) AS SHOPLINKER_ORDER_ID
 				, IFNULL(A.MALL_ORDER_ID, B.EXTMALL_ORDER_ID) AS MALL_ORDER_ID
+				, A.SHIP_NO
 				, CASE 
 					WHEN A.MALL_NAME IS NULL THEN 
 						(SELECT S.EXTMALL_NM FROM TB_EXTMALL S WHERE S.EXTMALL_ID = IFNULL(A.MALL_ID, B.EXTMALL_ID))
@@ -593,7 +596,7 @@
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
-				, 'SYSTEM' AS REG_NM
+				, FN_GET_USER_NM(ifnull(B.REG_NO, 99999)) AS REG_NM
 				
 				, OP.OPT_CD1 
 				, OP.OPT_CD2 
@@ -610,6 +613,7 @@
 				1 AS RANKING
 				, IFNULL(A.SHOPLINKER_ORDER_ID, B.AGENT_ORDER_ID) AS SHOPLINKER_ORDER_ID
 				, IFNULL(A.MALL_ORDER_ID, B.EXTMALL_ORDER_ID) AS MALL_ORDER_ID
+				, '' AS SHIP_NO
 				, CASE 
 					WHEN A.MALL_NAME IS NULL THEN 
 						(SELECT S.EXTMALL_NM FROM TB_EXTMALL S WHERE S.EXTMALL_ID = IFNULL(A.MALL_ID, B.EXTMALL_ID))
@@ -768,9 +772,17 @@
 		SELECT * FROM
 		(
 			SELECT
-				ROW_NUMBER() OVER(PARTITION BY B.VENDOR_ID, B.EXTMALL_ID, B.AGENT_ORDER_ID, B.EXTMALL_ORDER_ID ORDER by B.UPLOAD_GB desc, B.UPLOAD_STAT) AS RANKING
+				ROW_NUMBER() OVER(PARTITION BY B.VENDOR_ID, ifnull(B.EXTMALL_ID, A.MALL_ID), ifnull(B.AGENT_ORDER_ID, A.SHOPLINKER_ORDER_ID)
+								, ifnull(B.EXTMALL_ORDER_ID, A.MALL_ORDER_ID) ORDER by B.UPLOAD_GB desc, B.UPLOAD_STAT) AS RANKING
 				, IFNULL(A.SHOPLINKER_ORDER_ID, B.AGENT_ORDER_ID) AS SHOPLINKER_ORDER_ID
-				, IFNULL(A.MALL_ORDER_ID, B.EXTMALL_ORDER_ID) AS MALL_ORDER_ID
+				
+				, CASE 
+					WHEN '2' = #{excelDownType} and (A.MALL_ID = 'APISHOP_0003' or a.mall_id = 'APISHOP_0010' or a.mall_id = 'APISHOP_0286' or a.mall_id = 'APISHOP_0287') THEN
+						IFNULL(A.SHIP_NO, B.EXTMALL_ORDER_ID) 
+					ELSE IFNULL(A.MALL_ORDER_ID, B.EXTMALL_ORDER_ID) 
+				  END MALL_ORDER_ID
+				, A.SHIP_NO
+				
 				, CASE 
 					WHEN A.MALL_NAME IS NULL THEN 
 						(SELECT S.EXTMALL_NM FROM TB_EXTMALL S WHERE S.EXTMALL_ID = IFNULL(A.MALL_ID, B.EXTMALL_ID))
@@ -815,7 +827,7 @@
 				, IFNULL(B.ORD_NO, '') AS ORD_NO
 				, B.DELV_ADDR_SQ
 				, B.REG_DT AS EXTMALL_REG_DT
-				, 'SYSTEM' AS REG_NM
+				, FN_GET_USER_NM(ifnull(B.REG_NO, 99999)) AS REG_NM
 				
 				, OP.OPT_CD1 
 				, OP.OPT_CD2 
@@ -832,6 +844,7 @@
 				1 as RANKING
 				, IFNULL(A.SHOPLINKER_ORDER_ID, B.AGENT_ORDER_ID) AS SHOPLINKER_ORDER_ID
 				, IFNULL(A.MALL_ORDER_ID, B.EXTMALL_ORDER_ID) AS MALL_ORDER_ID
+				, '' AS SHIP_NO
 				, CASE 
 					WHEN A.MALL_NAME IS NULL THEN 
 						(SELECT S.EXTMALL_NM FROM TB_EXTMALL S WHERE S.EXTMALL_ID = IFNULL(A.MALL_ID, B.EXTMALL_ID))
@@ -947,6 +960,11 @@
 	              <when test='searchOne != null and searchOne == "orderCel"'>
 	              	AND replace(IFNULL(A.ORDER_CEL, B.ORD_TELNO), '-', '') like CONCAT('%',replace(#{conditionOne}, '-', ''),'%')
 	              </when>
+	              
+	              <when test='searchOne != null and searchOne == "regNm"'>
+	              	AND FN_GET_USER_NM(ifnull(B.REG_NO, 99999)) like CONCAT('%',replace(#{conditionOne}, '-', ''),'%')
+	              </when>
+	              
 	            </choose>
 	        </if>
 	</sql>

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

@@ -126,6 +126,7 @@
 								<option value="mallOrderId">쇼핑몰주문번호</option>
 								<option value="orderName">주문자명</option>
 								<option value="orderCel">주문자연락처</option>
+								<option value="regNm">등록자명</option>
 							</select>
 							<input type="text" class="w40p" name="conditionOne" id="conditionOne">
 						</td>
@@ -155,6 +156,9 @@
 						<!-- <button type="button" class="btn btn-default btn-lg" onclick="fnTest();">테스트</button> -->
 					</li>
 				</ul>
+				
+				<p class="dot">옥션, 지마켓, 카카오톡스토어, 위메프의 경우 '쇼핑몰 주문번호'가 '배송번호'로 변경되어 주문됩니다.(자동 주문등록 시)</p>
+				<p class="dot">옥션, 지마켓, 카카오톡스토어, 위메프의 경우 '엑셀다운로드(제휴몰주문업로드 폼)' 시 쇼핑몰 주문번호'가 '배송번호'로 변경되어 보여집니다.</p>
 			</div>
 			<!-- 검색조건 영역 -->
 
@@ -274,6 +278,7 @@
 			}
 		},
 		{headerName: "쇼핑몰 주문번호", field: "mallOrderId", width: 130, cellClass: 'text-center'},
+		{headerName: "배송번호", field: "shipNo", width: 130, cellClass: 'text-center'},		
 		{headerName: "쇼핑몰 명", field: "mallName", width: 130, cellClass: 'text-center'},
 		{headerName: "주문자명", field: "orderName", width: 130, cellClass: 'text-center'},
 		{headerName: "주문자연락처", field: "orderCel", width: 130, cellClass: 'text-center'},