반품TO반품 임시 커밋

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -916,7 +916,7 @@ public class TsfMypageController extends TsfBaseController {
 		orderChange.setIpAddress(TsfSession.getIpAddress());
 
 		// 2. 취소완료 처리
-		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, custNo);
+		GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, custNo);
 
 		// 3. 취소완료 카카오알림톡 발송
 		int ordChgSq = result.getInt("ordChgSq");

src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -568,8 +568,7 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		// 1. 취소완료 처리
 		orderChange.setCustNo(0);
-		// GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
-		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, 0);
+		GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
 
 		// 2. 취소완료 카카오알림톡 발송
 		int ordChgSq = result.getInt("ordChgSq");

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

@@ -484,6 +484,7 @@
 		data.addPayCost = addPayCost;
 		data.addPayAmt = 0;
 		data.cancelReqList = cancelReqList;
+		data.selfGoodsYn = oneData.selfGoodsYn;
 
 		let jsonData = JSON.stringify(data);
 

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

@@ -127,8 +127,8 @@
 														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, shipCompCd=${ordDtl.shipCompCd}, invoiceNo=${ordDtl.invoiceNo}" onclick="fnGoToDelivery(this, 'noMember');"><span>배송 조회</span></button></p>
 													</th:block>
 
-													<!-- 쇼핑백담기 버튼(구매확정) -->
-													<th:block th:if="${ordDtl.ordDtlStat == 'G013_70'}">
+													<!-- 쇼핑백담기 버튼(배송준비중, 구매확정) -->
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_40' or ordDtl.ordDtlStat == 'G013_70'}">
 														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>
 													</th:block>
 												</div>

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

@@ -431,8 +431,8 @@
 						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" shipCompCd="' + ordDtl.shipCompCd + '" invoiceNo="' + ordDtl.invoiceNo + '" onclick="fnGoToDelivery(this, \'noMember\');"><span>배송 조회</span></button></p>\n';
 					}
 
-					// 쇼핑백담기 버튼(구매확정)
-					if (ordDtl.ordDtlStat == 'G013_70') {
+					// 쇼핑백담기 버튼(배송준비중, 구매확정)
+					if (ordDtl.ordDtlStat == 'G013_40' || ordDtl.ordDtlStat == 'G013_70') {
 						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>\n';
 					}