결함 #997 [FRONT] 마이페지이 클레임 목록 품절취소 표기 처리 커밋

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

@@ -473,6 +473,7 @@
 		     , Z.CHG_ORD_DTL_NO
 		     , Z.CHG_STAT
 		     , Z.CHG_STAT_NM
+		     , Z.CHG_REASON
 		     , Z.ORD_NO
 		     , Z.ORD_DTL_NO
 		     , Z.GOODS_CD
@@ -497,6 +498,7 @@
 		             , OCD.CHG_ORD_DTL_NO
 		             , OCD.CHG_STAT
 		             , FN_GET_CODE_NM('G685', OCD.CHG_STAT)                             AS CHG_STAT_NM
+		             , OC.CHG_REASON
 		             , OD.ORD_NO
 		             , OCD.ORD_DTL_NO
 		             , G1.GOODS_CD
@@ -630,8 +632,9 @@
 			</choose>
 		</if>
 		  ) Z
-		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_ORD_DTL_NO, Z.CHG_STAT, Z.CHG_STAT_NM, Z.ORD_NO, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM
-		        , Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM, Z.GOODS_TYPE, Z.LIST_PRICE, Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.GIFT_ADDR_INP_YN, Z.GIFT_CANCEL_DAY, Z.REFUND_AMT
+		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_ORD_DTL_NO, Z.CHG_STAT, Z.CHG_STAT_NM, Z.CHG_REASON
+		        , Z.ORD_NO, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM, Z.GOODS_TYPE, Z.LIST_PRICE
+		        , Z.ADD_PAY_COST, Z.SYS_IMG_NM, Z.GIFT_PACK_YN, Z.GIFT_ADDR_INP_YN, Z.GIFT_CANCEL_DAY, Z.REFUND_AMT
 		 ORDER BY Z.ORD_CHG_SQ DESC
 	</select>
 

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreCancelDetailFormMob.html

@@ -42,7 +42,8 @@
 							<!-- 2021.07.01 선물하기 기간완료 처리 -->
 							<th:block th:if="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}">
 								<p class="dlvr_staus"	th:if="${cancelDtl.giftPackYn == 'Y' and cancelDtl.giftAddrInpYn == 'N' and cancelDtl.giftCancelDay >= 3}">선물취소</p>
-								<p class="dlvr_staus"	th:unless="${cancelDtl.giftPackYn == 'Y' and cancelDtl.giftAddrInpYn == 'N' and cancelDtl.giftCancelDay >= 3}">주문취소</p>
+								<p class="dlvr_staus"	th:if="${cancelDtl.giftPackYn != 'Y' and cancelDtl.chgReason == 'G686_30'}">품절취소</p>
+								<p class="dlvr_staus"	th:if="${cancelDtl.giftPackYn != 'Y' and cancelDtl.chgReason != 'G686_30'}">주문취소</p>
 							</th:block>
 							<p class="dlvr_staus" 	th:unless="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}" th:text="${cancelDtl.chgStatNm}"></p>
 							<p class="dlvr_desc" 	th:text="|${cancelDtl.chgDate} ${cancelDtl.chgTime}|"></p>

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListInfoMob.html

@@ -23,7 +23,8 @@
 							<th:block th:if="${cre.chgStat == 'G685_17' or cre.chgStat == 'G685_18'}">
 								<!-- 2021.07.01 선물하기 기간완료 처리 -->
 								<p class="dlvr_staus" th:if="${cre.giftPackYn == 'Y' and cre.giftAddrInpYn == 'N' and cre.giftCancelDay >= 3}">선물취소</p>
-								<p class="dlvr_staus" th:unless="${cre.giftPackYn == 'Y' and cre.giftAddrInpYn == 'N' and cre.giftCancelDay >= 3}">주문취소</p>
+								<p class="dlvr_staus" th:if="${cre.giftPackYn != 'Y' and cre.chgReason == 'G686_30'}">품절취소</p>
+								<p class="dlvr_staus" th:if="${cre.giftPackYn != 'Y' and cre.chgReason != 'G686_30'}">주문취소</p>
 							</th:block>
 							<th:block th:if="${cre.chgStat == 'G685_40'}" th:each="exchange, index : ${creList.exchangeOptionList}">
 								<p class="dlvr_staus" th:if="${cre.chgOrdDtlNo == exchange.ordDtlNo && (exchange.ordDtlStat == 'G013_20' or exchange.ordDtlStat == 'G013_30' or exchange.ordDtlStat == 'G013_35' or exchange.ordDtlStat == 'G013_40' or exchange.ordDtlStat == 'G013_50')}">교환진행중</p>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreCancelDetailFormMob.html

@@ -34,7 +34,10 @@
 				<th:block th:if="${cancelDetailList.cancelDetailList}" th:each="cancelDtl, status : ${cancelDetailList.cancelDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 					<div class="goods_section">
 						<div class="goods_status">
-							<p class="dlvr_staus" 	th:if="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}">주문취소</p>
+							<th:block th:if="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}">
+								<p class="dlvr_staus" 	th:if="${cancelDtl.chgReason == 'G686_30'}">품절취소</p>
+								<p class="dlvr_staus" 	th:unless="${cancelDtl.chgReason == 'G686_30'}">주문취소</p>
+							</th:block>
 							<p class="dlvr_staus" 	th:unless="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}" th:text="${cancelDtl.chgStatNm}"></p>
 							<p class="dlvr_desc" 	th:text="|${cancelDtl.chgDate} ${cancelDtl.chgTime}|"></p>
 						</div>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListInfoMob.html

@@ -13,7 +13,10 @@
 					<div class="goods_section">
 						<div class="goods_status">
 							<!-- 상태값 처리 -->
-							<p class="dlvr_staus" th:if="${cre.chgStat == 'G685_17' or cre.chgStat == 'G685_18'}">주문취소</p>
+							<th:block th:if="${cre.chgStat == 'G685_17' or cre.chgStat == 'G685_18'}">
+								<p class="dlvr_staus" th:if="${cre.chgReason == 'G686_30'}">품절취소</p>
+								<p class="dlvr_staus" th:unless="${cre.chgReason == 'G686_30'}">주문취소</p>
+							</th:block>
 							<th:block th:if="${cre.chgStat == 'G685_40'}" th:each="exchange, index : ${creList.exchangeOptionList}">
 								<p class="dlvr_staus" th:if="${cre.chgOrdDtlNo == exchange.ordDtlNo && (exchange.ordDtlStat == 'G013_20' or exchange.ordDtlStat == 'G013_30' or exchange.ordDtlStat == 'G013_35' or exchange.ordDtlStat == 'G013_40' or exchange.ordDtlStat == 'G013_50')}">교환진행중</p>
 								<p class="dlvr_staus" th:if="${cre.chgOrdDtlNo == exchange.ordDtlNo && (exchange.ordDtlStat == 'G013_60' or exchange.ordDtlStat == 'G013_70')}">교환완료</p>

src/main/webapp/WEB-INF/views/web/mypage/MypageCreCancelDetailFormWeb.html

@@ -81,7 +81,8 @@
 											<p>
 												<th:block th:if="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}">
 													<th:block th:if="${cancelDtl.giftPackYn == 'Y' and cancelDtl.giftAddrInpYn == 'N' && cancelDtl.giftCancelDay >= 3}" th:text="|선물취소|"></th:block>
-													<th:block th:unless="${cancelDtl.giftPackYn == 'Y' and cancelDtl.giftAddrInpYn == 'N' && cancelDtl.giftCancelDay >= 3}" th:text="|주문취소|"></th:block>
+													<th:block th:if="${cancelDtl.giftPackYn != 'Y' and cancelDtl.chgReason == 'G686_30'}" th:text="|품절취소|"></th:block>
+													<th:block th:if="${cancelDtl.giftPackYn != 'Y' and cancelDtl.chgReason != 'G686_30'}" th:text="|주문취소|"></th:block>
 												</th:block>
 												<th:block th:unless="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}" th:text="${cancelDtl.chgStatNm}"></th:block>
 												<span class="date" th:text="${cancelDtl.chgDate}"></span>

src/main/webapp/WEB-INF/views/web/mypage/MypageCreListFormWeb.html

@@ -434,6 +434,9 @@
 						// 2021.07.01 선물하기 기간완료 처리
 						if (cre.giftPackYn == 'Y' && cre.giftAddrInpYn == 'N' && cre.giftCancelDay >= 3) {
 							tag += '												선물취소\n';
+						}
+						else if (cre.chgReason == 'G686_30') {
+							tag += '												품절취소\n';
 						} else {
 							tag += '												주문취소\n';
 						}

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreCancelDetailFormWeb.html

@@ -48,7 +48,7 @@
 									<div class="order_desc">
 										<div class="goods_box">
 											<div class="gd_item">
-												<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}, optCd1=${cancelDtl.goodsType == 'G056_N' ? cancel.cancelDtl : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
+												<a href="javascript:void(0)" th:attr="goodsCd=${cancelDtl.goodsCd}, optCd1=${cancelDtl.goodsType == 'G056_N' ? cancelDtl.optCd1 : ''}, ithrCd='IN21_02'" onclick="fnGoToGoodsDetail(this)">
 													<span class="thumb">
 														<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm + '?RS=100'}" width="100%" alt="">
 													</span>
@@ -82,7 +82,10 @@
 										</div>
 										<div class="status_box">
 											<p>
-												<th:block th:if="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}" th:text="|주문취소|"></th:block>
+												<th:block th:if="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}">
+													<th:block th:if="${cancelDtl.chgReason == 'G686_30'}" th:text="|품절취소|"></th:block>
+													<th:block th:unless="${cancelDtl.chgReason == 'G686_30'}" th:text="|주문취소|"></th:block>
+												</th:block>
 												<th:block th:unless="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}" th:text="${cancelDtl.chgStatNm}"></th:block>
 												<span class="date" th:text="${cancelDtl.chgDate}"></span>
 												<span class="time" th:text="${cancelDtl.chgTime}"></span>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreListFormWeb.html

@@ -422,7 +422,11 @@
 					tag += '										<div class="status_box">\n';
 					tag += '											<p>\n';
 					if (cre.chgStat == 'G685_17' || cre.chgStat == 'G685_18') {
-						tag += '												주문취소\n';
+						if (cre.chgReason == 'G686_30') {
+							tag += '												품절취소\n';
+						} else {
+							tag += '												주문취소\n';
+						}
 					} else if (cre.chgStat == 'G685_40') {
 						$.each(creList.exchangeOptionList, function(index, exchange) {
 							if (cre.chgOrdDtlNo == exchange.ordDtlNo && (exchange.ordDtlStat == 'G013_20' || exchange.ordDtlStat == 'G013_30' || exchange.ordDtlStat == 'G013_35' || exchange.ordDtlStat == 'G013_40' || exchange.ordDtlStat == 'G013_50')) {