마이페이지 수정 임시 커밋

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -111,6 +111,7 @@ public class TsfOrderService {
 		Collection<Order> ordDtlList = new ArrayList<>();
 		String allCanYn = "Y";
 		String allDecideYn = "Y";
+		String canChgAddr = "Y";
 		int ordNo = 0;
 		int index = 0;
 		int ordReqChgQty = 0;
@@ -132,7 +133,7 @@ public class TsfOrderService {
 
 			// 주문 목록 데이터 설정
 			if (index > 0 && ordNo != tmpOrder.getOrdNo()) {
-				orderList.add(setOrderMap(ordDtlList, allCanYn, allDecideYn, ordReqChgQty));
+				orderList.add(setOrderMap(ordDtlList, allCanYn, allDecideYn, ordReqChgQty, canChgAddr));
 
 				ordDtlList = new ArrayList<>();
 				ordDtlList.add(tmpOrder);
@@ -163,19 +164,26 @@ public class TsfOrderService {
 				&& (!TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value().equals(tmpOrder.getOrdDtlStat()) || ordReqChgQty > 0)) {
 				allDecideYn = "N";
 			}
+			
+			// 배송지 수정 가능 여부 설정
+			if ("Y".equals(canChgAddr)
+				&& !TscConstants.OrderDetailStat.DEPOSIT_WAIT.value().equals(tmpOrder.getOrdDtlStat())
+				&& !TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value().equals(tmpOrder.getOrdDtlStat())) {
+				canChgAddr = "N";
+			}
 
 			ordNo = tmpOrder.getOrdNo();
 			index++;
 		}
 
 		if (ordDtlList.size() > 0) {
-			orderList.add(setOrderMap(ordDtlList, allCanYn, allDecideYn, ordReqChgQty));
+			orderList.add(setOrderMap(ordDtlList, allCanYn, allDecideYn, ordReqChgQty, canChgAddr));
 		}
 		
 		return orderList;
 	}
 	
-	private GagaMap setOrderMap(Collection<Order> ordDtlList, String allCanYn, String allDecideYn, int ordReqChgQty) {
+	private GagaMap setOrderMap(Collection<Order> ordDtlList, String allCanYn, String allDecideYn, int ordReqChgQty, String canChgAddr) {
 		Order order = ordDtlList.iterator().next();
 
 		GagaMap map = new GagaMap();
@@ -188,6 +196,7 @@ public class TsfOrderService {
 		map.set("ordReqChgQty", ordReqChgQty);
 		map.set("oneData", order);
 		map.set("ordDtlList", ordDtlList);
+		map.set("canChgAddr", canChgAddr);
 
 		return map;
 	}

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

@@ -21,6 +21,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.rest.server.GagaResponseStatus;
+import com.gagaframework.web.util.GagaCookieUtil;
 import com.style24.core.biz.service.TscCouponService;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscEnvsetService;
@@ -70,11 +74,6 @@ import com.style24.persistence.domain.WishList;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.rest.server.GagaResponse;
-import com.gagaframework.web.rest.server.GagaResponseStatus;
-import com.gagaframework.web.util.GagaCookieUtil;
-
 /**
  * 마이페이지 Controller
  * 
@@ -167,6 +166,9 @@ public class TsfMypageController extends TsfBaseController {
 	@Autowired
 	private TsfLoginService loginService;
 
+	@Autowired
+	private TscEnvsetService coreEnvsetService;
+
 	/**
 	 * 마이페이지 메인 화면
 	 *
@@ -267,6 +269,7 @@ public class TsfMypageController extends TsfBaseController {
 		Order order = new Order();
 		order.setCustNo(custNo);
 		order.setOrdNo(ordNo);
+		order.setAutoDecideDay(coreEnvsetService.getAutoBuyConfirmDays(TscConstants.Site.STYLE24.value()));
 
 		// 주문목록 조회
 		Collection<GagaMap> orderList = orderService.getOrderListForMypage(order);
@@ -280,6 +283,7 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("oneData", orderList.iterator().next().get("oneData"));
 		mav.addObject("allCanYn", orderList.iterator().next().get("allCanYn"));
 		mav.addObject("allDecideYn", orderList.iterator().next().get("allDecideYn"));
+		mav.addObject("canChgAddr", orderList.iterator().next().get("canChgAddr"));
 
 		// 주문정보 조회
 		mav.addObject("orderInfo", coreOrderService.getOrderInfoList(order).iterator().next());
@@ -338,6 +342,7 @@ public class TsfMypageController extends TsfBaseController {
 
 		if (ordNoList.size() > 0) {
 			order.setOrdNoList(ordNoList.stream().mapToInt(Integer::intValue).toArray());
+			order.setAutoDecideDay(coreEnvsetService.getAutoBuyConfirmDays(TscConstants.Site.STYLE24.value()));
 			map.set("orderList", orderService.getOrderListForMypage(order));
 		}
 
@@ -1447,6 +1452,7 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("isLogin", TsfSession.isLogin());
 
 		// 주문목록 조회
+		order.setAutoDecideDay(coreEnvsetService.getAutoBuyConfirmDays(TscConstants.Site.STYLE24.value()));
 		Collection<GagaMap> orderList = orderService.getOrderListForMypage(order);
 
 		if (orderList.size() == 0) {
@@ -2443,7 +2449,8 @@ public class TsfMypageController extends TsfBaseController {
 		if (ordNoList.size() > 0) {
 			order.setOrdNoList(ordNoList.stream().mapToInt(Integer::intValue).toArray());
 		}
-		
+
+		order.setAutoDecideDay(coreEnvsetService.getAutoBuyConfirmDays(TscConstants.Site.STYLE24.value()));
 		Collection<GagaMap> orderList = orderService.getOrderListForMypage(order);
 				
 		mav.addObject("orderList"		, 	orderList);
@@ -2475,6 +2482,8 @@ public class TsfMypageController extends TsfBaseController {
 		pageable.setTotalCount(orderService.getPagingOrdNoListCount(order));
 		order.setPageable(pageable);
 
+		order.setAutoDecideDay(coreEnvsetService.getAutoBuyConfirmDays(TscConstants.Site.STYLE24.value()));
+
 		result.set("paging"		, order);
 		result.set("totalCnt"	, totalCnt);
 		result.set("endRow"		, pageable.getEndRow());
@@ -2526,8 +2535,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 주문목록조회
 		ModelAndView mav = new ModelAndView();
 
+		order.setAutoDecideDay(coreEnvsetService.getAutoBuyConfirmDays(TscConstants.Site.STYLE24.value()));
 		Collection<GagaMap> orderList = orderService.getOrderListForMypage(order);
-		
+
 		mav.addObject("orderList"		, 	orderList);
 		mav.addObject("orderListCnt"	, 	orderList.size());
 		mav.addObject("pageNo"			, 	order.getPageNo());

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

@@ -224,6 +224,7 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("orderList", orderList);
 		mav.addObject("oneData", orderList.iterator().next().get("oneData"));
 		mav.addObject("allCanYn", orderList.iterator().next().get("allCanYn"));
+		mav.addObject("canChgAddr", orderList.iterator().next().get("canChgAddr"));
 
 		// 주문정보 조회
 		mav.addObject("orderInfo", coreOrderService.getOrderInfoList(order).iterator().next());

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

@@ -29,6 +29,7 @@
 		     , Z.GIFT_COMPLETE_DT
 		     , Z.GIFT_ADDR_INP_YN
 		     , Z.DELV_EDDT
+		     , Z.AUTO_DECIDE_LEFT_DAY
 		     , Z.ORD_DTL_NO
 		     , Z.ORD_EXCH_GB
 		     , Z.GOODS_CD
@@ -78,6 +79,7 @@
 		             , CASE OD.GIFT_PACK_YN WHEN 'Y' THEN DATE_FORMAT(DA.UPD_DT, '%Y.%m.%d')
 		                END                                                             AS GIFT_COMPLETE_DT
 		             , DATE_FORMAT(OD.DELV_EDDT, '%m/%d')                               AS DELV_EDDT
+		             , DATEDIFF(OD.DELV_EDDT + INTERVAL #{autoDecideDay} DAY, NOW())    AS AUTO_DECIDE_LEFT_DAY
 		             , OD.ORD_DTL_NO
 		             , OD.ORD_EXCH_GB
 		             , OD.GOODS_CD
@@ -223,9 +225,9 @@
 		   AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
 		</where>
 				) Z
-		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.GIFT_LIMIT_DT, Z.GIFT_LIMIT_DAY, Z.GIFT_COMPLETE_DT, GIFT_ADDR_INP_YN, Z.DELV_EDDT, Z.ORD_DTL_NO, Z.ORD_EXCH_GB
-		        , Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM, Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT
-		        , Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.SHIP_COMP_CD, Z.GIFT_PACK_YN, Z.SHIP_COMP_NM, Z.INVOICE_NO
+		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.GIFT_LIMIT_DT, Z.GIFT_LIMIT_DAY, Z.GIFT_COMPLETE_DT, GIFT_ADDR_INP_YN, Z.DELV_EDDT, Z.AUTO_DECIDE_LEFT_DAY
+		        , Z.ORD_DTL_NO, Z.ORD_EXCH_GB, Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM, Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT
+		        , Z.REAL_ORD_AMT, Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.SHIP_COMP_CD, Z.GIFT_PACK_YN, Z.SHIP_COMP_NM, Z.INVOICE_NO
 		        , Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.ORD_DTL_STAT_NM, Z.REVIEW_SQ
 		        , Z.REVIEWABLE_YN, Z.PURCHASE_CONFIRM_DAY, Z.DELV_RES_DT, Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.BANK_CD, Z.ACCOUNT_NO, Z.ACCOUNT_NM
 		        , Z.DELV_ADDR_SQ, Z.RECIP_NM, Z.PAY_STAT

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

@@ -198,7 +198,7 @@
 			<div class="tbl_wrap">
 				<div class="tbl_tit"> 
 					<h3>교환 상품 배송지</h3>
-					<th:block th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35' or oneData.chgOrdDtlStat == 'G013_40'}">
+					<th:block th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25'}">
 						<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeAddr('recip');">
 							<span>배송지 변경</span>
 						</button>

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

@@ -430,7 +430,7 @@
 								<!-- 배송완료 -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
 									<div class="goods_txt">
-										<p class="cf_txt cf_desc">15일 후 자동으로 구매확정됩니다.</p>
+										<p class="cf_txt cf_desc" th:text="|${ordDtl.autoDecideLeftDay}일 후 자동으로 구매확정됩니다.|"></p>
 									</div>
 								</th:block>
 								<!-- //배송완료 -->
@@ -605,7 +605,7 @@
 							<div class="fold_cont">
 								<div class="ship_info ship_edit">
 									<!--  배송비정보변경가능 -->
-									<th:block th:if="${allCanYn == 'Y'}">
+									<th:block th:if="${canChgAddr == 'Y'}">
 										<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeDeliveryAddr();">
 											<span>배송지 변경</span>
 										</button>

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

@@ -452,7 +452,7 @@
 							<!-- 배송완료 -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
 								<div class="goods_txt">
-									<p class="cf_txt cf_desc">15일 후 자동으로 구매확정됩니다.</p>
+									<p class="cf_txt cf_desc" th:text="|${ordDtl.autoDecideLeftDay}일 후 자동으로 구매확정됩니다.|"></p>
 								</div>
 							</th:block>
 							<!-- //배송완료 -->

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

@@ -194,7 +194,7 @@
 			<div class="tbl_wrap">
 				<div class="tbl_tit"> 
 					<h3>교환 상품 배송지</h3>
-					<th:block th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35' or oneData.chgOrdDtlStat == 'G013_40'}">
+					<th:block th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25'}">
 						<button type="button" class="btn_popup" onclick="fnChangeAddr('recip');">
 							<span>배송지 변경</span>
 						</button>

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

@@ -241,7 +241,7 @@
 							<!-- 배송완료 -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
 								<div class="goods_txt">
-									<p class="cf_txt cf_desc">15일 후 자동으로 구매확정됩니다.</p>
+									<p class="cf_txt cf_desc" th:text="|${ordDtl.autoDecideLeftDay}일 후 자동으로 구매확정됩니다.|"></p>
 								</div>
 							</th:block>
 							<!-- //배송완료 -->

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

@@ -313,7 +313,7 @@
 								<!-- 배송완료 -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
 									<div class="goods_txt">
-										<p class="cf_txt cf_desc">15일 후 자동으로 구매확정됩니다.</p>
+										<p class="cf_txt cf_desc" th:text="|${ordDtl.autoDecideLeftDay}일 후 자동으로 구매확정됩니다.|"></p>
 									</div>
 								</th:block>
 								<!-- //배송완료 -->
@@ -457,7 +457,7 @@
 							<div class="fold_cont">
 								<div class="ship_info ship_edit">
 									<!--  배송비정보변경가능 -->
-									<th:block th:if="${allCanYn == 'Y'}">
+									<th:block th:if="${canChgAddr == 'Y'}">
 										<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeDeliveryAddr();">
 											<span>배송지 변경</span>
 										</button>

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

@@ -253,7 +253,7 @@
 						<!-- 배송완료 -->
 						<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc">15일 후 자동으로 구매확정됩니다.</p>
+								<p class="cf_txt cf_desc" th:text="|${ordDtl.autoDecideLeftDay}일 후 자동으로 구매확정됩니다.|"></p>
 							</div>
 						</th:block>
 						<!-- //배송완료 -->

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

@@ -165,11 +165,11 @@
 												</li>
 												<li>
 													<span id="recipAddr" th:text="|${oneData.recipBaseAddr} ${oneData.recipDtlAddr}|"></span>
-													<button type="button" class="btn btn_default btn_sm" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35'}" onclick="fnChangeAddr('recip');"><span>배송지 변경</span></button>
+													<button type="button" class="btn btn_default btn_sm" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25'}" onclick="fnChangeAddr('recip');"><span>배송지 변경</span></button>
 												</li>
 												<li>
 													배송요청 사항&nbsp;:&nbsp;<span id="delvMemo" th:text="${oneData.delvMemo}">직접 받고 부재 시 문 앞</span>
-													<button type="button" class="btn_underline" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35'}" onclick="fnChangeMemo('recip')"><span>변경하기</span></button>
+													<button type="button" class="btn_underline" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25'}" onclick="fnChangeMemo('recip')"><span>변경하기</span></button>
 												</li>
 											</ul>
 										</div>

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

@@ -259,7 +259,7 @@
 													<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
 													<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
 													<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
-													<p th:if="${ordDtl.ordDtlStat == 'G013_60'}">15일 후 자동으로 구매확정됩니다.</p>
+													<p th:if="${ordDtl.ordDtlStat == 'G013_60'}"  th:text="|${ordDtl.autoDecideLeftDay}일 후 자동으로 구매확정됩니다.|"></p>
 												</div>
 												
 												<!-- 구매확정 -->
@@ -370,11 +370,11 @@
 													</li>
 													<li>
 														<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|" id="recipAddr"></span>
-														<button type="button" class="btn btn_default btn_sm" th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryAddr()"><span>배송지 변경</span></button>
+														<button type="button" class="btn btn_default btn_sm" th:if="${canChgAddr == 'Y'}" onclick="fnChangeDeliveryAddr()"><span>배송지 변경</span></button>
 													</li>
 													<li>
 														배송요청 사항&nbsp;:&nbsp;<span id="delvMemo" th:text="${deliveryAddrInfo.delvMemo}"></span>
-														<button type="button" class="btn_underline" th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryMemo(this)"><span>변경하기</span></button>
+														<button type="button" class="btn_underline" th:if="${canChgAddr == 'Y'}" onclick="fnChangeDeliveryMemo(this)"><span>변경하기</span></button>
 													</li>
 												</ul>
 											</div>

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

@@ -650,7 +650,7 @@
 								
 								tag += '									</div>';
 							} else if (ordDtl.ordDtlStat == 'G013_60') {
-								tag += '									<div class="order_text"><p>15일 후 자동으로 구매확정됩니다.</p></div>\n';
+								tag += '									<div class="order_text"><p>' + ordDtl.autoDecideLeftDay + '일 후 자동으로 구매확정됩니다.</p></div>\n';
 							}
 						}
 

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

@@ -162,11 +162,11 @@
 												</li>
 												<li>
 													<span id="recipAddr" th:text="|${oneData.recipBaseAddr} ${oneData.recipDtlAddr}|"></span>
-													<button type="button" class="btn btn_default btn_sm" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35'}" onclick="fnChangeAddr('recip');"><span>배송지 변경</span></button>
+													<button type="button" class="btn btn_default btn_sm" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25'}" onclick="fnChangeAddr('recip');"><span>배송지 변경</span></button>
 												</li>
 												<li>
 													배송요청 사항&nbsp;:&nbsp;<span id="delvMemo" th:text="${oneData.delvMemo}"></span>
-													<button type="button" class="btn_underline" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35'}" onclick="fnChangeMemo('recip')"><span>변경하기</span></button>
+													<button type="button" class="btn_underline" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25'}" onclick="fnChangeMemo('recip')"><span>변경하기</span></button>
 												</li>
 											</ul>
 										</div>

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

@@ -164,7 +164,7 @@
 											<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다.</p>
 											<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다.</p>
 											<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다.</p>
-											<p th:if="${ordDtl.ordDtlStat == 'G013_60'}">15일 후 자동으로 구매확정됩니다.</p>
+											<p th:if="${ordDtl.ordDtlStat == 'G013_60'}" th:text="|${ordDtl.autoDecideLeftDay}일 후 자동으로 구매확정됩니다.|"></p>
 										</div>
 										</th:block>
 									</div>

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

@@ -180,7 +180,7 @@
 												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다.</p>
 												<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다.</p>
 												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다.</p>
-												<p th:if="${ordDtl.ordDtlStat == 'G013_60'}">15일 후 자동으로 구매확정됩니다.</p>
+												<p th:if="${ordDtl.ordDtlStat == 'G013_60'}" th:text="|${ordDtl.autoDecideLeftDay}일 후 자동으로 구매확정됩니다.|"></p>
 											</div>
 
 										</div>
@@ -254,11 +254,11 @@
 													</li>
 													<li>
 														<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|" id="recipAddr"></span>
-														<button type="button" class="btn btn_default btn_sm" th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryAddr()"><span>배송지 변경</span></button>
+														<button type="button" class="btn btn_default btn_sm" th:if="${canChgAddr == 'Y'}" onclick="fnChangeDeliveryAddr()"><span>배송지 변경</span></button>
 													</li>
 													<li>
 														배송요청 사항&nbsp;:&nbsp;<span id="delvMemo" th:text="${deliveryAddrInfo.delvMemo}"></span>
-														<button type="button" class="btn_underline" th:if="${allCanYn == 'Y'}" onclick="fnChangeDeliveryMemo(this)"><span>변경하기</span></button>
+														<button type="button" class="btn_underline" th:if="${canChgAddr == 'Y'}" onclick="fnChangeDeliveryMemo(this)"><span>변경하기</span></button>
 													</li>
 												</ul>
 											</div>

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

@@ -510,7 +510,7 @@
 							
 							tag += '									</div>';
 						} else if (ordDtl.ordDtlStat == 'G013_60') {
-							tag += '									<div class="order_text"><p>15일 후 자동으로 구매확정됩니다.</p></div>\n';
+							tag += '									<div class="order_text"><p>' + ordDtl.autoDecideLeftDay + '일 후 자동으로 구매확정됩니다.</p></div>\n';
 						}
 					}
 					tag += '								</div>';