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-11-29 10:42:21 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f79ebc5c9e1fbce1d842f239c60be4f9bf1c9beb
f79ebc5c
1 parent
bf13bbe2
customer|add部分调整
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
9 deletions
server/biz-customer/src/main/java/com/fedex/connect/customer/service/biz/impl/ConsignmentServiceImpl.java
server/biz-customer/src/main/java/com/fedex/connect/customer/util/service/biz/ConsignmentUtil.java
server/biz-customer/src/main/java/com/fedex/connect/customer/service/biz/impl/ConsignmentServiceImpl.java
View file @
f79ebc5
package
com
.
fedex
.
connect
.
customer
.
service
.
biz
.
impl
;
import
com.fedex.connect.common.dependencies.contants.DigitConstants
;
import
com.fedex.connect.common.dependencies.date.vo.ResponseVo
;
import
com.fedex.connect.common.model.biz.*
;
import
com.fedex.connect.common.model.sys.User
;
import
com.fedex.connect.customer.data.bo.AddBo
;
import
com.fedex.connect.customer.data.bo.ConsignmentBo
;
import
com.fedex.connect.customer.data.dto.ConsignmentAddDto
;
import
com.fedex.connect.customer.enums.ResponseCode
;
import
com.fedex.connect.customer.service.base.BaseService
;
import
com.fedex.connect.customer.service.biz.IAttachmentService
;
...
...
@@ -62,20 +64,22 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
* 不存在则直接返回
*/
if
(
consignment
==
null
){
if
(!
StringUtils
.
isEmpty
(
bo
.
getShipperAccount
())){
ConsignmentAddDto
consignmentAddDto
=
new
ConsignmentAddDto
();
consignmentAddDto
.
setIsCreatorFlag
(
DigitConstants
.
DIGIT_ZERO
);
if
(!
StringUtils
.
isEmpty
(
bo
.
getShipperAccount
())){
if
(
Objects
.
equals
(
user
.
getAccountNo
(),
bo
.
getShipperAccount
())){
return
responseUtils
.
success
();
return
responseUtils
.
success
(
consignmentAddDto
);
}
else
{
/**
* 不存在运单,并且没有填写shipperAccount,则直接返回
*/
return
responseUtils
.
success
();
return
responseUtils
.
success
(
consignmentAddDto
);
}
}
else
{
/**
* 不存在运单,并且没有填写shipperAccount,则直接返回
*/
return
responseUtils
.
success
();
return
responseUtils
.
success
(
consignmentAddDto
);
}
}
/**
...
...
@@ -85,7 +89,7 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
/**
* 非501数据
*/
return
consignmentUtil
.
consignmentCheckWithNotCe
(
consignment
,
bo
,
user
);
return
consignmentUtil
.
consignmentCheckWithNotCe
(
consignment
,
bo
);
}
else
{
/**
* 501数据
...
...
server/biz-customer/src/main/java/com/fedex/connect/customer/util/service/biz/ConsignmentUtil.java
View file @
f79ebc5
...
...
@@ -95,17 +95,17 @@ public class ConsignmentUtil {
* @Date 2024/11/12
* @param consignment
* @param bo
* @param user
* @return void
*/
public
ResponseVo
consignmentCheckWithNotCe
(
Consignment
consignment
,
AddBo
bo
,
User
user
){
public
ResponseVo
consignmentCheckWithNotCe
(
Consignment
consignment
,
AddBo
bo
){
ConsignmentAddDto
consignmentAddDto
=
new
ConsignmentAddDto
();
consignmentAddDto
.
setConsignment
(
consignment
);
if
(
isShipperAccountMatch
(
bo
.
getShipperAccount
(),
consignment
.
getShipperAccount
())){
consignmentAddDto
.
setIsCreatorFlag
(
DigitConstants
.
DIGIT_ONE
);
return
responseUtils
.
success
(
consignmentAddDto
);
}
else
{
return
responseUtils
.
success
(
ResponseCode
.
MESSAGE_CODE_30011
);
consignmentAddDto
.
setIsCreatorFlag
(
DigitConstants
.
DIGIT_FOUR
);
return
responseUtils
.
success
(
ResponseCode
.
MESSAGE_CODE_30011
,
consignmentAddDto
);
}
}
...
...
@@ -143,6 +143,7 @@ public class ConsignmentUtil {
*/
if
(!
StringUtils
.
hasText
(
bo
.
getShipperAccount
())){
consignmentAddDto
.
setIsCreatorFlag
(
DigitConstants
.
DIGIT_TWO
);
consignmentAddDto
.
setConsignment
(
null
);
return
responseUtils
.
success
(
ResponseCode
.
MESSAGE_CODE_30012
,
consignmentAddDto
);
}
...
...
@@ -160,7 +161,9 @@ public class ConsignmentUtil {
consignmentAddDto
.
setIsCreatorFlag
(
DigitConstants
.
DIGIT_ONE
);
return
responseUtils
.
success
(
consignmentAddDto
);
}
else
{
return
responseUtils
.
success
(
ResponseCode
.
MESSAGE_CODE_30011
);
consignmentAddDto
.
setIsCreatorFlag
(
DigitConstants
.
DIGIT_FOUR
);
consignmentAddDto
.
setConsignment
(
null
);
return
responseUtils
.
success
(
ResponseCode
.
MESSAGE_CODE_30011
,
consignmentAddDto
);
}
}
...
...
Please
register
or
login
to post a comment