06.04

src/main/java/com/style24/admin/biz/service/TsaWithdrawService.java

@@ -644,8 +644,11 @@ public class TsaWithdrawService {
 		change.setMallGb(params.getString("mallGb"));
 		change.setSpanRefundAmt(params.getInt("spanRefundAmt"));
 		change.setPgStat(params.getString("pgStat"));
-		
-		
+		change.setCodFeeYn(params.getString("codFeeYn"));
+		change.setCodFee(params.getInt("codFee"));
+		change.setEnCloseFeeYn(params.getString("enCloseFeeYn"));
+		change.setEncloseFee(params.getInt("enCloseFee"));
+		change.setWdInvoiceNo(params.getString("wdInvoiceNo"));
 		
 		
 		String allCanYn = params.getString("allCanYn");
@@ -677,7 +680,11 @@ public class TsaWithdrawService {
 			info.set("ordChgSq", params.getInt("ordChgSq"));
 			info.set("mallGb", params.getString("mallGb"));
 			info.set("pgStat", params.getString("pgStat"));
-			
+			info.set("codFee", params.getInt("codFee"));
+			info.set("codFeeYn", params.getString("codFeeYn"));
+			info.set("enCloseFeeYn", params.getString("enCloseFeeYn"));
+			info.set("enCloseFee", params.getInt("enCloseFee"));
+			info.set("wdInvoiceNo", params.getInt("wdInvoiceNo"));
 			
 			
 			orderChangeService.partialRefund(info, userNo);

src/main/java/com/style24/persistence/domain/Withdraw.java

@@ -83,13 +83,15 @@ public class Withdraw extends TscBaseDomain {
 	private String accountNm;
 	private String accountNo;
 	private String bankCd;	
-	
+	private String invoiceNo;
+
 	private Integer ordNo;
 	private Integer ordDtlNo; 
 	private Integer ordChgSq;
 	private Integer userNo;
 	private Integer custNo;
 	private Integer delvAddrSq;
+	private Integer delvFeeSq;
 	
 	private int chgQty;
 	private int wdQty;

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

@@ -511,7 +511,8 @@
 				, CA.ACCOUNT_NM 
 				, CA.BANK_CD 	
 				, E.ORD_NM 	
-				, C.DELV_ADDR_SQ 
+				, C.DELV_ADDR_SQ
+				, F.WD_INVOICE_NO 
 		  FROM TB_ORDER_CHANGE A
 		  JOIN TB_ORDER_CHANGE_DETAIL B ON B.ORD_CHG_SQ = A.ORD_CHG_SQ 
 		  JOIN TB_ORDER_DETAIL C ON C.ORD_DTL_NO = B.ORD_DTL_NO 

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -324,9 +324,13 @@
 		reFundInfo.ordNm       = data.ordNm;
 		reFundInfo.delvAddrSq  = data.reFundInfo;
 		reFundInfo.delvExpnYn  = data.delvExpnYn;
-		reFundInfo.mallGb           = mallGb;
-		reFundInfo.ordNo            = ordNo;
-		reFundInfo.ordChgSq         = ordChgSq;
+		reFundInfo.wdInvoiceNo   = data.wdInvoiceNo;
+		reFundInfo.mallGb      = mallGb;
+		reFundInfo.ordNo       = ordNo;
+		reFundInfo.ordChgSq    = ordChgSq;
+		
+		
+		
 		
 		// 환불컨펌 상세
 		$("#wdGbNm").text(data.wdGbNm); // 회수구분 
@@ -395,8 +399,13 @@
 		fnSetTotRefundData();
 	}
 	
-	var addDeliveryFee = 0;
+	var addDeliveryFee   = 0;
 	var addDeliveryFeeYn = "N";
+	var codFeeAmt        = 0;
+	var codFeeYn         = 'N';
+	var enCloseFeeAmt    = 0;
+	var enCloseFeeYn     = "N";
+	
 	/*************************************************************************
 	*  환불 금액 계산
 	**************************************************************************/		
@@ -404,7 +413,13 @@
 		var enCloseFee = $("#withdrawDetailForm input[name=encloseFee]").val(); //  동봉비 
 		var codFee     = $("#withdrawDetailForm input[name=codFee]").val(); //      착불비 
 		var addPaycost = $("#withdrawDetailForm input[name=addPayCost]").val(); //  추가 결제비 
-
+		addDeliveryFee   = 0;
+		addDeliveryFeeYn = "N";
+		codFeeAmt        = 0;
+		codFeeYn         = "N";
+		enCloseFeeAmt    = Number(enCloseFee);
+		enCloseFeeYn     = "N";
+		
 		if(delvExpnYn == "Y"){ // 출고예외(확정후 품절,불량)일 경우 
 			if(toTalOrdQty == ordChgQty){ // 총 주문수량  =  반품수량   배송비가 있을시 환불해줌 
 				
@@ -412,11 +427,11 @@
 					addDeliveryFee = reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt;
 					addDeliveryFeeYn = "Y";
 				}
-				//alert("총수량 출고예외 ");
+				alert("총수량 출고예외 ");
 				// 환불금액  = 취소 상품 실결제 금액 + 배송비 
 				reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt);
 			} else { // 총 주문수량  <>  반품수량   
-				//alert("출고예외");
+				alert("출고예외");
 				reFundInfo.spanRefundAmt = reFundInfo.spanRealCnclRtnAmt;
 			}
 			
@@ -424,34 +439,55 @@
 			if(toTalOrdQty == ordChgQty){// 총 주문수량  =  반품수량   
 				if(isCustomer){ //고객귀책 
 					if(wdGb == "W"){ // 회수요청
-						//alert("총수량 고객귀책 - 회수요청");
+						alert("총수량 고객귀책 - 회수요청");
 						// 환불금액  = 취소 상품 실결제 금액 + 배송비 - 추가배송비 - 반품배송비 
+						if(Number(enCloseFee) > 0){
+							enCloseFeeYn = "Y";
+						}
 						reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost)) - (reFundInfo.spanTotDeliveryFee - reFundInfo.spanDelvCpnDcAmt)  - reFundInfo.spanTotRtnDelvFee;
 					} else {         // 직접배송
-						//alert("총수량 고객귀책 - 직접배송");
+						alert("총수량 고객귀책 - 직접배송");
+					
+						if(Number(codFee) > 0){
+							codFeeAmt = Number(codFee);
+							codFeeYn  = "Y";
+						}
+						if(Number(enCloseFee) > 0){
+							enCloseFeeYn = "Y";
+						}
 						reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost)) - (reFundInfo.spanTotDeliveryFee - reFundInfo.spanDelvCpnDcAmt) - Number(codFee);
 					}
 				} else { // 회사귀책
-					//alert("총수량 회사귀책 ");
+					alert("총수량 회사귀책 ");
 					if(reFundInfo.spanSumDeliveryFee > 0){
 						addDeliveryFee = reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt;
 						addDeliveryFeeYn = "Y";
 					}
-					reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + (reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt) - Number(codFee)) 
+					reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + (reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt)) 
 				}
 			} else { // 총 주문수량  <>  반품수량   
 				if(isCustomer){ //고객귀책 
 					if(wdGb == "W"){ // 회수요청
-						//alert(" 고객귀책- 회수요청 ");
+						alert(" 고객귀책- 회수요청 ");
+						if(Number(enCloseFee) > 0){
+							enCloseFeeYn = "Y";
+						}
 						// 환불금액  = 취소 상품 실결제 금액   - 반품배송비 
 						reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost))  - reFundInfo.spanTotRtnDelvFee;
 					} else {         // 직접배송
-						//alert(" 고객귀책- 직접배송 ");
+						alert(" 고객귀책- 직접배송 ");
+						if(Number(codFee) > 0){
+							codFeeAmt = Number(codFee);
+							codFeeYn  = "Y";
+						}
+						if(Number(enCloseFee) > 0){
+							enCloseFeeYn = "Y";
+						}
 						reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) - Number(codFee));
 					}
 				} else { // 회사귀책
-					//alert(" 회사귀책 ");
-					reFundInfo.spanRefundAmt = reFundInfo.spanRealCnclRtnAmt - Number(codFee);
+					alert(" 회사귀책 ");
+					reFundInfo.spanRefundAmt = reFundInfo.spanRealCnclRtnAmt ;
 				}
 			}
 		}
@@ -511,7 +547,11 @@
 		var pgStat = $('#withdrawDetailForm input:checkbox[name=pgStats]').is(":checked") ? "Y" : "N"; 
 		reFundInfo.addDeliveryFee   = addDeliveryFee;
 		reFundInfo.addDeliveryFeeYn = addDeliveryFeeYn;
+		reFundInfo.codFee           = codFeeAmt;
+		reFundInfo.codFeeYn         = codFeeYn;
 		reFundInfo.pgStat           = pgStat;
+		reFundInfo.enCloseFeeYn     = enCloseFeeYn;
+		reFundInfo.enCloseFee       = enCloseFeeAmt;
 		
 		var jsonData = JSON.stringify(reFundInfo);