zelong.shao

customer|运单号校验

......@@ -34,6 +34,7 @@ public enum ResponseCode {
MESSAGE_CODE_30014(30014,"business_exception_30014"),
MESSAGE_CODE_30015(30015,"business_success_30015"),
MESSAGE_CODE_30016(30016,"business_exception_30016"),
MESSAGE_CODE_30017(30017,"business_exception_30017"),
/******打个样,编写样例*****/
// MESSAGE_CODE_30001(30001,"business_exception_30001"),
......
......@@ -58,6 +58,11 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
* @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
*/
public ResponseVo add(AddBo bo, User user){
ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto();
if (StringUtils.isEmpty(bo.getConsignmentCode()) || !bo.getConsignmentCode().matches("\\d{12}")) {
consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
return responseUtils.success(ResponseCode.MESSAGE_CODE_30004, consignmentAddDto);
}
//查询运单表是否存在已提交的运单
LocalDate thirtyDaysAgo = LocalDate.now().minusDays(30);
Consignment consignment = consignmentRepository.findByConsignmentCode(bo.getConsignmentCode(),thirtyDaysAgo);
......@@ -65,7 +70,6 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
* 不存在则直接返回
*/
if (consignment == null){
ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto();
consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ZERO);
if (!StringUtils.isEmpty(bo.getShipperAccount())){
if (Objects.equals(user.getAccountNo(),bo.getShipperAccount())){
......@@ -91,7 +95,6 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
* 非501数据
*/
if (StringUtils.isEmpty(bo.getShipperAccount())){
ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto();
consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_ZERO);
return responseUtils.success(consignmentAddDto);
}
......
......@@ -45,4 +45,5 @@ business_exception_30012=UUID不一致
business_exception_30013=文件名为:{0},上传失败,请检查后重试
business_exception_30014=运单信息加载失败,请稍后重试
business_success_30015=上传成功
business_exception_30016=运单提交失败
\ No newline at end of file
business_exception_30016=运单提交失败
business_exception_30017=运单号填写错误
\ No newline at end of file
......
......@@ -45,4 +45,5 @@ business_exception_30012=UUID不一致
business_exception_30013=文件名为:{0},上传失败,请检查后重试
business_exception_30014=运单信息加载失败,请稍后重试
business_success_30015=上传成功
business_exception_30016=运单提交失败
\ No newline at end of file
business_exception_30016=运单提交失败
business_exception_30017=运单号填写错误
\ No newline at end of file
......