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
022aee9b
Commit
022aee9b
authored
Aug 07, 2024
by
332784038@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单创建与编辑时的业绩计算逻辑bug修复
parent
c6977c3d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
13 deletions
+0
-13
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+0
-13
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 @
022aee9b
...
...
@@ -2511,8 +2511,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if
(!
Objects
.
equals
(
vo
.
getCustomerId
(),
orderConsignorBackVO
.
getCustomerId
()))
{
// 海外仓归属发货人
customerType
=
1
;
vo
.
setCustomerId
(
orderConsignorBackVO
.
getCustomerId
());
}
}
else
{
...
...
@@ -2520,7 +2518,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
vo
.
setCustomerId
(
orderConsignorBackVO
.
getCustomerId
());
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consignorDO
)
||
Objects
.
isNull
(
consignorDO
.
getIsInOpenSea
())
?
false
:
consignorDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consignorDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
consignorDO
.
getIsInOpenSea
()
?
0L
:
(
consignorDO
.
getCustomerService
()
!=
null
&&
consignorDO
.
getIsCustomerServiceConfirmed
()
?
consignorDO
.
getCustomerService
()
:
0
));
}
else
{
OrderAssociationOfferInfoEvent
event
=
new
OrderAssociationOfferInfoEvent
(
vo
.
getOrderId
(),
null
);
applicationContext
.
publishEvent
(
event
);
...
...
@@ -2529,17 +2526,14 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
vo
.
setCustomerId
(
orderConsignorBackVO
.
getCustomerId
());
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consignorDO
)
||
Objects
.
isNull
(
consignorDO
.
getIsInOpenSea
())
?
false
:
consignorDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consignorDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
consignorDO
.
getIsInOpenSea
()
?
0L
:
(
consignorDO
.
getCustomerService
()
!=
null
&&
consignorDO
.
getIsCustomerServiceConfirmed
()
?
consignorDO
.
getCustomerService
()
:
0
));
}
else
if
(
vo
.
getDrawee
()
==
1
&&
consignorDO
.
getDefaultPay
())
{
// 如果是发货人付款且档案设置默认付运费 --层级4 第一个
vo
.
setCustomerId
(
orderConsignorBackVO
.
getCustomerId
());
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consignorDO
)
||
Objects
.
isNull
(
consignorDO
.
getIsInOpenSea
())
?
false
:
consignorDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consignorDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
consignorDO
.
getIsInOpenSea
()
?
0L
:
(
consignorDO
.
getCustomerService
()
!=
null
&&
consignorDO
.
getIsCustomerServiceConfirmed
()
?
consignorDO
.
getCustomerService
()
:
0
));
}
else
{
vo
.
setCustomerId
(
orderConsigneeBackVO
.
getCustomerId
()
!=
null
?
orderConsigneeBackVO
.
getCustomerId
()
:
0
);
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consigneeDO
)
||
Objects
.
isNull
(
consigneeDO
.
getIsInOpenSea
())
?
false
:
consigneeDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
Objects
.
isNull
(
consigneeDO
)
||
Objects
.
isNull
(
consigneeDO
.
getIsNew
())
?
1
:
(
consigneeDO
.
getIsNew
()
?
1
:
0
));
vo
.
setSalesmanId
(
Objects
.
nonNull
(
consigneeDO
.
getIsInOpenSea
())
&&
consigneeDO
.
getIsInOpenSea
()
?
0L
:
(
consigneeDO
.
getCustomerService
()
!=
null
&&
consigneeDO
.
getIsCustomerServiceConfirmed
()
?
consigneeDO
.
getCustomerService
()
:
0
));
customerType
=
2
;
}
}
else
if
(
vo
.
getDrawee
()
==
2
)
{
//收货人付款 层级5 第一个
...
...
@@ -2547,7 +2541,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
vo
.
setCustomerId
(
orderConsignorBackVO
.
getCustomerId
());
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consigneeDO
.
getIsInOpenSea
())
?
false
:
consigneeDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consigneeDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
Objects
.
nonNull
(
consigneeDO
.
getIsInOpenSea
())
&&
consigneeDO
.
getIsInOpenSea
()
?
0L
:
(
consigneeDO
.
getCustomerService
()
!=
null
&&
consigneeDO
.
getIsCustomerServiceConfirmed
()
?
consigneeDO
.
getCustomerService
()
:
0
));
}
else
{
//没有收货人
vo
.
setCustomerId
(
0L
);
...
...
@@ -2566,28 +2559,23 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
vo
.
setCustomerId
(
orderConsignorBackVO
.
getCustomerId
());
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consignorDO
)
||
Objects
.
isNull
(
consignorDO
.
getIsInOpenSea
())
?
false
:
consignorDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consignorDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
consignorDO
.
getIsInOpenSea
()
?
0L
:
(
consignorDO
.
getCustomerService
()
!=
null
&&
consignorDO
.
getIsCustomerServiceConfirmed
()
?
consignorDO
.
getCustomerService
()
:
0
));
}
else
if
(
event
.
getOfferId
()
!=
null
&&
(
vo
.
getDrawee
()
==
3
&&
clearanceFee
==
1
))
{
//层级3 第三个 订单关联报价单 && 自定义付款 且发货人付清关费
vo
.
setCustomerId
(
orderConsignorBackVO
.
getCustomerId
());
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consignorDO
)
||
Objects
.
isNull
(
consignorDO
.
getIsInOpenSea
())
?
false
:
consignorDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consignorDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
consignorDO
.
getIsInOpenSea
()
?
0L
:
(
consignorDO
.
getCustomerService
()
!=
null
&&
consignorDO
.
getIsCustomerServiceConfirmed
()
?
consignorDO
.
getCustomerService
()
:
0
));
}
else
if
(
consignorDO
.
getDefaultPay
()
&&
(
vo
.
getDrawee
()
==
3
&&
freight
==
1
))
{
//层级4 第二个 发货人档案设置默认付运费 且发货人付运费 业绩归属 发货人
vo
.
setCustomerId
(
orderConsignorBackVO
.
getCustomerId
());
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consignorDO
)
||
Objects
.
isNull
(
consignorDO
.
getIsInOpenSea
())
?
false
:
consignorDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consignorDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
consignorDO
.
getIsInOpenSea
()
?
0L
:
(
consignorDO
.
getCustomerService
()
!=
null
&&
consignorDO
.
getIsCustomerServiceConfirmed
()
?
consignorDO
.
getCustomerService
()
:
0
));
}
else
if
(
consignorDO
.
getDefaultPay
()
&&
(
vo
.
getDrawee
()
==
3
&&
clearanceFee
==
1
))
{
// 层级4 第三个 发货人档案设置默认付运费 且发货人付清关费 业绩归属发货人
vo
.
setCustomerId
(
orderConsignorBackVO
.
getCustomerId
());
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consignorDO
)
||
Objects
.
isNull
(
consignorDO
.
getIsInOpenSea
())
?
false
:
consignorDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consignorDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
consignorDO
.
getIsInOpenSea
()
?
0L
:
(
consignorDO
.
getCustomerService
()
!=
null
&&
consignorDO
.
getIsCustomerServiceConfirmed
()
?
consignorDO
.
getCustomerService
()
:
0
));
}
else
{
//去掉层级5、6 ,以上不符合的都归收货人
vo
.
setCustomerId
(
orderConsigneeBackVO
.
getCustomerId
()
!=
null
?
orderConsigneeBackVO
.
getCustomerId
()
:
0
);
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consigneeDO
)
||
Objects
.
isNull
(
consigneeDO
.
getIsInOpenSea
())
?
false
:
consigneeDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consigneeDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
Objects
.
nonNull
(
consigneeDO
.
getIsInOpenSea
())
&&
consigneeDO
.
getIsInOpenSea
()
?
0L
:
(
consigneeDO
.
getCustomerService
()
!=
null
&&
consigneeDO
.
getIsCustomerServiceConfirmed
()
?
consigneeDO
.
getCustomerService
()
:
0
));
customerType
=
2
;
}
}
...
...
@@ -2596,7 +2584,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
vo
.
setCustomerId
(
orderConsigneeBackVO
.
getCustomerId
()
!=
null
?
orderConsigneeBackVO
.
getCustomerId
()
:
0
);
vo
.
setIsInOpenSea
(
Objects
.
isNull
(
consigneeDO
)
||
Objects
.
isNull
(
consigneeDO
.
getIsInOpenSea
())
?
false
:
consigneeDO
.
getIsInOpenSea
());
vo
.
setYejiType
(
consigneeDO
.
getIsNew
()
?
1
:
0
);
vo
.
setSalesmanId
(
Objects
.
nonNull
(
consigneeDO
.
getIsInOpenSea
())
&&
consigneeDO
.
getIsInOpenSea
()
?
0L
:
(
consigneeDO
.
getCustomerService
()
!=
null
&&
consigneeDO
.
getIsCustomerServiceConfirmed
()
?
consigneeDO
.
getCustomerService
()
:
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