Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
edc2d31b 1 parent 45dfeea3

biz-customer | 修改 | 运单查询逻辑处理 

mt
2024年12月24日15:36:39
Inline Side-by-side
Showing 1 changed file with 3 additions and 4 deletions
...@@ -27,12 +27,11 @@ public class ConsignmentQueryUtil { ...@@ -27,12 +27,11 @@ public class ConsignmentQueryUtil {
27 Consignment resultConsignment = null; 27 Consignment resultConsignment = null;
28 if(Objects.nonNull(consignment)){ 28 if(Objects.nonNull(consignment)){
29 //uuid相同，则将运单所有信息返回给到前端 29 //uuid相同，则将运单所有信息返回给到前端
30 - if(userConsignmentInfoQuery.getUserUuid().equals(consignment.getUserUuid()) || 30 + if((Objects.nonNull(userConsignmentInfoQuery.getUserUuid()) && userConsignmentInfoQuery.getUserUuid().equals(consignment.getUserUuid())) ||
31 - userConsignmentInfoQuery.getShipperAccount().equals(consignment.getShipperAccount())){ 31 + (Objects.nonNull(userConsignmentInfoQuery.getShipperAccount()) && userConsignmentInfoQuery.getShipperAccount().equals(consignment.getShipperAccount()))){
32 //1：如果运单UUID与登录账号UUID相同或者用户shipperAccount与运单shipperAccount相同，则显示运单、收发件人信息，以及501信息 32 //1：如果运单UUID与登录账号UUID相同或者用户shipperAccount与运单shipperAccount相同，则显示运单、收发件人信息，以及501信息
33 resultConsignment = consignment; 33 resultConsignment = consignment;
34 - }else if(userConsignmentInfoQuery.getShipperAccount().equals(consignment.getUserInputShipperAccount()) || 34 + }else {
35 - userConsignmentInfoQuery.getUserId().equals(consignment.getCreateUserId())){
36 //如果运单UUID与登录账号UUID不同，用户shipperAccount与运单录入的shipperAccount一致，则只显示用户录入的运单号、shipperAccount、始发国 35 //如果运单UUID与登录账号UUID不同，用户shipperAccount与运单录入的shipperAccount一致，则只显示用户录入的运单号、shipperAccount、始发国
37 resultConsignment = new Consignment(); 36 resultConsignment = new Consignment();
38 resultConsignment.setId(consignment.getId()); 37 resultConsignment.setId(consignment.getId());
......