Merge branch 'stage_tsit' into returnAfterDecision

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

@@ -1280,23 +1280,25 @@ 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", "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", "ORDER_NAME", "ORDER_CEL", "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_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);
 
 		try {
 
-			GagaExcelUtil.createExcel(excelFilenameWithPath, dataList, "샵링커 송장 정보", listTitles, cellNames, cellTypes, TsaConstants.EXCEL_FOOTER_TITLE);
+			// GagaExcelUtil.createExcel(excelFilenameWithPath, dataList, "샵링커 송장 정보", listTitles, cellNames, cellTypes, TsaConstants.EXCEL_FOOTER_TITLE);
+			GagaExcelUtil.createExcel(excelFilenameWithPath, dataList, listTitles, cellNames, cellTypes);
 
 		} catch (Exception e) {
 			throw new IllegalStateException(e);

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

@@ -933,7 +933,7 @@
 	            </choose>
 	        </if>
 	        
-	        <if test='conditionOne != null'>
+	        <if test="conditionOne != null and conditionOne != ''">
 	            <choose>
 	              <when test='searchOne != null and searchOne == "mallOrderId"'>
 	                AND UPPER(IFNULL(A.MALL_ORDER_ID, B.EXTMALL_ORDER_ID)) like CONCAT('%',UPPER(#{conditionOne}),'%')
@@ -957,9 +957,11 @@
 		SELECT
 			count(OD.ORD_DTL_NO)
 		FROM
-			TB_ORDER_DETAIL OD
+			TB_ORDER O
+			INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO
 			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'
+		WHERE O.MALL_GB = 'G011_20'
+		AND OD.VENDOR_ID = 'G003_V001'
 		AND OD.INVOICE_NO IS NOT NULL
 		AND OD.DELV_STDT IS NOT NULL
 		<include refid="getSlkInvoiceCondition_sql"/>
@@ -991,10 +993,15 @@
 			, SL.XML_TXT
 			, SL.REG_DT
 			, FN_GET_USER_NM(SL.REG_NO) AS REG_NM
+			
+			, O.ORD_NM AS ORDER_NAME
+			, O.ORD_PHNNO AS ORDER_CEL
 		FROM
-			TB_ORDER_DETAIL OD
+			TB_ORDER O
+			INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO
 			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'
+		WHERE O.MALL_GB = 'G011_20'
+		AND 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
@@ -1033,10 +1040,15 @@
 			, SL.API_MESSAGE
 			, SL.XML_TXT
 			, SL.REG_DT
+			
+			, O.ORD_NM AS ORDER_NAME
+			, O.ORD_PHNNO AS ORDER_CEL
 		FROM
-			TB_ORDER_DETAIL OD
+			TB_ORDER O
+			INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO
 			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'
+		WHERE O.MALL_GB = 'G011_20'
+		AND 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
@@ -1102,6 +1114,18 @@
 
 	            </choose>
 	        </if>
+	        
+	        <if test="conditionOne != null and conditionOne != ''">
+	            <choose>
+	              <when test='searchOne != null and searchOne == "orderName"'>
+	              	AND UPPER(O.ORD_NM) like CONCAT('%',UPPER(#{conditionOne}),'%')
+	              </when>
+
+	              <when test='searchOne != null and searchOne == "orderCel"'>
+	              	AND replace(O.ORD_PHNNO, '-', '') like CONCAT('%',replace(#{conditionOne}, '-', ''),'%')
+	              </when>
+	            </choose>
+	        </if>
 	</sql>
 
 </mapper>

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

@@ -54,8 +54,8 @@
 							<th>배송시작일자</th>
 							<td colspan="3" id="sellTerms"></td>
 
-							<th rowspan="2">키워드</th>
-							<td rowspan="2">
+							<th rowspan="3">키워드</th>
+							<td rowspan="3">
 								<select name="search" id="search">
 									<option value="ordNo">스타일24주문번호</option>
 									<option value="agentOrderId">샵링커주문번호</option>
@@ -90,6 +90,16 @@
 							</td>
 
 						</tr>
+						<tr>
+							<th>단건 키워드</th>
+							<td colspan="4">
+								<select name="searchOne" id="searchOne">
+									<option value="orderName">주문자명</option>
+									<option value="orderCel">주문자연락처</option>
+								</select>
+								<input type="text" class="w20p" name="conditionOne" id="conditionOne">
+							</td>
+						</tr>
 					</table>
 
 					<ul class="panelBar">
@@ -176,6 +186,8 @@
 		},
 		{headerName: "주문상세번호", field: "ordDtlNo", width: 120, 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: "delvStdt", width: 140, cellClass: 'text-center'},
@@ -377,7 +389,11 @@
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);
 	});
-
+	
+	var fnOpenOrderDetailPopup = function (ordNo) {
+		currOrdNo = ordNo;
+		cfnOpenOrderDetailPopup(ordNo);
+	};
 /*]]>*/
 </script>