반품TO교환 임시 커밋

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

@@ -461,6 +461,7 @@ public class TsfOrderService {
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
 			} else {
 				// TB_DELIVERY_FEE PAY_SQ 등록
+				result.setPayGb(TscConstants.PaymentGb.ORDER.value());
 				result.setUpdNo(payment.getUpdNo());
 				coreOrderDao.updateDeliveryFeePaySq(result);
 			}
@@ -503,6 +504,7 @@ public class TsfOrderService {
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
 			} else {
 				// TB_DELIVERY_FEE PAY_SQ 등록
+				result.setPayGb(TscConstants.PaymentGb.ORDER.value());
 				result.setUpdNo(payment.getUpdNo());
 				coreOrderDao.updateDeliveryFeePaySq(result);
 			}

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

@@ -747,13 +747,13 @@ public class TsfMypageController extends TsfBaseController {
 		orderChange.setCustNo(custNo);
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
 		List<Order> returnReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 		String allLastCanYn = refundPreInfo.getString("allLastCanYn");
 		String supplyCompCd = refundPreInfo.getString("supplyCompCd");
 
 		// 3. 환불금액계산
-		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt2(returnReqList);
+		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt(returnReqList);
 
 		// 4. 주문변경 기본정보 설정
 		result.set("ordNo", orderChange.getOrdNo());					// 주문번호
@@ -1316,10 +1316,10 @@ public class TsfMypageController extends TsfBaseController {
 		orderChange.setCustNo(custNo);
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
 		List<Order> cnclReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 
-		return coreOrderRefundService.cnclRtnRefundAmt2(cnclReqList);
+		return coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
 	}
 
 	/**

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

@@ -362,10 +362,10 @@ public class TsfNoMemberController extends TsfBaseController {
 		}
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
 		List<Order> cnclReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 
-		return coreOrderRefundService.cnclRtnRefundAmt2(cnclReqList);
+		return coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
 	}
 
 	/**
@@ -711,11 +711,11 @@ public class TsfNoMemberController extends TsfBaseController {
 		}
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
 		List<Order> returnReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 
 		// 3. 환불금액계산
-		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt2(returnReqList);
+		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt(returnReqList);
 
 		// 4. 주문변경 기본정보 설정
 		result.set("ordNo", orderChange.getOrdNo());					// 주문번호

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

@@ -1510,14 +1510,21 @@ public class TsfOrderController extends TsfBaseController {
 		GagaMap resultMap = coreOrderService.getAddPayOrderListInfo(order);
 
 		// 4. 화면전송변수설정
-		mav.addObject("refundAmt", resultMap.get("refundAmt"));                // 상품환불금액
-		mav.addObject("addPayCost", resultMap.get("addPayCost"));                // 추가결제금액
-		mav.addObject("ordChgSq", resultMap.get("ordChgSq"));                // 주문취소신청번호
-		mav.addObject("chgerNm", resultMap.get("chgerNm"));                // 변경신청인
-		mav.addObject("chgerPhnno", resultMap.get("chgerPhnno"));                // 변경신청핸드폰번호
+		mav.addObject("refundAmt", resultMap.get("refundAmt"));					// 상품환불금액
+		mav.addObject("addPayCost", resultMap.get("addPayCost"));				// 추가결제금액
+		mav.addObject("ordChgSq", resultMap.get("ordChgSq"));					// 주문취소신청번호
+		mav.addObject("chgerNm", resultMap.get("chgerNm"));						// 변경신청인
+		mav.addObject("chgerPhnno", resultMap.get("chgerPhnno"));				// 변경신청핸드폰번호
 
 		// TODO 3. 주문정보 업데이트
 		coreOrderService.updateOrderChangeDetail(order);
+		
+		// 배송비 결제 시퀀스 업데이트
+		param.setPayGb(TscConstants.PaymentGb.DELIVERY.value());
+		coreOrderService.updateDeliveryFeePaySq(param);
+		
+		// TB_REFUND RF_DELIVERY_FEE 컬럼 수정
+		
 
 		// 6. 반품&교환 접수 알림톡 및 메일 발송
 		Integer ordChgSq = order.getOrdChgSq();

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

@@ -945,9 +945,19 @@
 
 				let jsonData = JSON.stringify(data);
 				
-				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-					cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
-				}, true);
+				// 취소 처리 가능 여부 조회
+				gagajf.ajaxJsonSubmit('/mypage/wms/cancel/available', jsonData, function(result) {
+					let cancelYn = result.cancelYn;
+					
+					if (cancelYn == 'Y') {
+						// 전체취소 처리
+						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+						}, true);
+					} else {
+						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');
+					}
+				});
 			}
 		});
 	}

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

@@ -721,9 +721,19 @@
 
 				let jsonData = JSON.stringify(data);
 				
-				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-					cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
-				}, true);
+				// 취소 처리 가능 여부 조회
+				gagajf.ajaxJsonSubmit('/mypage/wms/cancel/available', jsonData, function(result) {
+					let cancelYn = result.cancelYn;
+					
+					if (cancelYn == 'Y') {
+						// 전체취소 처리
+						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+						}, true);
+					} else {
+						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');
+					}
+				});
 			}
 		});
 	}

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

@@ -594,11 +594,11 @@
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
-						});
+						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');
 					}
-				}, true);
+				});
 				
 				
 			}

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

@@ -445,11 +445,11 @@
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
-						});
+						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');
 					}
-				}, true);
+				});
 			}
 		});
 	}