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
54164d5c
Commit
54164d5c
authored
May 29, 2024
by
liuzeheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
fd533229
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+10
-2
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 @
54164d5c
...
@@ -599,6 +599,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
...
@@ -599,6 +599,11 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// customerType = 2;
// customerType = 2;
// order.setCustomerId(orderConsigneeDO.getCustomerId());
// order.setCustomerId(orderConsigneeDO.getCustomerId());
// }
// }
// 补充业绩规则判断
if
(!
consignorCustomerDO
.
getNoConsignee
()
&&
!
order
.
getHasConsignee
()){
//发货人档案设置控货无收货人且订单无收获人,归属发货人业绩 -- 层级2
order
.
setCustomerId
(
orderConsignorDO
.
getCustomerId
())
;
}
else
{
if
(
order
.
getDrawee
()
==
1
)
{
//发货人付款
if
(
order
.
getDrawee
()
==
1
)
{
//发货人付款
if
(
order
.
getDrawee
()
==
1
&&
createReqVO
.
getOfferId
()!=
null
)
{
//如果是发货人付款且关联报价单,业绩归属发货人 --层级3 第一个
if
(
order
.
getDrawee
()
==
1
&&
createReqVO
.
getOfferId
()!=
null
)
{
//如果是发货人付款且关联报价单,业绩归属发货人 --层级3 第一个
...
@@ -665,11 +670,14 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
...
@@ -665,11 +670,14 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
order
.
setSalesmanId
(
0L
);
order
.
setSalesmanId
(
0L
);
}
}
}
//end
}
}
//end
// 更新所属客户经理(业务员)
// 更新所属客户经理(业务员)
if
(!
OrderStatusEnum
.
DRAFT
.
getValue
().
equals
(
order
.
getStatus
())
&&
Objects
.
nonNull
(
order
.
getCustomerId
())
&&
order
.
getCustomerId
()
>
0
)
{
if
(!
OrderStatusEnum
.
DRAFT
.
getValue
().
equals
(
order
.
getStatus
())
&&
Objects
.
nonNull
(
order
.
getCustomerId
())
&&
order
.
getCustomerId
()
>
0
)
{
//addOrderCustomerService(order, customerType);
//addOrderCustomerService(order, customerType);
...
...
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