diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java index b2ecab2f..8295f11d 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java @@ -1067,7 +1067,7 @@ public class MyMbrController { */ @Policy(AuthPolicy.RESTRICTED) @PostMapping(value="/updateDlvylcUpdt", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity updateDlvylcUpdt(@Validated DlvylcVO dlvylcVO, BOCrmDlvylcVO crmDlvylcVO, BindingResult bindingResult){ + public ResponseEntity updateDlvylcUpdt(@Validated DlvylcVO dlvylcVO, BindingResult bindingResult, BOCrmDlvylcVO crmDlvylcVO){ //입력값 정합성 점검결과 처리 if(bindingResult.hasErrors()) { throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource)); @@ -1078,7 +1078,19 @@ public class MyMbrController { mbtlnb = mbtlnb.replace("-", ""); int mbtlnbLen = mbtlnb.length(); if (!(mbtlnbLen >= 8 && mbtlnbLen <= 12)) { - throw new WnbtRestException("번호는 8자~12자 입니다."); + throw new WnbtRestException("휴대전화번호는 8자 이상 12자 이하만 입력할 수 있습니다."); + } + + //개인통관번호 정합성 체크 + if("KR".equals(crmDlvylcVO.getDlvylcAreaCd())) { + String cstmclerCd = crmDlvylcVO.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자리 부호만 입력할 수 있습니다."); + } } //도로명 지번 분기처리 하여 vo에 set함 @@ -1135,7 +1147,7 @@ public class MyMbrController { */ @Policy(AuthPolicy.RESTRICTED) @PostMapping(value="/insertDlvylcRegist", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity insertDlvylcRegist(@Validated DlvylcVO dlvylcVO, BOCrmDlvylcVO crmDlvylcVO, BindingResult bindingResult){ + public ResponseEntity insertDlvylcRegist(@Validated DlvylcVO dlvylcVO, BindingResult bindingResult, BOCrmDlvylcVO crmDlvylcVO){ //입력값 정합성 점검결과 처리 if(bindingResult.hasErrors()) { throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource)); @@ -1146,7 +1158,19 @@ public class MyMbrController { mbtlnb = mbtlnb.replace("-",""); int mbtlnbLen = mbtlnb.length(); if(!(mbtlnbLen >= 8 && mbtlnbLen <= 12)){ - throw new WnbtRestException("번호는 8자~12자 입니다."); + throw new WnbtRestException("휴대전화번호는 8자 이상 12자 이하만 입력할 수 있습니다."); + } + + //개인통관번호 정합성 체크 + if("KR".equals(crmDlvylcVO.getDlvylcAreaCd())) { + String cstmclerCd = crmDlvylcVO.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자리 부호만 입력할 수 있습니다."); + } } crmDlvylcVO.setServerDv("sopmal"); diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java index 17f3fcd6..f0486cb2 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/DlvylcVO.java @@ -17,9 +17,10 @@ public class DlvylcVO extends AbstractVO{ /**회원구분코드*/ private String mbrDvCd; /** 배송지설명내용 */ - @NotBlank(message = "배송지 설명") + @NotBlank(message = "배송지명") private String dlvylcDcCn; /**배송지역코드*/ + @NotBlank(message = "배송지역코드") private String dlvylcAreaCd; /** 받는사람명 */ @NotBlank(message = "받으시는 분") @@ -32,7 +33,7 @@ public class DlvylcVO extends AbstractVO{ private String telnb; /** 우편번호 */ @NotBlank(message = "우편번호") - @Length(min=1, max=7) + @Length(min=1, max=7, message="우편번호") private String zip; /** 도로명,지번 구분 */ private String adresDv;