Merge branch 'card007' into order

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

@@ -166,6 +166,7 @@ public class TsfOrderChangeService {
 		// 전체 및 마지막 취소여부 설정
 		String delvFeeCd = "";
 		String allCanYn = "Y";
+		String allLastCanYn = "Y";
 		List<String> delvFeeCdList = new ArrayList<>();
 		for (Order order : cnclRtnList) {
 			int index = ordDtlNoList.indexOf(order.getOrdDtlNo());
@@ -181,6 +182,10 @@ public class TsfOrderChangeService {
 			if ((index < 0 || cnclRtnReqQtyArr[index] != (ordQty - cnclRtnQty)) && !delvFeeCd.equals(order.getDelvFeeCd())) {
 				delvFeeCdList.add(order.getDelvFeeCd());
 				delvFeeCd = order.getDelvFeeCd();
+				
+				if ("Y".equals(allLastCanYn)) {
+					allLastCanYn = "N";
+				}
 			}
 		}
 
@@ -209,6 +214,7 @@ public class TsfOrderChangeService {
 		}
 		
 		result.setString("allCanYn", allCanYn);									// 전체 취소 여부
+		result.setString("allLastCanYn", allLastCanYn);							// 전체 마지막 취소 여부
 		result.setString("allCanYnBeforePayment", allCanYnBeforePayment);		// 무통장입금전 전체 취소 여부
 		result.set("cnclReqList", cnclReqList);									// 취소신청목록
 

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

@@ -734,6 +734,7 @@ public class TsfMypageController extends TsfBaseController {
 		GagaMap refundPreInfo = orderChangeService.getRefundPreInfo(orderChange);
 		List<Order> cnclReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 		String allCanYn = refundPreInfo.getString("allCanYn");
+		String allLastCanYn = refundPreInfo.getString("allLastCanYn");
 		String allCanYnBeforePayment = refundPreInfo.getString("allCanYnBeforePayment");
 
 		// 3. 환불금액계산
@@ -751,15 +752,18 @@ public class TsfMypageController extends TsfBaseController {
 		result.set("bankCd", orderChange.getBankCd());				// 환불계좌은행코드
 
 		result.set("allCanYnBeforePayment", allCanYnBeforePayment);	// 무통장입금전 전체취소 여부
+		result.set("allCanYn", allCanYn);							// 전체취소 여부
+		result.set("allLastCanYn", allLastCanYn);					// 전체 마지막 취소 여부
 		result.set("isCustomer", orderChange.getIsCustomer());		// 변경사유 (고객, 회사)
 
 		// 5. 주문변경 회수지정보 추가
-		// result.set("chgerNm", orderChange.getChgerNm());			// 변경자명
+		// result.set("chgerNm", orderChange.getChgerNm());				// 변경자명
 		// result.set("chgerEmail", orderChange.getChgerEmail());		// 변경자이메일주소
 		// result.set("chgerPhnno", orderChange.getChgerPhnno());		// 변경자핸드폰번호
 		// result.set("chgerTelno", orderChange.getChgerTelno());		// 변경자전화번호
 
 		result.set("reqGbn", orderChange.getReqGbn());				// 신청구분
+		result.set("ipAddress", TsfSession.getIpAddress());			// IP주소
 
 		// 6. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL)
 		coreOrderChangeService.cnclComplete(result, custNo);