개선 #1041 [ADMIN] PG점프 입금액 처리 커밋

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

@@ -386,7 +386,8 @@ public class TsaWithdrawService {
 		String addDeliveryFeeYn	= params.getString("addDeliveryFeeYn");						// 추가배송비여부
 		String mallGb			= params.getString("mallGb");								// 몰구분
 		Integer ordChgSq		= params.getInt("ordChgSq");								// 변경요청번호
-		String pgStat			= params.getString("pgStat");								// PG 상태
+		String pgStat			= params.getString("pgStat");								// PG점프
+		int depositAmt			= params.getInt("depositAmt");								// PG점프 임금액
 		int codFee				= params.getInt("codFee");									// 착불비
 		String codFeeYn			= params.getString("codFeeYn");								// 착불비여부
 		String enCloseFeeYn		= params.getString("enCloseFeeYn");							// 동봉비여부
@@ -451,7 +452,8 @@ public class TsaWithdrawService {
 			info.set("mallGb"			, mallGb);				// 몰구분
 			info.set("ordNo"			, ordNo);				// 주문번호
 			info.set("ordChgSq"			, ordChgSq);			// 변경요청번호
-			info.set("pgStat"			, pgStat);				// PG 상태
+			info.set("pgStat"			, pgStat);				// PG점프
+			info.set("depositAmt"		, depositAmt);			// PG점프 입금액
 			info.set("codFee"			, codFee);				// 착불비
 			info.set("codFeeYn"			, codFeeYn);			// 착불비여부
 			info.set("enCloseFeeYn"		, enCloseFeeYn);		// 동봉비여부

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

@@ -177,7 +177,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		// 2.취소요청철회
 		mav = coreOrderChangeService.cnclReqCancel(mav, userNo);
 
-		return super.ok("성공");
+		return super.ok(message.getMessage("SUCC_0004"));
 	}
 	
 	/**
@@ -237,6 +237,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		map.set("cashAuthNo"				, refundPreInfo.getString("cashAuthNo"));	// 현금영수증 승인번호
 		map.set("chgStat"					, cnclReq.getChgStat());					// 변경상태
 		map.set("pgStat"					, cnclReq.getPgStat());						// PG점프
+		map.set("depositAmt"				, cnclReq.getDepositAmt());					// PG점프 입금액
 
 		// 4. 부분취소 처리 2021.05.13
 		// 2021.06.09 취소접수
@@ -362,7 +363,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 			}
 		}
 
-		return super.ok("성공");
+		return super.ok(message.getMessage("SUCC_0004"));
 	}
 	
 	/**

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

@@ -1,17 +1,10 @@
 package com.style24.admin.biz.web;
 
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -27,7 +20,6 @@ import com.gagaframework.excel.GagaExcelUtil;
 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.GagaDateUtil;
 import com.gagaframework.web.util.GagaFileUtil;
 import com.style24.admin.biz.service.TsaPgService;
 import com.style24.admin.biz.service.TsaRendererService;
@@ -358,7 +350,7 @@ public class TsaOrderController extends TsaBaseController {
 			orderService.updateOrderMemo(order);
 		}
 
-		return super.ok("저장이 완료되었습니다.");
+		return super.ok(message.getMessage("SUCC_0001"));
 	}
 
 	/**
@@ -378,7 +370,7 @@ public class TsaOrderController extends TsaBaseController {
 
 		orderService.deleteOrderMemo(order);
 
-		return super.ok("저장이 완료되었습니다.");
+		return super.ok(message.getMessage("SUCC_0003"));
 	}
 
 	/**
@@ -529,7 +521,7 @@ public class TsaOrderController extends TsaBaseController {
 
 		orderService.changedOrdDtlStat(order);
 
-		return super.ok("성공");
+		return super.ok(message.getMessage("SUCC_0004"));
 	}
 	
 	/**

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

@@ -105,13 +105,13 @@
 				
 				<table class="frmStyle">
 					<colgroup>
-						<col style="width:160px;" />
-						<col style="width:240px;" />
-						<col style="width:160px;" />
-						<col style="width:240px;" />
-						<col style="width:160px;" />
-						<col style="width:240px;" />
-						<col style="width:160px;" />
+						<col style="width:140px;" />
+						<col style="width:180px;" />
+						<col style="width:140px;" />
+						<col style="width:180px;" />
+						<col style="width:140px;" />
+						<col style="width:180px;" />
+						<col style="width:140px;" />
 						<col />
 					</colgroup>
 					<tbody>
@@ -137,7 +137,7 @@
 							</td>
 							<th>입금액</th>
 							<td>
-								<input type="text" class="w100" name="depositAmt" id="depositAmt" />
+								<input type="text" class="w150" name="depositAmt" id="depositAmt" value="0" readonly="readonly"/>원
 							</td>
 						</tr>
 						<tr>
@@ -1185,7 +1185,7 @@ var fnCalculateRefundAmt = function (obj) {
 
 //  사유
 var fnChangeChgReason = function(reasonCd){
-	var customerReasonArr = ['G686_10', 'G686_20'];
+	var customerReasonArr = ['G686_10'];
 
 	isCustomer = false;
 	
@@ -1314,11 +1314,16 @@ var fnCnclReq = function (reqGbn) {
 	var custNo		= orderInfoList[0].custNo;
 	var delvFeeCd	= orderInfoList[0].delvFeeCd;
 	var chgReason	= $('#cancelRequestFrm input[name=chgReason]').val();
+	var depositAmt	= $('#depositAmt').val();
 	
 	// 2021.07.22 교환미출고대상은 품절만 있음
 	if (ordChgSq > 0 && chgStat == 'G685_40') {
 		chgReason	= "G686_30";
 	}
+	
+	if (!$('#pgStat').is(':checked')) {
+		depositAmt = 0;
+	}
 
 	var jsonObj = {
 		"ordNo"						: $('#cancelRequestFrm input[name=ordNo]').val()
@@ -1350,6 +1355,7 @@ var fnCnclReq = function (reqGbn) {
 		,"wdGb"						: wdGb
 		,"addPayCost"				: addPayCost
 		,"pgStat"					: $('#pgStat').is(':checked') ? 'Y' : 'N'
+		,"depositAmt"				: depositAmt
 	}
 
 	// 주문번호, 취소사유, 취소메모, (취소, 반품, 교환 신청 정보 목록), 환불계좌
@@ -1407,12 +1413,13 @@ var fnBindOrderRfAccountInfo = function () {
 	);
 };
 
+// PG점프 버튼 클릭 이벤트
 var fnChangePgStat = function() {
 	if ($('#pgStat').is(':checked')) {
-		$('.depositAmt').attr('disabled', false);
+		$('#depositAmt').attr('readonly', false);
 	} else {
 		$('#depositAmt').val(0);
-		$('.depositAmt').attr('disabled', true);
+		$('#depositAmt').attr('readonly', true);
 	}
 }
 

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

@@ -69,9 +69,13 @@
 					</tr>
 					<tr>
 						<th>추가결제비</th>
-						<td colspan="3">
+						<td>
 							<input type="text" name="addPayCost" data-valid-type="integer" readonly="readonly" onChange="fnChangeAmt()" class="w100 aR"/>원
 						</td>
+						<th>입금액<br/>* 별도 고객 임금처리 했을 시 입력</th>
+						<td>
+							<input type="text" name="depositAmt" data-valid-type="integer" readonly="readonly" class="w100 aR" />원
+						</td>
 					</tr>
 					<tr>
 						<th>클레임메모</th>
@@ -241,7 +245,7 @@
 				
 				<div>
 					<h4 style="width:85%;">회수대상 상품 정보</h4>	
-					<span class="btnRight" id="pgBtn" >
+					<span class="btnRight" id="pgBtn" onclick="fnChangePgStat()">
 						<label ><input type="checkbox" name="pgStats" value="N" th:if="${sessionInfo.roleCd == 'G001_0000'}">&nbsp;&nbsp;PG 전문 미전송</label>
 					</span>
 					<div id="refundGridList" style="width: 100%; height: 200px; padding-top:10PX;" class="ag-theme-balham"></div>
@@ -454,6 +458,10 @@
 		var codFee				= $("#withdrawDetailForm input[name=codFee]").val(); 		//착불비 
 		var addPaycost			= $("#withdrawDetailForm input[name=addPayCost]").val(); 	//추가결제비
 
+		enCloseFee				= enCloseFee.replaceAll(',', '');
+		codFee					= codFee.replaceAll(',', '');
+		addPaycost				= addPaycost.replaceAll(',', '');
+
 		addDeliveryFee			= 0;
 		addDeliveryFeeYn		= "N";
 		codFeeAmt				= 0;
@@ -513,13 +521,9 @@
 			var leftGfcdUseAmt = spanGfcdUseAmt;
 
 			// 총 주문수량  =  반품수량
-			console.log('toTalOrdQty : ' + toTalOrdQty);
-			console.log('ordChgQty : ' + ordChgQty);
 			if (toTalOrdQty == ordChgQty) {
-				console.log('allCan');
 				// 귀책사유고객
 				if (isCustomer) {
-					console.log('allCan>customer');
 					// 회수요청
 					if (wdGb == "W") { 
 						// 환불금액  = 취소 상품 실결제 금액 + 배송비 - 추가배송비 - 반품배송비 
@@ -571,7 +575,6 @@
 				} 
 				// 회사귀책
 				else {
-					console.log('allCan>company');
 					if (spanSumDeliveryFee > 0) {
 						addDeliveryFee = spanSumDeliveryFee - spanDelvCpnDcAmt;
 						addDeliveryFeeYn = "Y";
@@ -586,10 +589,8 @@
 			} 
 			// 총 주문수량  <>  반품수량
 			else {
-				console.log('notAllCan');
 				// 고객귀책
 				if (isCustomer) {
-					console.log('notallCan>customer');
 					// 회수요청
 					if (wdGb == "W") {
 						if (Number(enCloseFee) > 0) {
@@ -641,7 +642,6 @@
 				} 
 				// 회사귀책
 				else {
-					console.log('allCan>company');
 					// 2021.07.02 환불컨펌 환불금액계산
 					// 환불금액  = (취소상품실결제금액)
 					refundAmt = spanRealCnclRtnAmt;
@@ -651,10 +651,6 @@
 		
 		//$("#spanRefundAmt").text(reFundInfo.spanRefundAmt.addComma());				//환불 금액 합계
 		
-		console.log('refundAmt : ' + refundAmt);
-		console.log('spanGfcdUseAmt : ' + spanGfcdUseAmt);
-		console.log('spanPntDcAmt : ' + spanPntDcAmt);
-		console.log('delvGfcdUseAmt : ' + delvGfcdUseAmt);
 		var totalRefundAmt = refundAmt + spanGfcdUseAmt + spanPntDcAmt + delvGfcdUseAmt;
 		var totalGfcdUseAmt = spanGfcdUseAmt + delvGfcdUseAmt;
 		
@@ -689,7 +685,7 @@
 	
 	/*************************************************************************
 	*  동봉비, 착불비, 추가결제비 변경시 재계산
-	**************************************************************************/		
+	**************************************************************************/
 	var fnChangeAmt = function(){
 		var enCloseFee = $("#withdrawDetailForm input[name=encloseFee]").val(); // 동봉비 
 		var codFee     = $("#withdrawDetailForm input[name=codFee]").val(); 	// 착불비 
@@ -739,14 +735,20 @@
 			}
 		}
 		
-		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 depositAmt = 0;
+		var pgStat = $('#withdrawDetailForm input:checkbox[name=pgStats]').is(":checked") ? "Y" : "N";
+		if (pgStat == 'Y') {
+			depositAmt = $('#withdrawDetailForm input[name=depositAmt]').val().replace(/,/gi,"");
+		}
+
+		reFundInfo.addDeliveryFee	= addDeliveryFee;
+		reFundInfo.addDeliveryFeeYn	= addDeliveryFeeYn;
+		reFundInfo.codFee			= codFeeAmt;
+		reFundInfo.codFeeYn			= codFeeYn;
+		reFundInfo.pgStat			= pgStat;
+		reFundInfo.enCloseFeeYn		= enCloseFeeYn;
+		reFundInfo.enCloseFee		= enCloseFeeAmt;
+		reFundInfo.depositAmt		= depositAmt;
 		
 		var jsonData = JSON.stringify(reFundInfo);
 		
@@ -765,6 +767,7 @@
 					$('#divRefundInfo').hide();
 					$('#divRefundInfo2').show();
 					fnRefundDetailSearch();
+					$('#withdrawDetailForm input[name=depositAmt]').attr('readonly', true);
 				});
 			}
 		});
@@ -783,6 +786,16 @@
 		}
 		
 	}
+
+	// PG점프 변경 이벤트 처리
+	var fnChangePgStat = function() {
+		if ($('#withdrawDetailForm input:checkbox[name=pgStats]').is(':checked')) {
+			$('#withdrawDetailForm input[name=depositAmt]').attr('readonly', false);
+		} else {
+			$('#withdrawDetailForm input[name=depositAmt]').val(0);
+			$('#withdrawDetailForm input[name=depositAmt]').attr('readonly', true);
+		}
+	}
 	
 	/*************************************************************************
 	*  init
@@ -792,7 +805,7 @@
 		gagaAgGrid.createGrid('refundGridList', withdrawDetailGridOptions);
 		$('#divRefundInfo2').hide();
 		fnRefundDetailSearch();
-		
+		fnChangePgStat();
 	}); 
 
 /*]]>*/