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 f0f7ac1b..62bdb31c 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 @@ -1733,7 +1733,7 @@ , #{refundAcntDpstrNm} , REPLACE(#{refundAcntnb}, '-', '') , #{refundAmt} - , #{wonRefundAmt} + , ROUND((SELECT GO2.WON_RL_SETLE_AMT/GO2.RL_SETLE_AMT FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * ${refundAmt},0) , #{refundAccmlmnyAmt} , #{refundDlvyAmt} , #{wonRefundDlvyAmt} @@ -4866,7 +4866,9 @@ 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 bf08a05d..c0cfbdb2 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 @@ -570,8 +570,10 @@ RE.REFUND_ACNT_DPSTR_NM, RE.REFUND_ACNTNB, RE.REFUND_AMT, + RE.WON_REFUND_AMT, RE.REFUND_ACCMLMNY_AMT, RE.REFUND_DLVY_AMT, + RE.WON_REFUND_DLVY_AMT, RE.MLG_ACCMLMNY_AMT, RE.MLG_ACCMLMNY_VALID_DT, RE.ENURI_REVISN_AMT, @@ -597,6 +599,7 @@ IFNULL(REGEXP_REPLACE(CAST(AES_DECRYPT(UNHEX(RE.RETURN_CSTMR_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '(.{3})(.{4})(.{4})', '$1-$2-$3'), '') AS RETURN_CSTMR_MBTLNB, IFNULL(CAST(AES_DECRYPT(UNHEX(RE.RETURN_CSTMR_MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)), '') AS RETURN_CSTMR_MBTLNB_N_UNDER, FORMAT(ROUND(RE.RETURN_DLVY_AMT), 0) AS RETURN_DLVY_AMT, + FORMAT(ROUND(RE.WON_RETURN_DLVY_AMT), 0) AS WON_RETURN_DLVY_AMT, RE.RETURN_DLVY_TRGET_CD, RE.RETURN_DLVY_RSPNSBL_CD, RE.RETURN_DLVY_PYMNT_TY_CD, @@ -1063,7 +1066,8 @@ - + RETURN_DLVY_AMT = REPLACE(#{returnDlvyAmt}, ',', ''), + WON_RETURN_DLVY_AMT = ROUND((SELECT GO2.WON_RL_SETLE_AMT/GO2.RL_SETLE_AMT FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * REPLACE(#{returnDlvyAmt}, ',', ''), 0) , @@ -1142,7 +1146,8 @@ - + REFUND_AMT = #{refundAmt}, + WON_REFUND_AMT = ROUND((SELECT GO2.WON_RL_SETLE_AMT/GO2.RL_SETLE_AMT FROM GC_ORDER GO2 WHERE GO2.SOPMAL_CD = #{sopmalCd} AND GO2.ORDR_INNB = #{ordrInnb}) * #{refundAmt}, 0) , MNGR_INNB = #{updusr}, UPDT_DT = SYSDATE() 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 f9a5fb43..f6931df9 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 @@ -468,10 +468,8 @@ if (returnDlvyRspnsblCd === '01') { // 구매자 if (returnMthCd === '01') { // 고객이 배송 - - returnDlvyAmt = returnDlvyAmtStdr - refundDlvyAmt > 0 ? returnDlvyAmtStdr - refundDlvyAmt : 0; - - $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmt)); + // returnDlvyAmt = returnDlvyAmtStdr - refundDlvyAmt > 0 ? returnDlvyAmtStdr - refundDlvyAmt : 0; + // $('input[name="returnDlvyAmt"]').val(formatWithComma(returnDlvyAmt)); } else if (returnMthCd === '02') { // 상점이 회수 // $('input[name="returnDlvyAmt"]').val(formatWithComma($('input[name="returnDlvyAmt"]').val())); } else { diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp index 9875c17b..de902f01 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp @@ -98,11 +98,6 @@ const checkLength = $(row).find('input[name="goodsCheck"]:checked').length; - /** 결제 확인상태인 경우 개별취소 불가*/ - if ('${order.ordrSttusCd}' == '25'){ - alert('결제확인 상태에서는 전체 취소만 가능합니다.'); - return false; - } if (checkLength === 0) { alert('결제취소/환불 하실 상품을 선택해 주십시요.');