회수상품,금액정보노출

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

@@ -71,9 +71,6 @@ public class TsaWithdrawService {
 	@Autowired
 	private TscKakaotalkService kakaotalkService;
 
-	
-	
-
 	/**
 	 * 환불관리 목록 건수
 	 *
@@ -85,9 +82,7 @@ public class TsaWithdrawService {
 	public int getRefundListCount(Withdraw withdraw) {
 		return withdrawDao.getRefundListCount(withdraw);
 	}
-	
-	
-	
+
 	/**
 	 * 환불관리 목록
 	 *
@@ -107,9 +102,7 @@ public class TsaWithdrawService {
 
 		return result;
 	}
-	
-	
-	
+
 	/**
 	 * 회수예외 목록 건수
 	 *
@@ -148,8 +141,6 @@ public class TsaWithdrawService {
 		withdrawDao.updateWithdrawException(withdrawExc);
 		
 		wmsWithdrawService.updateTbIfRecallExceptionRslt(withdrawExc);
-		
-		
 	}
 	
 	/**
@@ -373,10 +364,6 @@ public class TsaWithdrawService {
 		withdrawDao.updateChangeReason(withdrawExc);
 	}
 
-
-
-
-
 	/**
 	 * 환불관리 상세정보
 	 *
@@ -395,11 +382,6 @@ public class TsaWithdrawService {
 		return refundDetailList;
 	}
 
-
-
-
-
-
 	/**
 	 * 회수관리 > 환불컨펌 > 환불처리 
 	 *
@@ -440,36 +422,6 @@ public class TsaWithdrawService {
 		String payMeans			= params.getString("payMeans");
 		String batchYn			= "N";
 
-		// OrderChange change = new OrderChange();
-		// change.setOrdNo(params.getInt("ordNo"));
-		// change.setCustNo(params.getInt("custNo"));
-		// change.setOrderNm(params.getString("ordNm"));
-		// change.setPgGb(params.getString("pgGb"));
-		// change.setPayMeans(params.getString("payMeans"));
-		// change.setBankCd(params.getString("bankCd"));
-		// change.setAccountNm(params.getString("accountNm"));
-		// change.setAccountNo(CryptoUtils.decryptAES(params.getString("accountNo")));
-		// //change.getOrdDtlNoList().add(params.getOrdDtlNo());
-		// //change.getCnclRtnReqQtyList().add(params.getCnclRtnQty());
-		// change.setChgReason(params.getString("chgReason"));
-		// change.setChgReasonNm(params.getString("chgReasonNm"));
-		// change.setBatchYn("N");
-		// change.setDelvAddrSq(params.getInt("delvAddrSq"));
-		// change.setAddDeliveryFeeYn(params.getString("addDeliveryFeeYn"));
-		// change.setAddDeliveryFee(params.getInt("addDeliveryFee"));
-		// change.setRegNo(userNo);
-		// change.setUpdNo(userNo);
-		// change.setUserNo(userNo);
-		// change.setOrdChgSq(params.getInt("ordChgSq"));
-		// 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"));
-
 		try {
 			OrderChange orderChange = new OrderChange();
 			orderChange.setOrdChgSq(ordChgSq);
@@ -597,7 +549,6 @@ public class TsaWithdrawService {
 		} catch(Exception e) {
 			log.debug("kakaotalkService Exception OrdNo:"+withdraw.getOrdNo());
 		}
-
 	}
 	
 	public Withdraw getRefundInfo(Withdraw withdraw) {

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

@@ -167,7 +167,6 @@ public class TsaWithdrawController extends TsaBaseController {
 		OrderChange orderChange= new OrderChange();
 		orderChange.setOrdChgSq(withdraw.getOrdChgSq());
 		orderChange.setUserNo(withdraw.getUserNo());
-		//orderChangeService.refundConfirmPreInfo(orderChange);
 		
 		GagaMap result = new GagaMap();
 		
@@ -183,7 +182,6 @@ public class TsaWithdrawController extends TsaBaseController {
 			result.set("returnOrderInfo", orderChangeService.getReturnOrderInfo(order));
 		}
 		
-	//	Collection<Withdraw> dataList = withdrawService.getRefundDetailList(withdraw);
 		return result;
 	}
 

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

@@ -1180,6 +1180,7 @@ var fnCalculateRefundAmt = function (obj) {
 		'/orderChange/cancel/refundAmt'
 		, jsonData
 		, function(result) {
+			/*
 			// 2021.12.01 취소금액설정
 			if (result.cancelOrderRefundList != null && result.cancelOrderRefundList.length > 0) {
 				for (i=0 ; i<result.cancelOrderRefundList.length ; i++) {
@@ -1202,6 +1203,7 @@ var fnCalculateRefundAmt = function (obj) {
 				// 주문변경대상정보 재설정
 				gridOptionsExchangeReqList.api.setRowData(cancelRequestTargetList);
 			}
+			*/
 		}
 	);
 }

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

@@ -233,6 +233,7 @@
 	var wdGb        	= "";
 	var mallGb      	= "";
 	var reFundInfo  	= [[${refundConfirmPreInfo}]]; // 환불컨펌 정보
+	var temp1			= true;
 
 	var returnOrderInfo;
 	var columnDefsDetail = [
@@ -276,6 +277,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "취소금액"
@@ -285,6 +287,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "즉시할인금액"
@@ -294,6 +297,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "다다익선1금액"
@@ -303,6 +307,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "다다익선2금액"
@@ -312,6 +317,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "상품쿠폰금액"
@@ -321,6 +327,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "장바구니쿠폰금액"
@@ -330,6 +337,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "선포인트금액"
@@ -339,6 +347,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "포인트금액"
@@ -348,6 +357,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "실결제금액"
@@ -357,6 +367,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{
 			headerName		: "상품권금액"
@@ -366,6 +377,7 @@
 			, cellRenderer	: function (params) {
 				return params.value.addComma();
 			}
+			, hide			: temp1
 		},
 		{headerName: "등록일", 			field: "regDt", 		width: 100, minWidth: 100, cellClass: 'text-right'}
 	];
@@ -394,8 +406,8 @@
 	*  상세 정보 콜백 함수
 	**************************************************************************/	
 	var fnWithdrawDetailCallback = function(result) {
-		reFundInfo = result.refundConfirmPreInfo; // 환불 컨펌 환불 정보
-		returnOrderInfo = result.returnOrderInfo;
+		reFundInfo 			= result.refundConfirmPreInfo; // 환불 컨펌 환불 정보
+		returnOrderInfo 	= result.returnOrderInfo;
 		
 		if (result.dataList.length < 1) {
 			mcxDialog.alert('회수데이터 오류입니다. 운영팀에 문의 해주세요! ');
@@ -419,8 +431,28 @@
 			$('#divRefundInfo2').show();
 		}
 		
-		// 회수리스트 설정
-		withdrawDetailGridOptions.api.setRowData(result.dataList); 
+		// 2021.12.06 취소금액설정
+		if (reFundInfo.cancelOrderRefundList != null && reFundInfo.cancelOrderRefundList.length > 0) {
+			for (i=0 ; i<reFundInfo.cancelOrderRefundList.length ; i++) {
+				for (j=0 ; j<result.dataList.length ; j++) {
+					if (reFundInfo.cancelOrderRefundList[i].ordDtlNo == result.dataList[j].ordDtlNo) {
+						result.dataList[j].cnclRtnAmt 		= reFundInfo.cancelOrderRefundList[i].cnclRtnAmt;		// 취소금액
+						result.dataList[j].cpn1DcAmt 		= reFundInfo.cancelOrderRefundList[i].cpn1DcAmt;		// 즉시할인쿠폰금액
+						result.dataList[j].tmtb1DcAmt 		= reFundInfo.cancelOrderRefundList[i].tmtb1DcAmt;		// 수량할인다다익선금액
+						result.dataList[j].tmtb2DcAmt 		= reFundInfo.cancelOrderRefundList[i].tmtb2DcAmt;		// 금액할인다다익선금액
+						result.dataList[j].goodsCpnDcAmt 	= reFundInfo.cancelOrderRefundList[i].goodsCpnDcAmt;	// 상품쿠폰금액
+						result.dataList[j].cartCpnDcAmt 	= reFundInfo.cancelOrderRefundList[i].cartCpnDcAmt;		// 장바구니쿠폰금액
+						result.dataList[j].pntDcAmt 		= reFundInfo.cancelOrderRefundList[i].pntDcAmt;			// 포인트금액
+						result.dataList[j].prePntDcAmt 		= reFundInfo.cancelOrderRefundList[i].prePntDcAmt;		// 선포인트금액
+						result.dataList[j].gfcdUseAmt 		= reFundInfo.cancelOrderRefundList[i].gfcdUseAmt;		// 상품권적용금액
+						result.dataList[j].realOrdAmt 		= reFundInfo.cancelOrderRefundList[i].realOrdAmt;		// 실결제금액
+					}
+				}
+			}
+			
+			// 주문변경대상정보 재설정
+			withdrawDetailGridOptions.api.setRowData(result.dataList);
+		}
 		
 		$("#refundAmt").text(result.dataList[0].refundAmt.addComma());
 		
@@ -537,7 +569,7 @@
 
 		addDeliveryFee			= 0;
 		addDeliveryFeeYn		= "N";
-		
+			`
 		codFeeAmt				= 0;
 		codFeeYn				= "N";
 		enCloseFeeAmt			= Number(enCloseFee);
@@ -814,7 +846,11 @@
 	*  회수컨펌 클릭 시
 	**************************************************************************/
 	withdrawDetailGridOptions.onCellClicked = function(event) {
-		if (event.colDef.field != 'chgStat') return;
+		
+		if (event.colDef.field != 'chgStat') {
+			return;
+		}
+		
 		if (ordChgQty != ordInQty) {
 			mcxDialog.alert('반품신청 수량과 회수입고수량이 맞지 않습니다.<br/>반품신청수량 : ' + ordChgQty + '<br/>회수입고수량 : ' + ordInQty);
 			return;
@@ -893,13 +929,10 @@
 		if (flag) {
 			$('#withdrawDetailForm input[name=encloseFee]').attr('readonly', 'readonly');
 			$('#withdrawDetailForm input[name=encloseFee]').addClass('formControl');
-			
 		} else {
 			$('#withdrawDetailForm input[name=encloseFee]').remove('readonly');
 			$('#withdrawDetailForm input[name=encloseFee]').removeClass('formControl');
-			
 		}
-		
 	}
 
 	// PG점프 변경 이벤트 처리
@@ -923,7 +956,7 @@
 		// 회수 상세내역 조회
 		fnRefundDetailSearch();
 		
-		//
+		// PG점프 변경 이벤트 처리
 		fnChangePgStat();
 	});