diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java index 8d96c33f..f1fc514b 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOOrderService.java @@ -212,6 +212,7 @@ public class BOOrderService { dlvyMap.put("otrCouponSmtmUseAt", ""); dlvyMap.put("mngrFreeDlvyUseAt", "N"); dlvyMap.put("dlvylcAreaCd", shipping.get("dlvylcAreaCd")); + dlvyMap.put("cstmclerCd", shipping.get("cstmclerCd")); dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip")); dlvyMap.put("prefcd", shipping.get("prefcd")); dlvyMap.put("recpntNm", shipping.get("recpntNm")); @@ -254,6 +255,7 @@ public class BOOrderService { dlvyMap.put("otrCouponSmtmUseAt", ""); dlvyMap.put("mngrFreeDlvyUseAt", "N"); dlvyMap.put("dlvylcAreaCd", shipping.get("dlvylcAreaCd")); + dlvyMap.put("cstmclerCd", shipping.get("cstmclerCd")); dlvyMap.put("dlvylcZip", shipping.get("dlvylcZip")); dlvyMap.put("prefcd", shipping.get("prefcd")); dlvyMap.put("recpntNm", shipping.get("recpntNm")); @@ -1409,6 +1411,7 @@ public class BOOrderService { shippingVO.setRecpntMbtlnb((String) shipping.get("recpntMbtlnb")); shippingVO.setDlvylcAreaCd((String) shipping.get("dlvylcAreaCd")); + shippingVO.setCstmclerCd((String) shipping.get("cstmclerCd")); shippingVO.setPrefcd((String) shipping.get("prefcd")); shippingVO.setDlvylcZip((String) shipping.get("dlvylcZip")); shippingVO.setDlvylcAdresDvCd((String) shipping.get("dlvylcAdresDvCd")); @@ -1449,6 +1452,7 @@ public class BOOrderService { shippingVO.setRecpntMbtlnb(StringUtil.isNullToString(shipping.get("recpntMbtlnb"))); shippingVO.setDlvylcAreaCd(StringUtil.isNullToString(shipping.get("dlvylcAreaCd"))); + shippingVO.setCstmclerCd(StringUtil.isNullToString(shipping.get("cstmclerCd"))); shippingVO.setPrefcd(StringUtil.isNullToString(shipping.get("prefcd"))); shippingVO.setDlvylcZip(StringUtil.isNullToString(shipping.get("dlvylcZip"))); shippingVO.setDlvylcAdresDvCd(StringUtil.isNullToString(shipping.get("dlvylcAdresDvCd"))); diff --git a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderShippingVO.java b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderShippingVO.java index 6a642617..b04dc0a2 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderShippingVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/vo/BOOrderShippingVO.java @@ -28,6 +28,8 @@ public class BOOrderShippingVO extends AbstractVO { private String dlvylcAreaCd; + private String cstmclerCd; + private String dlvylcZip; private String prefcd; diff --git a/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml index d7d514ce..e8a16979 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/goods/purchs/BOPurchsMapper.xml @@ -387,6 +387,7 @@ , RECPNT_NM , RECPNT_MBTLNB , DLVYLC_AREA_CD + , CSTMCLER_CD , DLVYLC_ZIP , PREFCD , DLVYLC_ADRES_DV_CD @@ -425,6 +426,7 @@ , #{recpntNm} , HEX(AES_ENCRYPT(REPLACE(#{recpntMbtlnb}, '-', ''), '1df5be2f7e90ae36')) , #{dlvylcAreaCd} + , #{cstmclerCd} , #{dlvylcZip} , #{prefcd} , #{dlvylcAdresDvCd} 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 99982987..8de3bb39 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -705,6 +705,10 @@ $('#recpntMbtlnb').val($('#mbtlnb').val()); $('.recpntMbtlnb_ordrInfo_text').text($('#mbtlnb').val()); + + $('#cstmclerCd').val($('#cstmclerCd').val()); + $('.cstmclerCd_ordrInfo_text').text($('#cstmclerCd').val()); + } else { let data = { @@ -723,6 +727,8 @@ $('.recpntNm_ordrInfo_text').text($('#recpntNm').val()); $('#recpntMbtlnb').val(parseJson.dftDlvylc.mbtlnb); $('.recpntMbtlnb_ordrInfo_text').text($('#recpntMbtlnb').val()); + $('#cstmclerCd').val(parseJson.dftDlvylc.cstmclerCd); + $('.cstmclerCd_ordrInfo_text').text($('#cstmclerCd').val()); } }); @@ -1500,6 +1506,12 @@ html += ' '; html += ' '; html += ' '; + html += ' '; + html += ' 개인통관번호'; + html += ' '; + html += ' '; + html += ' '; + html += ' '; html += ' '; html += ' '; html += ' 배송요청사항'; @@ -1763,6 +1775,8 @@ $('.presentArea').hide(); $('.presentArea').find('input').prop('disabled', true); + $('.cstmclerArea').hide(); + $('.cstmclerArea').find('input').prop('disabled', true); $('.presentShowArea').show(); $('.presentShowArea').find('input').prop('disabled', false); @@ -1783,6 +1797,8 @@ if (dlvylcDvCd === 'New') { $('.presentArea').show(); $('.presentArea').find('input').prop('disabled', false); + $('.cstmclerArea').show(); + $('.cstmclerArea').find('input').prop('disabled', false); $('.presentShowArea').hide(); $('.presentShowArea').find('input').prop('disabled', true); } @@ -1833,6 +1849,17 @@ $(form).find('input[name="dlvylcAdresDtl"]').val(data.dtlAdres); $(form).find('input[name="dlvylcAdres"]').val('01' === $(form).find('input[name="dlvylcAdresDvCd"]').val() ? $(form).find('input[name="dlvylcRnmAdres"]').val() : $(form).find('input[name="dlvylcLnbAdres"]').val()); + let dlvylcAreaCd = $(form).find('input[name="dlvylcAreaCd"]').val(); + + if('JP' === dlvylcAreaCd){ + + $('.cstmclerArea').hide(); + $('.cstmclerArea').find('input').prop('disabled', true); + } else { + $('.cstmclerArea').show(); + $('.cstmclerArea').find('input').prop('disabled', false); + } + // 배송지 정보 세팅 이후 결제예정금액 재계산 fn_get_setle_amt(); } @@ -2701,15 +2728,43 @@ /* 선물하기 > 정합성 검사 종료 */ } else { + // console.log("dlvylcDvCd : ",dlvylcDvCd); if ('New' === dlvylcDvCd) { + const dlvylcAreaCd2 = $('#dlvylcForm').find('input[name="dlvylcAreaCd"]').val(); + console.log("dlvylcAreaCd(new) : ",dlvylcAreaCd2); + + $('#dlvylcForm').find('.rqrd').each(function () { const val = $(this).val(); if (fn_is_empty(val)) { const name = $(this).attr('name'); - const title = $(this).attr('title'); - alert(title + '을 입력해 주십시요'); + if('JP' !== dlvylcAreaCd2 || 'cstmclerCd' !== name ) { + const title = $(this).attr('title'); + + alert(title + '을 입력해 주십시요'); + + $('#dlvylcForm').find('input[name="' + name + '"]').focus(); + + isValid = false; + + return false; + } + } + }); + } else { + const dlvylcAreaCd = $('#dlvylcAreaCd').val(); + // console.log("dlvylcAreaCd(dft) : ",dlvylcAreaCd); + + if('KR' === dlvylcAreaCd){ + // console.log("KR"); + + const val = $('#cstmclerCd').val(); + + if (fn_is_empty(val)) { + + alert('개인통관번호를 입력해 주십시요'); $('#dlvylcForm').find('input[name="' + name + '"]').focus(); @@ -2717,7 +2772,7 @@ return false; } - }); + } } } @@ -3592,6 +3647,28 @@ + + + + 개인통관번호 + + "> + <%-- --%> + + + " placeholder="배송지 관리에서 입력하세요."> + + + " placeholder="배송지 관리에서 입력하세요." readonly> + + + + + + + "> + + @@ -3624,6 +3701,12 @@ + + 개인통관번호 + + + + 선물메세지 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 af7e5eec..7bdb7269 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 @@ -2496,7 +2496,7 @@ dlvylc = fn_get_dlvylc_data(); } - order['shipping'] = dlvylc; + setle['shipping'] = dlvylc; setle['sopmalCd'] = $('#sopmalCd').val(); setle['dlvylc'] = JSON.parse(localStorage.getItem('dlvylc'));