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
771f9571
Commit
771f9571
authored
Aug 23, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单修改审批业绩修正bug修复
Signed-off-by:
zhengyi
<
landuo321@aliyun.com
>
parent
ba43f75a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+1
-3
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 @
771f9571
...
...
@@ -2512,7 +2512,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
}
else
if
(
vo
.
getDrawee
()
==
2
)
{
//收货人付款 层级5 第一个
if
(
consigneeDO
!=
null
)
{
vo
.
setCustomerId
(
orderConsign
or
BackVO
.
getCustomerId
());
vo
.
setCustomerId
(
orderConsign
ee
BackVO
.
getCustomerId
());
}
else
{
//没有收货人
vo
.
setCustomerId
(
0L
);
...
...
@@ -2523,7 +2523,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
else
if
(
vo
.
getDrawee
()
==
3
)
{
//自定义付款
List
<
CustomDraweeVO
>
list
=
JSONObject
.
parseArray
(
vo
.
getCustomDrawee
(),
CustomDraweeVO
.
class
);
if
(
CollectionUtil
.
isNotEmpty
(
list
))
{
List
<
CustomDraweeVO
>
freightList
=
list
.
stream
().
filter
(
s
->
s
.
getName
().
equals
(
"freight"
)).
collect
(
Collectors
.
toList
());
List
<
CustomDraweeVO
>
clearanceFeeList
=
list
.
stream
().
filter
(
s
->
s
.
getName
().
equals
(
"clearanceFee"
)).
collect
(
Collectors
.
toList
());
int
freight
=
freightList
.
get
(
0
).
getValue
();
//运费
...
...
@@ -2545,7 +2544,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
else
{
//业绩归收货人
vo
.
setCustomerId
(
orderConsigneeBackVO
.
getCustomerId
()
!=
null
?
orderConsigneeBackVO
.
getCustomerId
()
:
0
);
customerType
=
2
;
}
}
...
...
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