08.31 c/s 추가요청사항 처리

src/main/java/com/style24/admin/biz/web/TsaWithdrawController.java

@@ -81,7 +81,7 @@ public class TsaWithdrawController extends TsaBaseController {
 
 		// 사이트구분
 		mav.addObject("siteCdList", rendererService.getAvailCommonCodeList("G000"));
-
+		mav.addObject("extmallList", rendererService.getVendorExtmallList("G003_V001"));
 		mav.setViewName("withdraw/RefundRegisterListForm");
 
 		return mav;
@@ -109,7 +109,6 @@ public class TsaWithdrawController extends TsaBaseController {
 		result.set("pageing", withdraw);
 		result.set("refundList", withdrawService.getRefundList(withdraw));
 		
-		
 		return result;
 	}
 	

src/main/java/com/style24/persistence/domain/Delivery.java

@@ -118,7 +118,7 @@ public class Delivery extends TscBaseDomain {
 	private String orgInvoiceNo;
 	private String soldoutMemo;
 	private String soldoutRegNo;
-	
+	private String custId;
 	
 	private Integer ordDtlNo;
 	private Integer ordNo;

src/main/java/com/style24/persistence/domain/Withdraw.java

@@ -93,7 +93,9 @@ public class Withdraw extends TscBaseDomain {
 	private String refundConfirm;
 	private String shipCompCd;
 	private String gubun;
-	
+	private String extmallOrderId;
+	private String extmallId;
+	private String extmallNm;	
 	
 	private Integer ordNo;
 	private Integer ordDtlNo; 

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

@@ -76,15 +76,18 @@
 		    , FN_GET_CODE_NM('G056', Z.GOODS_TYPE ) AS GOODS_TYPE_NM 
 		    , (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY S WHERE S.SUPPLY_COMP_CD = Z.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM 
 		    , IFNULL((SELECT  MAX(SWT_TRC_SEND_YN) FROM TB_ORDER_DETAIL_INVOICE V WHERE V.ORD_NO = Z.ORD_NO AND V.ORD_DTL_NO = Z.ORD_DTL_NO AND V.INVOICE_NO = Z.INVOICE_NO  ),'N') AS INVC_TRACKING 
+		    
 		FROM (
 		    SELECT A.*, ROW_NUMBER() OVER(ORDER BY  A.ORD_NO DESC, A.ORD_DTL_NO) RNUM 
 		    FROM (
 				SELECT A.* 
+				      
 				  FROM (
 					SELECT 
 							  CASE WHEN ORD_DTL_STAT IN('G013_20','G013_30','G013_35','G013_40')
 							       THEN FN_GET_BIZDAYS(IF(A.ORD_EXCH_GB='O',DATE_FORMAT(A.PAY_DT,'%Y%m%d'),DATE_FORMAT(A.WD_EDDT,'%Y%m%d')),DATE_FORMAT(NOW(),'%Y%m%d')) - 1 
 							       ELSE NULL END AS DELV_DELAY_DAYS
+							, (SELECT CUST_ID FROM TB_CUSTOMER CT WHERE CT.CUST_NO= A.CUST_NO ) AS CUST_ID
 							, A.ORD_NO     -- 주문번호
 							, A.ORD_DTL_NO -- 주문상세번호
 							, A.SITE_CD    -- 사이트
@@ -267,6 +270,16 @@
 				AND A.DELV_DELAY_DAYS >= #{delvDelayDays}
 				]]>
 				</if>
+				
+				<if test='custId != null and custId != ""'>
+		
+				AND A.CUST_ID = #{custId}
+		
+				</if>
+				
+				
+				
+				
 				ORDER BY A.ORD_NO DESC, A.ORD_DTL_NO
 	<include refid="getListPagingCondition_sql"/>
 	</select>

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

@@ -43,7 +43,8 @@
 		/* TsaWithdraw.getRefundList */
 		
 		SELECT Z.*
-		    , FN_GET_CODE_NM('G688', Z.CHG_REASON) AS CHG_REASON_NM -- 요청사유   
+		    , FN_GET_CODE_NM('G688', Z.CHG_REASON) AS CHG_REASON_NM -- 요청사유  
+		    , (SELECT EXTMALL_NM FROM TB_EXTMALL EX WHERE EX.EXTMALL_ID = Z.EXTMALL_ID ) AS EXTMALL_NM
 		FROM (
 		    SELECT A.*, ROW_NUMBER() OVER(ORDER BY  A.ORD_NO DESC, A.ORD_DTL_NO) RNUM 
 		    FROM (
@@ -74,6 +75,8 @@
 					, DATE_FORMAT(D.REG_DT, '%Y-%m-%d') AS RC_REG_DT        -- 반품신청일
 					, I.CUST_NO AS USER_NO 
 					, '' AS REFUND_CONFIRM
+					, O.EXTMALL_ID 
+					, O.EXTMALL_ORDER_ID 
 				  FROM TB_WITHDRAW A
 				  JOIN TB_WITHDRAW_DETAIL B ON A.WD_INVOICE_NO  = B.WD_INVOICE_NO AND A.ORD_CHG_SQ = B.ORD_CHG_SQ 
 				  JOIN TB_ORDER_CHANGE_DETAIL C ON B.ORD_CHG_SQ = C.ORD_CHG_SQ AND B.ORD_DTL_NO = C.ORD_DTL_NO AND C.DEL_YN ='N'
@@ -126,6 +129,19 @@
 		<if test="senderNm != null and senderNm != ''">
 			AND A.SENDER_NM = #{senderNm}
 		</if>
+		<if test="extmallId != null and extmallId != '' ">
+			<if test='extmallId == "N" '>
+				AND O.EXTMALL_ID  IS NULL
+			</if>			
+			<if test='extmallId != "N" '>
+				AND O.EXTMALL_ID  = #{extmallId}
+			</if>					
+			
+		</if>
+	
+		<if test="extmallOrderId != null and extmallOrderId != ''">
+			AND O.EXTMALL_ORDER_ID   = #{extmallOrderId}
+		</if>
 	</sql>
 	
 	<!-- 회수예외목록 건수 -->

src/main/webapp/WEB-INF/views/delivery/DeliveryListForm.html

@@ -108,7 +108,7 @@
 						<td rowspan="4" colspan="5">
 							<select class="w130" name="search" id="search">
 								<option value="searchOrdNo">주문번호</option>
-								<option value="searchExtmallOrderId">외부몰주문번호</option>
+								<option value="searchExtmallOrderId">제휴몰주문번호</option>
 							</select>
 							<textarea class="textareaR3 w70p" name="condition" id="condition"></textarea>
 						</td>
@@ -161,6 +161,13 @@
 							<span id="terms"></span>
 						</td>
 					</tr>
+					<tr>
+						<th>고객ID</th>
+						<td colspan="8">
+							<input type="text" class="w200" name="custId" placeholder="" maxlength="20" />
+							
+						</td>
+					</tr>					
 				</table>
 				<ul class="panelBar">
 					<li class="center">
@@ -273,6 +280,7 @@
 				}
 			}
 		},
+		{headerName: "고객ID", 			field: "custId", 		width: 100, cellClass: 'text-center'},
 		{headerName: "휴대번호", 		field: "maskingOrdPhnno", 		width: 100, cellClass: 'text-center',
 			valueGetter: function (params) { return params.data.maskingOrdPhnno; }
 		},
@@ -351,7 +359,7 @@
 				return buttonTag;
 			}
 		},
-		{headerName: "외부몰주문번호", 	field: "extmallOrderId",width: 150, cellClass: 'text-left'},
+		{headerName: "제휴몰주문번호", 	field: "extmallOrderId",width: 150, cellClass: 'text-left'},
 		{headerName: "샵링커주문번호", field: "agentOrderId", 	width: 150, cellClass: 'text-left'},
 		{headerName: "배송메모", 		field: "delvMemo", 		width: 200, cellClass: 'text-left'},
 		{headerName: "우편번호", 		field: "recipZipcode", 		width: 80, cellClass: 'text-center'},

src/main/webapp/WEB-INF/views/withdraw/RefundRegisterListForm.html

@@ -40,15 +40,17 @@
 				
 					<table class="frmStyle">
 						<colgroup>
-							<col style="width:10%" />
-							<col style="width:40%" />
-							<col style="width:10%" />
-							<col style="width:40%" />
+							<col style="width:8%" />
+							<col style="width:25%" />
+							<col style="width:8%" />
+							<col style="width:25%" />
+							<col style="width:8%" />
+							<col style="width:26%" />
 						</colgroup>
 						<tbody>
 							<tr>
 								<th>구분<em class="required" title="필수"></em></th>
-								<td colspan="3">
+								<td colspan="5">
 									<select id="searchType" name="searchType">
 										<option value="withdrawDt">회수등록일자</option>
 										<option value="returnDt">반품신청일자</option>
@@ -70,6 +72,10 @@
 								<td>
 									<input type="text" name="wdInvoiceNo" class="w200" />
 								</td>
+								<th>제휴몰 주문번호</th>
+								<td>
+									<input type="text" name="extmallOrderId" class="w200" />
+								</td>	
 							</tr>
 							<tr>
 								<th>환불상태</th>
@@ -84,6 +90,14 @@
 								<td>
 									<input type="text" class="w200" name="goodsCd"/>
 								</td>
+								<th>제휴사</th>
+								<td>
+									<select name="extmallId" id="extmallId" class="w200">
+										<option value="">[전체]</option>
+										<option value="N">제휴사 제외</option>
+										<option th:if="${extmallList}" th:each="oneData, status : ${extmallList}" th:value="${oneData.cd}" th:text=" ${oneData.cdNm}"></option>
+									</select>
+								</td>								
 							</tr>
 							<tr>
 								<th>주문자명</th>
@@ -91,7 +105,7 @@
 									<input type="text" id="ordNm" name="ordNm" class="w200" />
 								</td>
 								<th>보내는사람</th>
-								<td>
+								<td colspan="3">
 									<input type="text" id="senderNm" name="senderNm" class="w200" />
 								</td>
 							</tr>
@@ -102,6 +116,7 @@
 						<li class="center">
 						<button type="button" class="btn btn-base btn-lg btn-lg" id="btnSearch">조회</button>
 						<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset(); fnInitCalendar();">초기화</button>
+						<button type="button" id="btnExcel" class="btn btn-info btn-lg">엑셀다운로드</button>
 						</li>
 					</ul>
 			</div>
@@ -137,6 +152,8 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// specify the columns
+	// var extmallList =  gagajf.convertToArray([[${extmallList}]]);
+	
 	var columnDefs = [
 		{headerName: "환불상태 ",		field: "rfndStat",	width: 80,  cellClass: 'text-center'},
 		{headerName: "회수구분", 		field: "wdGb",		width: 80,  cellClass: 'text-center'},
@@ -157,6 +174,11 @@
 		{headerName: "보낸연락처", 	field: "maskingSenderPhnno", 	width: 120, cellClass: 'text-center'},
 		{headerName: "주문자명", 	field: "maskingOrdNm",			width: 100, cellClass: 'text-center'},
 		{headerName: "주문자연락처", field: "maskingOrdPhnno",		width: 120, cellClass: 'text-center'},
+		
+		{headerName: "제휴사", field: "extmallId",		width: 120, cellClass: 'text-left'},
+		{headerName: "제휴몰 주문번호", field: "extmallOrderId",		width: 120, cellClass: 'text-center'},
+		
+		
 		{headerName: "도착일", 		field: "arrivalDt", 	width: 100,  cellClass: 'text-center'},
 		{headerName: "환불확정일", 	field: "completeDt",	width: 100,  cellClass: 'text-center'},
 		{headerName: "WMS회수메모", 	field: "wdMemo", 		width: 200,  cellClass: 'text-left'},
@@ -263,6 +285,36 @@
 		cfnOpenModalPopup(actionUrl, "popupWithdrawDetail");
 	}
 
+	/*************************************************************************
+	* 엑셀다운로드 
+	**************************************************************************/		
+	$('#btnExcel').on('click', function () {
+		var totalRows = withDrawGridOptions.api.getDisplayedRowCount();
+		if (totalRows == 0) {
+			mcxDialog.alert('조회된 내역이 없습니다.');
+			return;
+		}
+		var date = new Date().format("YYYYMMDDHHmmss");
+		var params = {
+
+			fileName: "환불관리목록_" + date,
+			sheetName: "DATA"
+		}
+		withDrawGridOptions.excelStyles = [
+			{
+				id: 'dateFormat',
+				dataType: 'dateTime',
+				numberFormat: {
+					format: 'YYYY-MM-DD;@'
+				}
+			},
+			{
+				id: 'textFormat',
+				dataType: 'string'
+			}
+		]
+		withDrawGridOptions.api.exportDataAsExcel(params);
+	});	
 	
 	/*   회수 삭제 필요성이 현재 없어보임!!!
 	// 회수 삭제