diff --git a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java index e780f90b..4a6105bd 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/ordr/ordr/vo/BOOrdrShippingVO.java @@ -40,6 +40,9 @@ public class BOOrdrShippingVO extends AbstractVO { /** 받는자휴대폰번호 */ private String recpntMbtlnb; + /** 개인통관부호 */ + private String cstmclerCd; + /** 배송지역코드 */ private String dlvylcAreaCd; diff --git a/src/main/java/com/wb/domainserver/domain/mngr/ordr/ordrmngr/controller/OrdrmngrController.java b/src/main/java/com/wb/domainserver/domain/mngr/ordr/ordrmngr/controller/OrdrmngrController.java index 97b4722f..499e0f7b 100644 --- a/src/main/java/com/wb/domainserver/domain/mngr/ordr/ordrmngr/controller/OrdrmngrController.java +++ b/src/main/java/com/wb/domainserver/domain/mngr/ordr/ordrmngr/controller/OrdrmngrController.java @@ -1061,6 +1061,14 @@ public class OrdrmngrController { throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource)); } + String cstmclerCd = ordrShippingVO.getCstmclerCd(); + String cstmclerCdReg = "^P\\d{12}$"; + if (cstmclerCd == null || cstmclerCd.trim().isEmpty()) { + throw new WnbtRestException("개인통관번호은(는) 필수 입력값입니다."); + }else if (!cstmclerCd.matches(cstmclerCdReg)) { + throw new WnbtRestException("개인통관번호는 P로 시작하는 13자리 부호만 입력할 수 있습니다."); + } + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); ordrShippingVO.setUpdusr(user.getUserInnb()); 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 6f67a7a9..f764b131 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 @@ -2042,6 +2042,7 @@ ELSE CAST(AES_DECRYPT(UNHEX(FOS.RECPNT_MBTLNB), '1df5be2f7e90ae36') AS CHAR(50)) END AS RECPNT_MBTLNB + , FOS.CSTMCLER_CD , FOS.DLVYLC_ZIP , FOS.DLVYLC_ADRES_DV_CD , CASE WHEN FOS.DLVYLC_ADRES_DV_CD = '01' @@ -2391,6 +2392,9 @@ SET FOS.RECPNT_NM = #{recpntNm} , FOS.RECPNT_TELNB = HEX(AES_ENCRYPT(REPLACE(#{recpntTelnb}, '-', ''), '1df5be2f7e90ae36')) , FOS.RECPNT_MBTLNB = HEX(AES_ENCRYPT(REPLACE(#{recpntMbtlnb}, '-', ''), '1df5be2f7e90ae36')) + + , FOS.CSTMCLER_CD = #{cstmclerCd} + , FOS.DLVYLC_ZIP = #{dlvylcZip} , FOS.DLVYLC_ADRES_DV_CD = #{dlvylcAdresDvCd} , FOS.DLVYLC_LNB_ADRES = #{dlvylcLnbAdres} diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp index 2e4abc22..5b84378d 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp @@ -1518,7 +1518,10 @@ $("#overlay").fadeOut(); if (!data.responseJSON.resBody.message) { - alert(''); + if(!data.responseJSON.resBody.result) + alert(''); + else + alert(data.responseJSON.resBody.result); } else { if (fn_check_json(data.responseJSON.resBody.message)) { const errorObject = JSON.parse(data.responseJSON.resBody.message); diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlShippingR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlShippingR.jsp index d551523d..bcf4863d 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlShippingR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlShippingR.jsp @@ -63,7 +63,9 @@ - + + + @@ -103,6 +105,12 @@ + 개인통관부호 + +
+ +
+