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
5a374142
Commit
5a374142
authored
Mar 21, 2025
by
honghy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug317 对已入仓的订单去编辑修改收货人号码时,未触发订单修改审批流程
parent
377a2267
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+2
-4
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @
5a374142
...
...
@@ -2679,8 +2679,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
applyInfoList
.
add
(
infoVO
);
}
// 发货人信息
if
(!
Objects
.
equals
(
orderConsignorBackVO
.
getCustomerContactsId
(),
consignorContactsDO
.
getId
())||(
Objects
.
equals
(
orderConsignorBackVO
.
getCustomerContactsId
(),
consignorContactsDO
.
getId
())
&&
!
StringUtils
.
equals
(
orderConsignorBackVO
.
getPhone
(),
consignorContactsDO
.
getPhoneNew
())))
{
if
(!
Objects
.
equals
(
orderConsignorBackVO
.
getCustomerContactsId
(),
updateReqVO
.
getConsignorContactsId
()))
{
// 发货人电话
if
(!
StringUtils
.
equals
(
orderConsignorBackVO
.
getPhone
(),
consignorContactsDO
.
getPhoneNew
())
||
!
StringUtils
.
equals
(
orderConsignorBackVO
.
getCountryCode
(),
consignorContactsDO
.
getAreaCode
()))
{
infoVO
=
new
ApplyInfoVO
();
...
...
@@ -2767,8 +2766,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeBackVO
.
setEmail
(
StringUtils
.
isNotBlank
(
updateReqVO
.
getConsigneeEmail
())
?
updateReqVO
.
getConsigneeEmail
()
:
""
);
applyInfoList
.
add
(
infoVO
);
}
if
(!
Objects
.
equals
(
orderConsigneeBackVO
.
getCustomerContactsId
(),
consigneeContactsDO
.
getId
())||(
Objects
.
equals
(
orderConsigneeBackVO
.
getCustomerContactsId
(),
consigneeContactsDO
.
getId
())
&&
!
StringUtils
.
equals
(
orderConsigneeBackVO
.
getPhone
(),
consigneeContactsDO
.
getPhoneNew
())))
{
if
(!
Objects
.
equals
(
orderConsigneeBackVO
.
getCustomerContactsId
(),
updateReqVO
.
getConsigneeContactsId
()))
{
// 收货人电话
if
(!
StringUtils
.
equals
(
orderConsigneeBackVO
.
getPhone
(),
consigneeContactsDO
.
getPhoneNew
())
||
!
StringUtils
.
equals
(
orderConsigneeBackVO
.
getCountryCode
(),
consigneeContactsDO
.
getAreaCode
()))
{
if
(
updateReqVO
.
getHasConsignee
()
&&
StringUtils
.
isNotBlank
(
consigneeContactsDO
.
getAreaCode
())
&&
...
...
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