Merge remote-tracking branch 'TSIT/ST24PRJ-333(무료배송)' into develop

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

@@ -85,10 +85,7 @@
 		            , FN_GET_CODE_NM('G056', G.GOODS_TYPE) AS GOODS_TYPE_NM
 		            , I.CUST_NO
 		            , O.DELV_FEE_CD
-		            , CASE WHEN G.SELF_GOODS_YN = 'Y'
-		                   THEN 'WMS'
-		                   ELSE O.DELV_FEE_CD
-		                   END  DELV_FEE_CD_GRP
+		            , O.DELV_FEE_CD AS DELV_FEE_CD_GRP
 		            , D.CHG_GB
 		            , C.CHG_STAT
 		         FROM TB_WITHDRAW A
@@ -803,10 +800,7 @@
 		                     , O.ORD_EMAIL                              -- 주문자이메일
 		                     , OD.DELV_FEE_CD
 		                     , O.CUST_NO
-		                     , CASE WHEN G.SELF_GOODS_YN = 'Y'
-		                            THEN 'WMS'
-		                            ELSE OD.DELV_FEE_CD
-		                            END  DELV_FEE_CD_GRP
+		                     , OD.DELV_FEE_CD AS DELV_FEE_CD_GRP
 		                     , O.MALL_GB
 		                     , (SELECT EXTMALL_NM
 		                        FROM   TB_EXTMALL X

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

@@ -47,7 +47,6 @@
 					</colgroup>
 					<thead>
 						<tr>
-<!-- 							<th>사이트</th> -->
 							<th>몰구분</th>
 							<th>웹구분</th>
 							<th>제휴몰</th>
@@ -59,14 +58,11 @@
 							<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>
@@ -87,8 +83,6 @@
 								</th:block>
 							</td>
 							<td th:text="${not #strings.isEmpty(orderInfo[0].npayOrdNo) ? 'Y' : 'N'}"></td>
-<!-- 							<td th:text="${orderInfo[0].custGbNm}"></td> -->
-<!-- 							<td th:text="${orderInfo[0].managedRsnNm}"></td> -->
 							<td th:text="${orderInfo[0].custGradeNm}"></td>
 						</tr>
 					</tbody>
@@ -200,108 +194,6 @@
 						</tr>
 					</tbody>
 				</table>
-<!-- 				<table class="frmStyle"> -->
-<!-- 					<colgroup> -->
-<!-- 						<col width=""> -->
-<!-- 						<col width=""> -->
-<!-- 						<col width=""> -->
-<!-- 						<col width=""> -->
-<!-- 					</colgroup> -->
-<!-- 					<thead> -->
-<!-- 						<tr> -->
-<!-- 							<th style="height:30px;">구분</th> -->
-<!-- 							<th style="height:30px;">항목</th> -->
-<!-- 							<th style="height:30px;">합계</th> -->
-<!-- 							<th style="height:30px;">내역</th> -->
-<!-- 						</tr> -->
-<!-- 					</thead> -->
-<!-- 					<tbody> -->
-<!-- 						<tr> -->
-<!-- 							<td style="height:25px;">상품금액</td> -->
-<!-- 							<td>총상품금액</td> -->
-<!-- 							<td class="listSumAmt">15,000원</td> -->
-<!-- 							<td></td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td style="height:25px;">배송비</td> -->
-<!-- 							<td>배송비합계</td> -->
-<!-- 							<td class="realDelvSumAmt">15,000원</td> -->
-<!-- 							<td style="line-height:25px;"> -->
-<!-- 								<div style="height:25px;"><span>배송비 : </span><span class="delvSumAmt">-60,000원</span></div> -->
-<!-- 								<div style="height:25px;"><span>배송비쿠폰 : </span><span class="delvCpnDcAmt">-60,000원</span></div> -->
-<!-- 							</td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td style="height:25px;">상품할인</td> -->
-<!-- 							<td>총상품할인금액</td> -->
-<!-- 							<td class="goodsDcSumAmt">15,000원</td> -->
-<!-- 							<td></td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td rowspan="4">할인내역</td> -->
-<!-- 							<td>즉시할인</td> -->
-<!-- 							<td class="cpn1DcSumAmt">-60,000원</td> -->
-<!-- 							<td></td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td>다다익선할인</td> -->
-<!-- 							<td class="tmtbDcSumAmt">-60,000원</td> -->
-<!-- 							<td style="line-height:25px;"> -->
-<!-- 								<div style="height:25px;"><span>수량할인금액 : </span><span class="tmtb1DcSumAmt">-60,000원</span></div> -->
-<!-- 								<div style="height:25px;"><span>금액할인금액 : </span><span class="tmtb2DcSumAmt">-60,000원</span></div> -->
-<!-- 							</td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td>쿠폰할인</td> -->
-<!-- 							<td class="cpnDcSumAmt">-60,000원</td> -->
-<!-- 							<td style="line-height:25px;"> -->
-<!-- 								<div style="height:25px;"><span>주문서상품쿠폰 : </span><span class="goodsCpnDcSumAmt">-60,000원</span></div> -->
-<!-- 								<div style="height:25px;"><span>장바구니쿠폰 : </span><span class="cartCpnDcSumAmt">-60,000원</span></div> -->
-<!-- 							</td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td>선포인트할인</td> -->
-<!-- 							<td class="prePntDcSumAmt">-60,000원</td> -->
-<!-- 							<td></td> -->
-<!-- 						</tr> -->
-						
-						
-<!-- 						<tr> -->
-<!-- 							<td rowspan="5">총결제금액</td> -->
-<!-- 							<td style="height:25px;">총 매출액</td> -->
-<!-- 							<td class="totalPayAmt">70,000원</td> -->
-<!-- 							<td class="savePntSumAmt">15,000P 적립</td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td style="height:25px;">실결제액</td> -->
-<!-- 							<td class="realOrdSumAmt">70,000원</td> -->
-<!-- 							<td> -->
-<!-- 								<span class="pgGbNm">신용카드</span><span class="cardNm">(현대)</span> -->
-<!-- 							</td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td style="line-height:25px;"> -->
-<!-- 								<div style="height:25px;">제휴할인결제액</div> -->
-<!-- 								<div style="height:25px;">(KCP쿠폰+포인트)</div> -->
-<!-- 							</td> -->
-<!-- 							<td class="pgDcSumAmt">70,000원</td> -->
-<!-- 							<td style="line-height:25px;"> -->
-<!-- 								<div style="height:25px;"><span>제휴쿠폰 : </span><span class="allianceDcAmt">-60,000원</span></div> -->
-<!-- 								<div style="height:25px;"><span>마일리지 : </span><span class="mileageDcAmt">-60,000원</span></div> -->
-<!-- 							</td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td style="height:25px;">포인트 결제액</td> -->
-<!-- 							<td class="pntDcSumAmt">70,000P</td> -->
-<!-- 							<td></td> -->
-<!-- 						</tr> -->
-<!-- 						<tr> -->
-<!-- 							<td style="height:25px;">상품권 결제액</td> -->
-<!-- 							<td class="gfcdUseSumAmt">70,000원</td> -->
-<!-- 							<td></td> -->
-<!-- 						</tr> -->
-<!-- 					</tbody> -->
-<!-- 				</table> -->
 				
 				<h4>주문상품정보</h4>
 				<button type="button" class="btn btnRight btn-base btn-sm" id="btnAllCncl" style="margin-left:10px;" >입금대기전체취소</button>
@@ -419,7 +311,7 @@ var columnDefsGoodsInfo = [
 					return option;
 				}
 			},
-			{ headerName: "배송구분", field: "shotDelvGb", width: 80, cellClass: 'text-center' },
+			{ headerName: "배송구분"	, field: "shotDelvGb"	, width: 80, cellClass: 'text-center' },
 			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 80, cellClass: 'text-center'},
 			{headerName: "옵션1"		, field: "colorNm"		, width: 60, cellClass: 'text-center'},
 			{headerName: "옵션2"		, field: "optCd2"		, width: 60, cellClass: 'text-center'},