jsh77b 5 лет назад
Родитель
Сommit
beaaf1f6eb

+ 2 - 0
src/main/java/com/style24/persistence/domain/Order.java

@@ -26,9 +26,11 @@ public class Order extends TscBaseDomain {
 	private String ordNm;
 	private String ordNm;
 	private String ordTelno;
 	private String ordTelno;
 	private String siteCd;
 	private String siteCd;
+	private String siteCdNm;
 	private int npayOrdNo;
 	private int npayOrdNo;
 	private String frontGb;
 	private String frontGb;
 	private String frontGbNm;
 	private String frontGbNm;
+	private String extmallNm;
 
 
 	// 주문상세
 	// 주문상세
 	private int ordDtlNo;
 	private int ordDtlNo;

+ 6 - 2
src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -390,6 +390,7 @@
 	<select id="getOrderInfoList" parameterType="Order" resultType="Order">
 	<select id="getOrderInfoList" parameterType="Order" resultType="Order">
 		/* order.getOrderInfoList */
 		/* order.getOrderInfoList */
 		SELECT O.SITE_CD
 		SELECT O.SITE_CD
+		     , FN_GET_CODE_NM('G000', O.SITE_CD) AS SITE_CD_NM
 		     , O.MALL_GB
 		     , O.MALL_GB
 		     , FN_GET_CODE_NM('G011', O.MALL_GB) AS MALL_GB_NM
 		     , FN_GET_CODE_NM('G011', O.MALL_GB) AS MALL_GB_NM
 		     , O.FRONT_GB
 		     , O.FRONT_GB
@@ -397,8 +398,11 @@
 		            THEN 'PC'
 		            THEN 'PC'
 		            ELSE 'MOBILE'
 		            ELSE 'MOBILE'
 		             END FRONT_GB_NM
 		             END FRONT_GB_NM
-		     , OD.EXTMALL_ID 
-		     , DATE_FORMAT(O.ORD_DT,'%Y%m%d%H%i%S') AS ORD_DT
+		     , OD.EXTMALL_ID
+		     , (SELECT X.EXTMALL_NM
+		        FROM   TB_EXTMALL X
+		        WHERE  X.EXTMALL_ID = OD.EXTMALL_ID) AS EXTMALL_NM 
+		     , O.ORD_DT
 		     , O.ORD_NM
 		     , O.ORD_NM
 		     , O.CUST_NO
 		     , O.CUST_NO
 		     , O.ORD_NO
 		     , O.ORD_NO

+ 82 - 13
src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -28,7 +28,61 @@
 				<input type="hidden" name="orderEmail"/>
 				<input type="hidden" name="orderEmail"/>
 				
 				
 				<h4>기본정보</h4>
 				<h4>기본정보</h4>
-				<div id="gridOrderInfo" style="width:100%; height:100px;" class="ag-theme-balham"></div>
+				<!-- <div id="gridOrderInfo" style="width:100%; height:100px;" class="ag-theme-balham"></div> -->
+
+				<!-- TABLE -->
+				<table class="tableStyle">
+					<colgroup>
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+					</colgroup>
+					<thead>
+						<tr>
+							<th>사이트</th>
+							<th>몰구분</th>
+							<th>웹구분</th>
+							<th>외부몰</th>
+							<th>주문일시</th>
+							<th>주문자</th>
+							<th>고객번호</th>
+							<th>주문번호</th>
+							<th>이메일</th>
+							<th>핸드폰번호</th>
+							<th>회원구분</th>
+							<th>관리대상</th>
+							<th>등급</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td th:text="${orderInfo[0].siteCdNm}"></td>
+							<td th:text="${orderInfo[0].mallGbNm}"></td>
+							<td th:text="${orderInfo[0].frontGbNm}"></td>
+							<td th:text="${orderInfo[0].extmallNm}"></td>
+							<td th:text="${orderInfo[0].ordDt}"></td>
+							<td th:text="${orderInfo[0].ordNm}"></td>
+							<td th:text="${orderInfo[0].custNo}"></td>
+							<td th:text="${orderInfo[0].ordNo}"></td>
+							<td th:text="${orderInfo[0].ordEmail}"></td>
+							<td th:text="${orderInfo[0].ordPhnno}"></td>
+							<td th:text="${orderInfo[0].custGbNm}"></td>
+							<td th:text="${orderInfo[0].managedRsnNm}"></td>
+							<td th:text="${orderInfo[0].custGradeNm}"></td>
+						</tr>
+					</tbody>
+				</table>
+				<!-- //TABLE -->
 									
 									
 				<h4>주문상품정보</h4>
 				<h4>주문상품정보</h4>
 				<button type="button" class="btn btnRight btn-base btn-sm off" id="btnExchange" style="margin-left:10px;" >교환요청</button>
 				<button type="button" class="btn btnRight btn-base btn-sm off" id="btnExchange" style="margin-left:10px;" >교환요청</button>
@@ -163,6 +217,10 @@ var orderAgGrid = {
 	}
 	}
 }
 }
 
 
+// 그리드 추가
+//gagaAgGrid.createGrid('gridList', gridOptions);
+//gagaAgGrid.hideStatusBar('gridList');
+
 // 1.주문기본정보 그리드 바인딩
 // 1.주문기본정보 그리드 바인딩
 var columnDefsOrderInfo = [
 var columnDefsOrderInfo = [
 	{
 	{
@@ -219,7 +277,7 @@ var columnDefsOrderInfo = [
 	{headerName: "관리대상"	, field: "managedRsnNm"	, width: 80		, cellClass: 'text-center'},
 	{headerName: "관리대상"	, field: "managedRsnNm"	, width: 80		, cellClass: 'text-center'},
 	{headerName: "등급"		, field: "custGradeNm"	, width: 80		, cellClass: 'text-center'}
 	{headerName: "등급"		, field: "custGradeNm"	, width: 80		, cellClass: 'text-center'}
 ];
 ];
-var gridOptionsOrderInfo = orderAgGrid.getGridOptions(columnDefsOrderInfo);
+var gridOptionsOrderInfo = gagaAgGrid.getGridOptions(columnDefsOrderInfo);
 
 
 // 2.상품별 상세정보
 // 2.상품별 상세정보
 var columnDefsGoodsInfo = [
 var columnDefsGoodsInfo = [
@@ -515,7 +573,7 @@ var columnDefsGoodsInfo = [
 		]
 		]
 	}
 	}
 ];
 ];
-var gridOptionsGoodsInfo = orderAgGrid.getGridOptions(columnDefsGoodsInfo);
+var gridOptionsGoodsInfo = gagaAgGrid.getGridOptions(columnDefsGoodsInfo);
 
 
 // 2.5 주문사은품정보
 // 2.5 주문사은품정보
 var columnDefsOrderFreeGiftInfo = [
 var columnDefsOrderFreeGiftInfo = [
@@ -541,7 +599,7 @@ var columnDefsOrderFreeGiftInfo = [
 	{headerName: "옵션코드2"		, field: "optCd2"			, width: 100, cellClass: 'text-center'},
 	{headerName: "옵션코드2"		, field: "optCd2"			, width: 100, cellClass: 'text-center'},
 	{headerName: "삭제여부"		, field: "delYn"			, width: 100, cellClass: 'text-center'}
 	{headerName: "삭제여부"		, field: "delYn"			, width: 100, cellClass: 'text-center'}
 ];
 ];
-var gridOptionsOrderFreeGiftInfo = orderAgGrid.getGridOptions(columnDefsOrderFreeGiftInfo);
+var gridOptionsOrderFreeGiftInfo = gagaAgGrid.getGridOptions(columnDefsOrderFreeGiftInfo);
 
 
 // 3.배송정보
 // 3.배송정보
 var columnDefsDeliveryInfo = [
 var columnDefsDeliveryInfo = [
@@ -562,7 +620,7 @@ var columnDefsDeliveryInfo = [
 	{headerName: "주소(상세)"		, field: "recipDtlAddr"		, width: 200, cellClass: 'text-left', editable: true},
 	{headerName: "주소(상세)"		, field: "recipDtlAddr"		, width: 200, cellClass: 'text-left', editable: true},
 	{headerName: "배송메모"		, field: "delvMemo"			, width: 280, cellClass: 'text-left', editable: true}
 	{headerName: "배송메모"		, field: "delvMemo"			, width: 280, cellClass: 'text-left', editable: true}
 ];
 ];
-var gridOptionsDeliveryInfo = orderAgGrid.getGridOptions(columnDefsDeliveryInfo);
+var gridOptionsDeliveryInfo = gagaAgGrid.getGridOptions(columnDefsDeliveryInfo);
 
 
 // 4.결제정보
 // 4.결제정보
 var columnDefsPaymentInfo = [
 var columnDefsPaymentInfo = [
@@ -610,7 +668,7 @@ var columnDefsPaymentInfo = [
 	},
 	},
 	{headerName: "계좌만료일"	, field: "vaDeadline"	, width: 150	, cellClass: 'text-center'}
 	{headerName: "계좌만료일"	, field: "vaDeadline"	, width: 150	, cellClass: 'text-center'}
 ];
 ];
-var gridOptionsPaymentInfo = orderAgGrid.getGridOptions(columnDefsPaymentInfo);
+var gridOptionsPaymentInfo = gagaAgGrid.getGridOptions(columnDefsPaymentInfo);
 
 
 // 5.배송비
 // 5.배송비
 var columnDefsDeliveryFeeInfo = [
 var columnDefsDeliveryFeeInfo = [
@@ -635,7 +693,7 @@ var columnDefsDeliveryFeeInfo = [
 		}
 		}
 	}
 	}
 ];
 ];
-var gridOptionsDeliveryFeeInfo = orderAgGrid.getGridOptions(columnDefsDeliveryFeeInfo);
+var gridOptionsDeliveryFeeInfo = gagaAgGrid.getGridOptions(columnDefsDeliveryFeeInfo);
 
 
 // 6. 반품/교환 정보
 // 6. 반품/교환 정보
 var columnDefsOrderChangeInfo = [
 var columnDefsOrderChangeInfo = [
@@ -717,7 +775,7 @@ var columnDefsOrderChangeInfo = [
 	},
 	},
 	{headerName: "회수송장번호", field: "wdInvoiceNo", width: 90, cellClass: 'text-center'}
 	{headerName: "회수송장번호", field: "wdInvoiceNo", width: 90, cellClass: 'text-center'}
 ];
 ];
-var gridOptionsOrderChangeInfo = orderAgGrid.getGridOptions(columnDefsOrderChangeInfo);
+var gridOptionsOrderChangeInfo = gagaAgGrid.getGridOptions(columnDefsOrderChangeInfo);
 
 
 // 7.환불정보
 // 7.환불정보
 var columnDefsRefundInfo = [
 var columnDefsRefundInfo = [
@@ -745,7 +803,7 @@ var columnDefsRefundInfo = [
 	},
 	},
 	{headerName: "환불처리자"		, field: "updNm"		, width: 120		, cellClass: 'text-center'}
 	{headerName: "환불처리자"		, field: "updNm"		, width: 120		, cellClass: 'text-center'}
 ];
 ];
-var gridOptionsRefundInfo = orderAgGrid.getGridOptions(columnDefsRefundInfo);
+var gridOptionsRefundInfo = gagaAgGrid.getGridOptions(columnDefsRefundInfo);
 
 
 // 8.상담내역
 // 8.상담내역
 var columnDefsOrderCounselInfo = [
 var columnDefsOrderCounselInfo = [
@@ -781,7 +839,7 @@ var columnDefsOrderCounselInfo = [
 	{headerName: "답변자"			, field: "ansNm"	, width: 80		, cellClass: 'text-center'},
 	{headerName: "답변자"			, field: "ansNm"	, width: 80		, cellClass: 'text-center'},
 	{headerName: "삭제여부"		, field: "delYn"	, width: 80		, cellClass: 'text-center'}
 	{headerName: "삭제여부"		, field: "delYn"	, width: 80		, cellClass: 'text-center'}
 ];
 ];
-var gridOptionsOrderCounselInfo = orderAgGrid.getGridOptions(columnDefsOrderCounselInfo);
+var gridOptionsOrderCounselInfo = gagaAgGrid.getGridOptions(columnDefsOrderCounselInfo);
 
 
 // 9.주문메모
 // 9.주문메모
 var columnDefsOrderMemoInfo = [
 var columnDefsOrderMemoInfo = [
@@ -821,7 +879,7 @@ var columnDefsOrderMemoInfo = [
 		}
 		}
 	},
 	},
 ];
 ];
-var gridOptionsOrderMemoInfo = orderAgGrid.getGridOptions(columnDefsOrderMemoInfo);
+var gridOptionsOrderMemoInfo = gagaAgGrid.getGridOptions(columnDefsOrderMemoInfo);
 </script>
 </script>
 
 
 <script>
 <script>
@@ -871,7 +929,7 @@ var fnOrderDetailClose = function(){
 $(document).ready(function () {
 $(document).ready(function () {
 	
 	
 	// 1. 그리드 그리기
 	// 1. 그리드 그리기
-	gagaAgGrid.createGrid('gridOrderInfo'					, gridOptionsOrderInfo);			// 기본정보
+	//gagaAgGrid.createGrid('gridOrderInfo'					, gridOptionsOrderInfo);			// 기본정보
 	gagaAgGrid.createGrid('gridOrderGoodsInfo'				, gridOptionsGoodsInfo);			// 상품정보
 	gagaAgGrid.createGrid('gridOrderGoodsInfo'				, gridOptionsGoodsInfo);			// 상품정보
 	gagaAgGrid.createGrid('gridOrderFreeGiftInfo'			, gridOptionsOrderFreeGiftInfo);	// 사은품정보
 	gagaAgGrid.createGrid('gridOrderFreeGiftInfo'			, gridOptionsOrderFreeGiftInfo);	// 사은품정보
 	gagaAgGrid.createGrid('gridDeliveryAddrInfo'			, gridOptionsDeliveryInfo);			// 배송정보
 	gagaAgGrid.createGrid('gridDeliveryAddrInfo'			, gridOptionsDeliveryInfo);			// 배송정보
@@ -883,7 +941,7 @@ $(document).ready(function () {
 	gagaAgGrid.createGrid('gridOrderMemoInfo'				, gridOptionsOrderMemoInfo);		// 관리자메모
 	gagaAgGrid.createGrid('gridOrderMemoInfo'				, gridOptionsOrderMemoInfo);		// 관리자메모
 	
 	
 	// 2. 그리드 데이터 바인딩
 	// 2. 그리드 데이터 바인딩
-	gridOptionsOrderInfo.api.setRowData(orderInfo);									// 기본정보
+	//gridOptionsOrderInfo.api.setRowData(orderInfo);								// 기본정보
 	gridOptionsGoodsInfo.api.setRowData(orderGoodsInfo);							// 상품정보
 	gridOptionsGoodsInfo.api.setRowData(orderGoodsInfo);							// 상품정보
 	gridOptionsOrderFreeGiftInfo.api.setRowData(orderFreeGiftInfo);					// 사은품품정보
 	gridOptionsOrderFreeGiftInfo.api.setRowData(orderFreeGiftInfo);					// 사은품품정보
 	gridOptionsDeliveryInfo.api.setRowData(orderDeliveryAddrInfo);					// 배송정보
 	gridOptionsDeliveryInfo.api.setRowData(orderDeliveryAddrInfo);					// 배송정보
@@ -894,6 +952,17 @@ $(document).ready(function () {
 	gridOptionsOrderCounselInfo.api.setRowData(orderCounselInfo);					// 상담내역
 	gridOptionsOrderCounselInfo.api.setRowData(orderCounselInfo);					// 상담내역
 	gridOptionsOrderMemoInfo.api.setRowData(orderAdminMemoInfo);					// 관리자메모
 	gridOptionsOrderMemoInfo.api.setRowData(orderAdminMemoInfo);					// 관리자메모
 	
 	
+	// 2.1 TOTAL ROWS 없애기
+	gagaAgGrid.hideStatusBar('gridOrderGoodsInfo');
+	gagaAgGrid.hideStatusBar('gridOrderFreeGiftInfo');
+	gagaAgGrid.hideStatusBar('gridDeliveryAddrInfo');
+	gagaAgGrid.hideStatusBar('gridPaymentInfo');
+	gagaAgGrid.hideStatusBar('gridDeliveryFeeInfo');
+	gagaAgGrid.hideStatusBar('gridOrderChangeInfo');
+	gagaAgGrid.hideStatusBar('gridOrderRefundInfo');
+	gagaAgGrid.hideStatusBar('gridOrderCounselInfo');
+	gagaAgGrid.hideStatusBar('gridOrderMemoInfo');
+	
 	// 3. 그리드 높이 설정
 	// 3. 그리드 높이 설정
 	fnSetGridHeightInit();
 	fnSetGridHeightInit();