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
29151dee
Commit
29151dee
authored
Aug 01, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入仓修改,客户归属信息不变的情况下,不再修改客户经理的业绩归属
parent
22b65ba4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+7
-6
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 @
29151dee
...
...
@@ -3724,12 +3724,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
OrderConsignorDO
orderConsignorDO
=
orderConsignorService
.
getOne
(
new
LambdaQueryWrapper
<
OrderConsignorDO
>().
eq
(
OrderConsignorDO:
:
getOrderId
,
orderDO
.
getOrderId
()).
last
(
"limit 1"
));
OrderConsigneeDO
orderConsigneeDO
=
orderConsigneeService
.
getOne
(
new
LambdaQueryWrapper
<
OrderConsigneeDO
>().
eq
(
OrderConsigneeDO:
:
getOrderId
,
orderDO
.
getOrderId
()).
last
(
"limit 1"
));
// 更新所属客户经理(业务员)
if
(
Objects
.
isNull
(
orderDO
.
getParentOrderId
())
||
orderDO
.
getParentOrderId
()
==
0
||
orderDO
.
getSplitSeparateOrder
())
{
// 拆单子订单不执行客户经理分配规则,以原单为主
if
(
Objects
.
nonNull
(
orderDO
.
getCustomerId
())
&&
orderDO
.
getCustomerId
()
>
0
)
{
addOrderCustomerService
(
orderDO
,
Objects
.
equals
(
orderConsignorDO
.
getCustomerId
(),
orderDO
.
getCustomerId
())
?
1
:
2
);
}
}
// TODO 2024-08-01 此处为入仓修改,客户归属信息不变的情况下,不再修改客户经理的业绩归属
// if (Objects.isNull(orderDO.getParentOrderId()) || orderDO.getParentOrderId() == 0 || orderDO.getSplitSeparateOrder()) {
// // 拆单子订单不执行客户经理分配规则,以原单为主
// if (Objects.nonNull(orderDO.getCustomerId()) && orderDO.getCustomerId() > 0) {
// addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2);
// }
// }
orderBusinessService
.
costCalculation
(
String
.
valueOf
(
SecurityFrameworkUtils
.
getLoginUserId
()),
orderDO
,
orderConsignorDO
.
getCustomerId
(),
orderConsigneeDO
.
getCustomerId
(),
orderConsignorDO
.
getCustomerContactsId
(),
orderConsigneeDO
.
getCustomerContactsId
(),
orderItemDOList
,
3
);
...
...
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