Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
5f9a3751 1 parent 40a10854

customer|提示语调整

Inline Side-by-side
Showing 4 changed files with 9 additions and 2 deletions
...@@ -36,6 +36,7 @@ public enum ResponseCode { ...@@ -36,6 +36,7 @@ public enum ResponseCode {
36 MESSAGE_CODE_30016(30016,"business_exception_30016"), 36 MESSAGE_CODE_30016(30016,"business_exception_30016"),
37 MESSAGE_CODE_30017(30017,"business_exception_30017"), 37 MESSAGE_CODE_30017(30017,"business_exception_30017"),
38 MESSAGE_CODE_30018(30018,"business_exception_30018"), 38 MESSAGE_CODE_30018(30018,"business_exception_30018"),
39 + MESSAGE_CODE_30019(30019,"business_exception_30019"),
39 40
40 /******打个样，编写样例*****/ 41 /******打个样，编写样例*****/
41 // MESSAGE_CODE_30001(30001,"business_exception_30001"), 42 // MESSAGE_CODE_30001(30001,"business_exception_30001"),
......
...@@ -53,7 +53,11 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS ...@@ -53,7 +53,11 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
53 ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto(); 53 ConsignmentAddDto consignmentAddDto = new ConsignmentAddDto();
54 if (StringUtils.isEmpty(bo.getConsignmentCode()) || !bo.getConsignmentCode().matches("\\d{12}")) { 54 if (StringUtils.isEmpty(bo.getConsignmentCode()) || !bo.getConsignmentCode().matches("\\d{12}")) {
55 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO); 55 consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
56 - return responseUtils.success(ResponseCode.MESSAGE_CODE_30017, consignmentAddDto); 56 + responseUtils.fail(ResponseCode.MESSAGE_CODE_30017);
57 + }
58 + if (!StringUtils.isEmpty(bo.getShipperAccount()) && !bo.getShipperAccount().matches("\\d{9}")) {
59 + consignmentAddDto.setIsCreatorFlag(DigitConstants.DIGIT_TWO);
60 + responseUtils.fail(ResponseCode.MESSAGE_CODE_30017);
57 } 61 }
58 //查询运单表是否存在已提交的运单 62 //查询运单表是否存在已提交的运单
59 LocalDate thirtyDaysAgo = LocalDate.now().minusDays(30); 63 LocalDate thirtyDaysAgo = LocalDate.now().minusDays(30);
......
...@@ -47,3 +47,4 @@ business_success_30015=上传成功 ...@@ -47,3 +47,4 @@ business_success_30015=上传成功
47 business_exception_30016=运单提交失败，请联系管理员! 47 business_exception_30016=运单提交失败，请联系管理员!
48 business_exception_30017=运单号填写错误 48 business_exception_30017=运单号填写错误
49 business_exception_30018=运单提交失败，该运单正在被其他用户操作，请稍后重试 49 business_exception_30018=运单提交失败，该运单正在被其他用户操作，请稍后重试
50 +business_exception_30019=Shipper Account填写错误
......
...@@ -46,4 +46,5 @@ business_exception_30014=运单信息加载失败，请稍后重试 ...@@ -46,4 +46,5 @@ business_exception_30014=运单信息加载失败，请稍后重试
46 business_success_30015=上传成功 46 business_success_30015=上传成功
47 business_exception_30016=运单提交失败，请联系管理员! 47 business_exception_30016=运单提交失败，请联系管理员!
48 business_exception_30017=运单号填写错误 48 business_exception_30017=运单号填写错误
49 -business_exception_30018=运单提交失败，该运单正在被其他用户操作，请稍后重试
...\ No newline at end of file ...\ No newline at end of file
49 +business_exception_30018=运单提交失败，该运单正在被其他用户操作，请稍后重试
50 +business_exception_30019=Shipper Account填写错误
...\ No newline at end of file ...\ No newline at end of file
......