교환배송 미출고 취소 개발중

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

@@ -207,6 +207,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		map.set("payMeans"					, refundPreInfo.getString("payMeans"));		// 결제수단
 		map.set("pgGb"						, refundPreInfo.getString("pgGb"));			// PG구분
 		map.set("cashAuthNo"				, refundPreInfo.getString("cashAuthNo"));	// 현금영수증 승인번호'
+		map.set("chgStat"					, cnclReq.getChgStat());					// 변경상태
 
 		// 4. 부분취소 처리 2021.05.13
 		// 2021.06.09 취소접수

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

@@ -1203,7 +1203,6 @@
 		ON     EDF.ORD_NO = O.ORD_NO
 		WHERE  1=1
 		AND    EDF.DEL_YN = 'N'
-		AND    EDF.CNCL_RTN_QTY > 0
 		<if test='ordNm != null and ordNm != ""'>
 		AND    O.ORD_NM = #{ordNm}
 		</if>
@@ -1213,6 +1212,9 @@
 		<if test='delvCnclYn != null and delvCnclYn != ""'>
 		AND    EDF.DELV_CNCL_YN = #{delvCnclYn}
 		</if>
+		<if test="stDate != null and stDate != '' and edDate != null and edDate != ''">
+		AND    EDF.REG_DT BETWEEN STR_TO_DATE(CONCAT(#{stDate},' 000000'),'%Y-%m-%d %H%i%S') AND STR_TO_DATE(CONCAT(#{edDate},' 235959'), '%Y-%m-%d %H%i%S')
+		</if>
 		ORDER  BY EDF.REG_DT ASC
 	</select>
 		

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

@@ -58,7 +58,7 @@
 								<input type="text" class="w40p" name="ordNo" placeholder="" maxlength="20" data-valid-type="numeric"/>
 							</td>
 							<th class="dashR">처리상태</th>
-							<td class="dashR">
+							<td class="dashR" colspan="2">
 								<select name="delvCnclYn" id="delvCnclYn">
 									<option value="">전체</option>
 									<option value="N" selected>대기</option>
@@ -68,7 +68,7 @@
 						</tr>
 						<tr>
 							<th class="dashR">등록일</th>
-							<td colspan="4" class="dashR">
+							<td colspan="6" class="dashR">
 								<span id="terms"></span>
 							</td>
 						</tr>

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

@@ -28,6 +28,63 @@
 				<input type="hidden" name="chgReason" 		value=""/>
 				<input type="hidden" name="chgReasonDesc" 	value=""/>
 				
+				<div id="orderInfoList" style="display:none;">
+					<h4>기본정보</h4>
+					<!-- 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="${orderInfoList[0].siteCdNm}"></td>
+								<td th:text="${orderInfoList[0].mallGbNm}"></td>
+								<td th:text="${orderInfoList[0].frontGbNm}"></td>
+								<td th:text="${orderInfoList[0].extmallNm}"></td>
+								<td th:text="${orderInfoList[0].ordDt}"></td>
+								<td th:text="${orderInfoList[0].ordNm}"></td>
+								<td th:text="${orderInfoList[0].custNo}"></td>
+								<td th:text="${orderInfoList[0].ordNo}"></td>
+								<td th:text="${orderInfoList[0].ordEmail}"></td>
+								<td th:text="${orderInfoList[0].ordPhnno}"></td>
+								<td th:text="${orderInfoList[0].custGbNm}"></td>
+								<td th:text="${orderInfoList[0].managedRsnNm}"></td>
+								<td th:text="${orderInfoList[0].custGradeNm}"></td>
+							</tr>
+						</tbody>
+					</table>
+					<!-- //TABLE -->
+				</div>
+				
 				<h4>주문정보</h4>
 				<div id="gridOrderCancelRequestList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
 
@@ -190,6 +247,11 @@ if (ordChgSq > 0 && chgStat != 'G685_40') {
 	chgMemo						= orderChangeDetailList[0].chgMemo;				// 변경사유메모
 }
 
+// 교환배송미출고대상
+if (ordChgSq > 0 && chgStat == 'G685_40') {
+	$("#orderInfoList").show();
+}
+
 var temp1 = true;
 var temp2 = false;
 var temp3 = true;
@@ -1058,6 +1120,7 @@ var fnCnclReq = function (reqGbn) {
 		,"ordNm"					: ordNm
 		,"ordPhnno"					: ordPhnno
 		,"delvFeeCd"				: delvFeeCd
+		,"chgStat"					: chgStat
 	}
 
 	// 주문번호, 취소사유, 취소메모, (취소, 반품, 교환 신청 정보 목록), 환불계좌