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
289747b6
Commit
289747b6
authored
Mar 26, 2025
by
Smile
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug338 报价单-结果-关联订单没有更新业绩
parent
e3b97634
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+1
-1
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 @
289747b6
...
@@ -1005,7 +1005,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
...
@@ -1005,7 +1005,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
public
int
checkOrderSalesman
(
OrderDO
order
,
Long
offerId
,
CustomerDO
consignorDO
,
CustomerDO
consigneeDO
,
OrderConsignorDO
orderConsignorDO
,
OrderConsigneeDO
orderConsigneeDO
)
{
public
int
checkOrderSalesman
(
OrderDO
order
,
Long
offerId
,
CustomerDO
consignorDO
,
CustomerDO
consigneeDO
,
OrderConsignorDO
orderConsignorDO
,
OrderConsigneeDO
orderConsigneeDO
)
{
order
.
setHasConsignee
(
Objects
.
nonNull
(
orderConsigneeDO
));
// 订单是否填写了收货人
int
customerType
=
1
;
//1-业绩归属发货人,2-业绩归属收货人
int
customerType
=
1
;
//1-业绩归属发货人,2-业绩归属收货人
if
(
Objects
.
isNull
(
orderConsigneeDO
))
{
//订单收货人
if
(
Objects
.
isNull
(
orderConsigneeDO
))
{
//订单收货人
orderConsigneeDO
=
orderConsigneeService
.
getOne
(
new
LambdaQueryWrapper
<
OrderConsigneeDO
>().
eq
(
OrderConsigneeDO:
:
getOrderId
,
order
.
getOrderId
()).
orderByDesc
(
OrderConsigneeDO:
:
getId
).
last
(
"limit 1"
));
orderConsigneeDO
=
orderConsigneeService
.
getOne
(
new
LambdaQueryWrapper
<
OrderConsigneeDO
>().
eq
(
OrderConsigneeDO:
:
getOrderId
,
order
.
getOrderId
()).
orderByDesc
(
OrderConsigneeDO:
:
getId
).
last
(
"limit 1"
));
...
@@ -1019,6 +1018,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
...
@@ -1019,6 +1018,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if
(
Objects
.
isNull
(
consigneeDO
)
&&
Objects
.
nonNull
(
orderConsigneeDO
))
{
if
(
Objects
.
isNull
(
consigneeDO
)
&&
Objects
.
nonNull
(
orderConsigneeDO
))
{
consigneeDO
=
customerService
.
getCustomer
(
orderConsigneeDO
.
getCustomerId
());
//收货人客户
consigneeDO
=
customerService
.
getCustomer
(
orderConsigneeDO
.
getCustomerId
());
//收货人客户
}
}
order
.
setHasConsignee
(
Objects
.
nonNull
(
orderConsigneeDO
));
// 订单是否填写了收货人
// 原客户经理
// 原客户经理
Long
orgCustomerId
=
Objects
.
isNull
(
order
.
getCustomerId
())
?
0L
:
order
.
getCustomerId
();
Long
orgCustomerId
=
Objects
.
isNull
(
order
.
getCustomerId
())
?
0L
:
order
.
getCustomerId
();
...
...
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