Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
73066888
Commit
73066888
authored
Mar 17, 2025
by
Smile
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug320web/app当控货订单是分批放货时才需弹出截图中的提示
parent
4971096c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
OrderQueryServiceImpl.java
...odule/order/service/order/impl/OrderQueryServiceImpl.java
+3
-3
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java
View file @
73066888
...
@@ -3858,10 +3858,10 @@ public class OrderQueryServiceImpl implements OrderQueryService {
...
@@ -3858,10 +3858,10 @@ public class OrderQueryServiceImpl implements OrderQueryService {
if
(
Objects
.
isNull
(
dto
)){
if
(
Objects
.
isNull
(
dto
)){
return
success
(
false
);
return
success
(
false
);
}
}
// 判断发货人是否是当前登录人
// 判断发货人是否是当前登录人
2025-03-17新增手机号或判断,因为也能根据手机号查询出来订单
Long
customerContactsId
=
dto
.
getConsignorVO
().
getCustomerContactsId
();
Long
customerContactsId
=
dto
.
getConsignorVO
().
getCustomerContactsId
();
CustomerContactsDO
customerContactsDO
=
customerContactsService
.
getById
(
customerContactsId
);
CustomerContactsDO
customerContactsDO
=
customerContactsService
.
getById
(
customerContactsId
);
if
(
Objects
.
equals
(
customerContactsDO
.
getUserid
(),
user
.
getId
())){
if
(
Objects
.
equals
(
customerContactsDO
.
getUserid
(),
user
.
getId
())
||
Objects
.
equals
(
customerContactsDO
.
getPhoneNew
(),
user
.
getMobile
())
){
return
success
(
true
);
return
success
(
true
);
}
}
Long
customerContactsId1
=
dto
.
getConsigneeVO
().
getCustomerContactsId
();
Long
customerContactsId1
=
dto
.
getConsigneeVO
().
getCustomerContactsId
();
...
@@ -3881,7 +3881,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
...
@@ -3881,7 +3881,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
}
}
}
}
isFirstAllAllow
=
(
count
==
1
);
// 最终判断是否严格等于1
isFirstAllAllow
=
(
count
==
1
);
// 最终判断是否严格等于1
if
(
dto
.
getSumNum
()==
dto
.
getReleaseNum
()&&
dto
.
getCargoControlStatus
()==
1
&&
isFirstAllAllow
&&
msg
.
contains
(
String
.
valueOf
(
customerContactsDO1
.
getPhoneNew
()))
&&
customerContactsDO1
.
getUserid
().
equals
(
user
.
getId
(
))){
if
(
dto
.
getSumNum
()==
dto
.
getReleaseNum
()&&
dto
.
getCargoControlStatus
()==
1
&&
isFirstAllAllow
&&
msg
.
contains
(
String
.
valueOf
(
customerContactsDO1
.
getPhoneNew
()))
&&
(
customerContactsDO1
.
getUserid
().
equals
(
user
.
getId
())||
customerContactsDO1
.
getPhoneNew
().
equals
(
user
.
getMobile
()
))){
return
success
(
true
);
return
success
(
true
);
}
}
return
success
(
false
);
return
success
(
false
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment