Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
iClear-Connect-Pre-Clearance
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
zelong.shao
2024-12-24 15:28:17 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
45dfeea33d0f77de3eea2224a2cf3fa53da86bb4
45dfeea3
1 parent
5f9a3751
customer|提示语调整
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
3 deletions
server/biz-customer/src/main/java/com/fedex/connect/customer/enums/ResponseCode.java
server/biz-customer/src/main/java/com/fedex/connect/customer/service/biz/impl/ConsignmentServiceImpl.java
server/biz-customer/src/main/resources/message_en_US.properties
server/biz-customer/src/main/resources/message_zh_CN.properties
server/biz-customer/src/main/java/com/fedex/connect/customer/enums/ResponseCode.java
View file @
45dfeea
...
...
@@ -37,6 +37,7 @@ public enum ResponseCode {
MESSAGE_CODE_30017
(
30017
,
"business_exception_30017"
),
MESSAGE_CODE_30018
(
30018
,
"business_exception_30018"
),
MESSAGE_CODE_30019
(
30019
,
"business_exception_30019"
),
MESSAGE_CODE_30020
(
30020
,
"business_exception_30020"
),
/******打个样,编写样例*****/
// MESSAGE_CODE_30001(30001,"business_exception_30001"),
...
...
server/biz-customer/src/main/java/com/fedex/connect/customer/service/biz/impl/ConsignmentServiceImpl.java
View file @
45dfeea
...
...
@@ -57,7 +57,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
}
if
(!
StringUtils
.
isEmpty
(
bo
.
getShipperAccount
())
&&
!
bo
.
getShipperAccount
().
matches
(
"\\d{9}"
))
{
consignmentAddDto
.
setIsCreatorFlag
(
DigitConstants
.
DIGIT_TWO
);
responseUtils
.
fail
(
ResponseCode
.
MESSAGE_CODE_3001
7
);
responseUtils
.
fail
(
ResponseCode
.
MESSAGE_CODE_3001
9
);
}
//查询运单表是否存在已提交的运单
LocalDate
thirtyDaysAgo
=
LocalDate
.
now
().
minusDays
(
30
);
...
...
@@ -74,7 +74,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
/**
* 不存在运单,并且没有填写shipperAccount,则直接返回
*/
return
responseUtils
.
success
(
consignmentAddDto
);
return
responseUtils
.
success
(
ResponseCode
.
MESSAGE_CODE_30020
,
consignmentAddDto
);
}
}
else
{
/**
...
...
server/biz-customer/src/main/resources/message_en_US.properties
View file @
45dfeea
...
...
@@ -48,3 +48,4 @@ business_exception_30016=运单提交失败,请联系管理员!
business_exception_30017
=
运单号填写错误
business_exception_30018
=
运单提交失败,该运单正在被其他用户操作,请稍后重试
business_exception_30019
=
Shipper Account填写错误
business_exception_30020
=
您的登录账号的shipperAccount与录入的shipperAccount不一致,请确认是否继续上传?
...
...
server/biz-customer/src/main/resources/message_zh_CN.properties
View file @
45dfeea
...
...
@@ -47,4 +47,5 @@ business_success_30015=上传成功
business_exception_30016
=
运单提交失败,请联系管理员!
business_exception_30017
=
运单号填写错误
business_exception_30018
=
运单提交失败,该运单正在被其他用户操作,请稍后重试
business_exception_30019
=
Shipper Account填写错误
\ No newline at end of file
business_exception_30019
=
Shipper Account填写错误
business_exception_30020
=
您的登录账号的shipperAccount与录入的shipperAccount不一致,请确认是否继续上传?
\ No newline at end of file
...
...
Please
register
or
login
to post a comment