From 176e0d874ea77dc1b82c3de320e7bced2e574cde Mon Sep 17 00:00:00 2001 From: jazz Date: Thu, 26 Feb 2026 10:41:46 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=B0=98=ED=92=88=ED=99=98=EB=B6=88?= =?UTF-8?q?=20=EC=9B=90=ED=99=94=EA=B8=88=EC=95=A1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gcone/ordr/ordr/vo/BOOrdrRefundVO.java | 4 +- .../mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 4 +- .../ordr/rtngudrefnd/BORtngudrefndMapper.xml | 7 +- .../mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp | 77 ++++++++++++++----- 4 files changed, 65 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrRefundVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrRefundVO.java index 30a447ff..3d91864d 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrRefundVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrRefundVO.java @@ -94,6 +94,8 @@ public class BOOrdrRefundVO extends AbstractVO { private BigDecimal returnDlvyAmt; // 반품배송비금액 + private BigDecimal wonReturnDlvyAmt; // 반품배송비금액(원화) + private String returnDlvyTrgetCd; // 반품배송비수령대상코드 private String returnDlvyRspnsblCd; // 반품배송비지불책임코드 @@ -126,8 +128,6 @@ public class BOOrdrRefundVO extends AbstractVO { private BigDecimal dlvyAmtRefundAmt; // 배송비환불금액 - private BigDecimal wonDlvyAmtRefundAmt; // 배송비환불금액(원화) - private BigDecimal dlvyAmtRefundMlgAmt; // 배송비환불마일리지금액 private String secretKey; diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml index 9362958d..f44fa68c 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/ordr/BOOrdrMapper.xml @@ -1681,6 +1681,7 @@ , RETURN_CSTMR_TELNB , RETURN_CSTMR_MBTLNB , RETURN_DLVY_AMT + , WON_RETURN_DLVY_AMT , RETURN_DLVY_TRGET_CD , RETURN_DLVY_RSPNSBL_CD , RETURN_DLVY_PYMNT_TY_CD @@ -1697,7 +1698,6 @@ , MNGR_MEMO_CN , MNGR_INNB , DLVY_AMT_REFUND_AMT - , WON_DLVY_AMT_REFUND_AMT , DLVY_AMT_REFUND_MLG_AMT , USE_AT , REGIST_DT @@ -1748,6 +1748,7 @@ , HEX(AES_ENCRYPT(REPLACE(#{returnCstmrTelnb}, '-', ''), '1df5be2f7e90ae36')) , HEX(AES_ENCRYPT(REPLACE(#{returnCstmrMbtlnb}, '-', ''), '1df5be2f7e90ae36')) , #{returnDlvyAmt} + , #{wonReturnDlvyAmt} , #{returnDlvyTrgetCd} , #{returnDlvyRspnsblCd} , #{returnDlvyPymntTyCd} @@ -1764,7 +1765,6 @@ , #{mngrMemoCn} , #{mngrInnb} , #{dlvyAmtRefundAmt} - , #{wonDlvyAmtRefundAmt} , #{dlvyAmtRefundMlgAmt} , 'Y' , SYSDATE() diff --git a/src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml index 47c793bd..bf08a05d 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/ordr/rtngudrefnd/BORtngudrefndMapper.xml @@ -842,7 +842,7 @@ CASE WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN CASE - WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.DLVY_AMT_REFUND_AMT, 0), 0) + WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.RETURN_DLVY_AMT, 0), 0) WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0) END ELSE @@ -860,7 +860,7 @@ CASE WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN CASE - WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.DLVY_AMT_REFUND_AMT, 0), 0) + WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.REFUND_AMT - IFNULL(RE.RETURN_DLVY_AMT, 0), 0) WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.REFUND_AMT + IFNULL(RE.REFUND_DLVY_AMT, 0), 0) END ELSE @@ -878,7 +878,7 @@ CASE WHEN RE.RETURN_DLVY_PYMNT_TY_CD = '02' THEN CASE - WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.WON_REFUND_AMT - IFNULL(RE.WON_DLVY_AMT_REFUND_AMT, 0), 0) + WHEN RE.RETURN_DLVY_RSPNSBL_CD = '01' THEN GREATEST(RE.WON_REFUND_AMT - IFNULL(RE.WON_RETURN_DLVY_AMT, 0), 0) WHEN RE.RETURN_DLVY_RSPNSBL_CD = '02' THEN GREATEST(RE.WON_REFUND_AMT + IFNULL(RE.WON_REFUND_DLVY_AMT, 0), 0) END ELSE @@ -909,6 +909,7 @@ )) , 0) AS RL_DLVY_AMT_REFUND_AMT -- 반품 배송비 , FN_GET_COMMCODE_NAME('SETLE_MTH', ST.SETLE_TY_CD) AS SETLE_TY_CD_NM + , ROUND(ST.WON_SETLE_AMT) AS WON_SETLE_AMT FROM (SELECT REI.SOPMAL_CD , REI.ORDER_REFUND_INNB , ROUND(SUM(REI.GOODS_REFUND_AMT)) AS REFUND_AMT -- * REI.REFUND_QY diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp index 0fbfb8ae..f9a5fb43 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp @@ -369,13 +369,13 @@ $('input[name="prosbleCancelAmt"]').on('input', function() { - console.log("엄ㄴ아런밍럼니;아러"); fn_mlg_display_ctrl(); }); function rlRefundAmtProcessing() { - + let rlSetleAmt = parseAmount('${resultMap.result.totRefundDscntAmt.rlSetleAmt}'); + let wonSetleAmt = parseAmount('${resultMap.result.totRefundDscntAmt.wonSetleAmt}'); let refundTyCd = ''; let returnMthCd = $('input[name="returnMthCd"]:checked').val(); // 반품 방법 코드 let refundDlvyAmt = ''; // 환불 배송비 금액 @@ -523,31 +523,38 @@ rlRefundAmt = rlRefundAmt > 0 ? rlRefundAmt : 0; $('.rlRefundAmt').text(formatWithComma(rlRefundAmt)); + /*엔화 비율을 구해서 한화환불금액 계산*/ + console.log("rlRefundAmt:",rlRefundAmt,"rlSetleAmt:",rlSetleAmt,"wonSetleAmt:",wonSetleAmt); + let wonRlRefundAmt = Math.ceil((rlRefundAmt / rlSetleAmt) * wonSetleAmt); + wonRlRefundAmt = wonRlRefundAmt > 0 ? wonRlRefundAmt : 0; + $('.wonRlRefundAmt').text(formatWithComma(wonRlRefundAmt)); } function rlRefundAmtProcessingInput() { - let refundTyCd = ''; - let returnMthCd = $('input[name="returnMthCd"]:checked').val(); // 반품 방법 코드 - let refundDlvyAmt = ''; // 환불 배송비 금액 - let returnDlvyRspnsblCd = $('input[name="returnDlvyRspnsblCd"]:checked').val(); - let returnDlvyPymntTyCd = $('select[name="returnDlvyPymntTyCd"] option:selected').val(); // 반품 지불 방법 코드 - let returnDlvyAmt = $('input[name="returnDlvyAmt"]').val(); // 반품 배송비 금액 - let returnDlvyAmtStdr = $('input[name="returnDlvyAmtStdr"]').val(); // 반품 배송비 금액 + let rlSetleAmt = parseAmount('${resultMap.result.totRefundDscntAmt.rlSetleAmt}'); + let wonSetleAmt = parseAmount('${resultMap.result.totRefundDscntAmt.wonSetleAmt}'); + let refundTyCd = ''; + let returnMthCd = $('input[name="returnMthCd"]:checked').val(); // 반품 방법 코드 + let refundDlvyAmt = ''; // 환불 배송비 금액 + let returnDlvyRspnsblCd = $('input[name="returnDlvyRspnsblCd"]:checked').val(); + let returnDlvyPymntTyCd = $('select[name="returnDlvyPymntTyCd"] option:selected').val(); // 반품 지불 방법 코드 + let returnDlvyAmt = $('input[name="returnDlvyAmt"]').val(); // 반품 배송비 금액 + let returnDlvyAmtStdr = $('input[name="returnDlvyAmtStdr"]').val(); // 반품 배송비 금액 - let refundMltAmt = 0; - refundMltAmt = parseAmount(refundMltAmt); + let refundMltAmt = 0; + refundMltAmt = parseAmount(refundMltAmt); - let refundCashAmt = 0; - refundCashAmt = parseAmount(refundCashAmt); + let refundCashAmt = 0; + refundCashAmt = parseAmount(refundCashAmt); - let refundAmt = 0; // 최종 환불 금액 + let refundAmt = 0; // 최종 환불 금액 - let setleAmtGoods = 0; - let setleAmtMlg = 0; - let setleAmtCash = 0; + let setleAmtGoods = 0; + let setleAmtMlg = 0; + let setleAmtCash = 0; $('input[name="goodsRefundAmt"]').each(function(idx) { @@ -673,6 +680,13 @@ rlRefundAmt = rlRefundAmt > 0 ? rlRefundAmt : 0; $('.rlRefundAmt').text(formatWithComma(rlRefundAmt)); + /*엔화 비율을 구해서 한화환불금액 계산*/ + console.log("rlRefundAmt:",rlRefundAmt,"rlSetleAmt:",rlSetleAmt,"wonSetleAmt:",wonSetleAmt); + let wonRlRefundAmt = Math.ceil((rlRefundAmt / rlSetleAmt) * wonSetleAmt); + wonRlRefundAmt = wonRlRefundAmt > 0 ? wonRlRefundAmt : 0; + $('.wonRlRefundAmt').text(formatWithComma(wonRlRefundAmt)); + + } $('#returnDlvyPymntTyCd').on('change', function() { @@ -1505,6 +1519,7 @@ +
@@ -2739,9 +2754,8 @@ - 결제내역 - - + 결제내역 + @@ -2790,6 +2804,29 @@

+ + 환불내역(원화 기준) + + 실결제 금액 : + + + ${curUnit} + / + + + ${krUnit} + | + 환불 금액 : + + + ${curUnit} + / + + + ${krUnit} + + +