반품TO반품 임시 커밋

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -362,6 +362,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 					if(ordDtlNoList.contains(tmp.getOrdDtlNo())) {
 						int chgQty = chgQtyList.get(ordDtlNoList.indexOf(tmp.getOrdDtlNo()));
 						tmp.setChgQty(chgQty);
+
+						if (StringUtils.isNotBlank(ordChgGb) && TscConstants.ChangeGb.RETURN_TO_RETURN.value().equals(ordChgGb.toUpperCase())) {
+							tmp.setOrdCanChgQty(chgQty);
+						}
+
 						tmpList.add(tmp);
 					}
 				}

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -1137,7 +1137,7 @@ var fnReturnRequest = function (paramData, ordChgSq) {
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 	
 	param += "&ordChgSq=" 		+ ordChgSq;
-	param += "&ordChgGb=G681_30";
+	//param += "&ordChgGb=G681_30";
 	var actionUrl = "/orderChange/rtn/req/form?" + param;
 	cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
 };

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -903,6 +903,10 @@ var fnCalculateRefundAmt = function (obj) {
 		}
 	}
 
+	console.log(ordDtlNoArr);
+	console.log(cnclRtnReqQtyArr);
+	console.log(chgQtyArr);
+
 	// 2. 추가정보설정
 	var chgerNm 	= orderInfoList[0].ordNm;
 	var chgerEmail 	= orderInfoList[0].ordEmail;
@@ -944,6 +948,7 @@ var fnCalculateRefundAmt = function (obj) {
 			gridOptionsDelvCdList.api.setRowData(result.cancelDelvRefundList);
 			
 			let spanSumDeliveryFee = result.spanSumDeliveryFee - result.spanDelvCpnDcAmt;
+			let sumDeliveryFee = result.sumDeliveryFee - result.spanRefundDelvCpnAmt;
 			
 			$("#spanPayAmt").text(result.spanPayAmt.addComma());					//총 결제 금액
 			$("#spanSumRealOrdAmt").text(result.spanSumRealOrdAmt.addComma());		//상품 실결제 금액
@@ -979,15 +984,15 @@ var fnCalculateRefundAmt = function (obj) {
 
 				// 고객사유(회수요청) : 환불금액게산 = (취소금액 + 배송비) - 추가배송비 - 반품배송비
 				if (isCustomer && wdGb == 'W') {
-					result.spanRefundAmt = (result.spanRealCnclRtnAmt + spanSumDeliveryFee) - result.spanTotDeliveryFee - result.spanTotRtnDelvFee;
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee) - result.spanTotDeliveryFee - result.spanTotRtnDelvFee;
 				} 
 				// 고객사유(직접발송) : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
 				else if (isCustomer && wdGb == 'D') {
-					result.spanRefundAmt = (result.spanRealCnclRtnAmt + spanSumDeliveryFee) - result.spanTotDeliveryFee;
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee) - result.spanTotDeliveryFee;
 				}
 				// 회사사유 : 환불금액게산 = (취소금액 + 배송비)
 				else {
-					result.spanRefundAmt = (result.spanRealCnclRtnAmt + spanSumDeliveryFee);
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee);
 				}
 			}