From bcf64f0f92fcb393d6984008930f6d3efbe55dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Wed, 11 Feb 2026 11:44:45 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=A3=BC=EB=AC=B8=EA=B2=B0=EC=A0=9C?= =?UTF-8?q?=20>=20=EB=B0=B0=EC=86=A1=EC=A7=80=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=84=B8=ED=8C=85=20-=20=EB=B0=B0=EC=86=A1=EC=A7=80=EC=97=AD?= =?UTF-8?q?=EC=BD=94=EB=93=9C,=20=EA=B0=9C=EC=9D=B8=ED=86=B5=EA=B4=80?= =?UTF-8?q?=EB=B6=80=ED=98=B8,=20=EB=8F=84=EB=8F=84=EB=B6=80=ED=98=84?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/gcone/ordr/ordr/BOOrdrMapper.xml | 5 ++- src/main/resources/static/js/dlvylc/dlvylc.js | 3 ++ .../static/js/mngr/js/crm/dlvylc/dlvylc_2.js | 3 ++ .../static/mngr/js/crm/dlvylc/dlvylc.js | 3 ++ .../static/mngr/js/crm/dlvylc/dlvylc_2.js | 3 ++ .../sopmal/mpage/mbr/DlvylcManagePopupR.jsp | 3 ++ .../sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp | 4 +- .../WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp | 25 +++++++---- .../sopmal_m/mpage/mbr/DlvylcManagePopupR.jsp | 3 ++ .../sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp | 4 +- .../views/sopmal_m/ordr/MbrPurchsC.jsp | 44 +++++++++++-------- 11 files changed, 68 insertions(+), 32 deletions(-) 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 ef93c24c..becbc289 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 @@ -79,14 +79,17 @@ MBR_INNB, MBR_DV_CD, DLVYLC_DC_CN, + DLVYLC_AREA_CD, RECPNT_NM, CAST(AES_DECRYPT(UNHEX(MBTLNB) , '1df5be2f7e90ae36') AS CHAR(50)) AS MBTLNB, ADRES_DV, LNB_ADRES, RNM_ADRES, DTL_ADRES, + CSTMCLER_CD, DFT_DLVYLC_AT, - ZIP + ZIP, + PREFCD ORDER BY (CASE WHEN DFT_DLVYLC_AT = 'Y' THEN 1 ELSE 2 END), ADBK_INNB DESC diff --git a/src/main/resources/static/js/dlvylc/dlvylc.js b/src/main/resources/static/js/dlvylc/dlvylc.js index d1ddd4bf..ae937240 100644 --- a/src/main/resources/static/js/dlvylc/dlvylc.js +++ b/src/main/resources/static/js/dlvylc/dlvylc.js @@ -370,6 +370,9 @@ const fn_update_dlvylc = function (pageIndex,msg,isMobile) { jibunAddress: $(".lnbAdres").eq(index).val(), recpntNm: $(".recpntNmR").eq(index).val(), dtlAdres: $(".dtlAdres").eq(index).val(), + dlvylcAreaCd: $(".dlvylcAreaCd").eq(index).val(), + prefcd: $(".prefcd").eq(index).val(), + cstmclerCd: $(".cstmclerCd").eq(index).val(), mbtlnb: $(".mbtlnb").eq(index).val(), extraAddress: extraAddress }, formId); diff --git a/src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js b/src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js index 6f043da2..bdc41a2e 100644 --- a/src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js +++ b/src/main/resources/static/js/mngr/js/crm/dlvylc/dlvylc_2.js @@ -319,6 +319,9 @@ const fn_select_mngrOrdr_postcode = function (callback, index, formId = '') { jibunAddress: $(".lnbAdres").eq(index).val(), recpntNm: $(".recpntNmR").eq(index).val(), dtlAdres: $(".dtlAdres").eq(index).val(), + dlvylcAreaCd: $(".dlvylcAreaCd").eq(index).val(), + prefcd: $(".prefcd").eq(index).val(), + cstmclerCd: $(".cstmclerCd").eq(index).val(), mbtlnb: $(".dlvylcMbtlnb").eq(index).val(), extraAddress: extraAddress }, formId); diff --git a/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc.js b/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc.js index ea26b015..1c019389 100644 --- a/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc.js +++ b/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc.js @@ -309,6 +309,9 @@ const fn_select_mngrOrdr_postcode = function (callback, index) { jibunAddress: $(".lnbAdres").eq(index).val(), recpntNm: $(".recpntNmR").eq(index).val(), dtlAdres: $(".dtlAdres").eq(index).val(), + dlvylcAreaCd: $(".dlvylcAreaCd").eq(index).val(), + prefcd: $(".prefcd").eq(index).val(), + cstmclerCd: $(".cstmclerCd").eq(index).val(), mbtlnb: $(".dlvylcMbtlnb").eq(index).val(), extraAddress: extraAddress }); diff --git a/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js b/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js index 6f043da2..bdc41a2e 100644 --- a/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js +++ b/src/main/resources/static/mngr/js/crm/dlvylc/dlvylc_2.js @@ -319,6 +319,9 @@ const fn_select_mngrOrdr_postcode = function (callback, index, formId = '') { jibunAddress: $(".lnbAdres").eq(index).val(), recpntNm: $(".recpntNmR").eq(index).val(), dtlAdres: $(".dtlAdres").eq(index).val(), + dlvylcAreaCd: $(".dlvylcAreaCd").eq(index).val(), + prefcd: $(".prefcd").eq(index).val(), + cstmclerCd: $(".cstmclerCd").eq(index).val(), mbtlnb: $(".dlvylcMbtlnb").eq(index).val(), extraAddress: extraAddress }, formId); diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcManagePopupR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcManagePopupR.jsp index 834678e2..1042dc5e 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcManagePopupR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/DlvylcManagePopupR.jsp @@ -89,6 +89,9 @@ + + + diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp index 1517fda6..f92a8dbd 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/SubsvcOrdrDtlR.jsp @@ -1135,8 +1135,8 @@ ', '', '', '', '', '');" class="btn gray2">전체 결제취소 - - ');">반품신청 + + ');" class="btn gray2">구독취소 diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp index 7afbb31e..f5ba5394 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -1826,6 +1826,7 @@ $(form).find('input[name="dlvylcZip"]').val(data.postcode); $(form).find('input[name="dlvylcAreaCd"]').val(data.dlvylcAreaCd); $(form).find('input[name="prefcd"]').val(data.prefcd); + $(form).find('input[name="cstmclerCd"]').val(data.cstmclerCd); $(form).find('input[name="dlvylcAdresDvCd"]').val(data.addressType); $(form).find('input[name="dlvylcLnbAdres"]').val(data.jibunAddress); $(form).find('input[name="dlvylcRnmAdres"]').val(data.roadAddress); @@ -1834,6 +1835,9 @@ } } + + // 배송지 정보 세팅 이후 결제예정금액 재계산 + fn_get_setle_amt(); } /* 배송지정보 > 배송지 쿠폰 목록 조회 */ @@ -3530,11 +3534,12 @@ <%-- --%> - + <%--일본 배송지 추가 - 일부 기능 삭제--%> +<%-- --%> @@ -3573,7 +3578,7 @@ 받는분 - + 주소 @@ -3581,22 +3586,24 @@
- + <%--일본 배송지 추가 - 일부 기능 삭제--%> +<%-- --%>
- + +
휴대폰번호 - + diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/DlvylcManagePopupR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/DlvylcManagePopupR.jsp index 62dde40c..da903f40 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/DlvylcManagePopupR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/DlvylcManagePopupR.jsp @@ -132,6 +132,9 @@ + + + diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp index 03a4686f..19c1df4a 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/SubsvcOrdrDtlR.jsp @@ -676,8 +676,8 @@ ', '', '', '', '', '');" class="btn gray2">전체 결제취소 - - ');">반품신청 + + ');" class="btn gray2">구독취소 diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp index 267c0d14..285057b8 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp @@ -1822,6 +1822,7 @@ $(form).find('input[name="dlvylcZip"]').val(data.postcode); $(form).find('input[name="dlvylcAreaCd"]').val(data.dlvylcAreaCd); $(form).find('input[name="prefcd"]').val(data.prefcd); + $(form).find('input[name="cstmclerCd"]').val(data.cstmclerCd); $(form).find('input[name="dlvylcAdresDvCd"]').val(data.addressType); $(form).find('input[name="dlvylcLnbAdres"]').val(data.jibunAddress); $(form).find('input[name="dlvylcRnmAdres"]').val(data.roadAddress); @@ -1830,6 +1831,9 @@ $(form).find('input[name="recpntNm"]').val(data.recpntNm); $(form).find('input[name="recpntMbtlnb"]').val(fn_format_mbtlnb(data.mbtlnb)); closeModal('postModal'); + + // 배송지 정보 세팅 이후 결제예정금액 재계산 + fn_get_setle_amt(); } /** @@ -3633,11 +3637,12 @@
- + <%--일본 배송지 추가 - 일부 기능 삭제--%> +<%-- --%>

@@ -3708,14 +3713,15 @@

-
- -
+ <%--일본 배송지 추가 - 일부 기능 삭제--%> +<%--
--%> +<%-- --%> +<%--
--%> + <%--일본 배송지 추가 - 일부 기능 삭제--%> +<%-- --%>
<%--도로명 or 지명--%> - <%--상세주소--%> + <%--상세주소--%> +
휴대폰 번호
- +