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
ee49523c
Commit
ee49523c
authored
Aug 03, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单入仓修改审批提交计算费用还是走的之前订单信息参数业务,如果有错误提示,那么捕获错误,允许提交审批
Signed-off-by:
zhengyi
<
landuo321@aliyun.com
>
parent
a352b551
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+7
-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 @
ee49523c
...
@@ -2218,8 +2218,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
...
@@ -2218,8 +2218,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderDO
.
setNumber
(
updateObj
.
getNumber
());
orderDO
.
setNumber
(
updateObj
.
getNumber
());
orderDO
.
setPackageRemarks
(
updateObj
.
getPackageRemarks
());
orderDO
.
setPackageRemarks
(
updateObj
.
getPackageRemarks
());
orderDO
.
setPackageType
(
updateObj
.
getPackageType
());
orderDO
.
setPackageType
(
updateObj
.
getPackageType
());
orderBusinessService
.
costCalculation
(
updater
,
orderDO
,
orderConsignorBackVO
.
getCustomerId
(),
orderConsigneeBackVO
.
getCustomerId
(),
orderConsignorBackVO
.
getCustomerContactsId
(),
orderConsigneeBackVO
.
getCustomerContactsId
(),
// TODO 这里计算费用还是走的之前订单信息参数业务,如果有错误提示,那么捕获错误,允许提交审批
orderItemDOList
,
8
);
try
{
orderBusinessService
.
costCalculation
(
updater
,
orderDO
,
orderConsignorBackVO
.
getCustomerId
(),
orderConsigneeBackVO
.
getCustomerId
(),
orderConsignorBackVO
.
getCustomerContactsId
(),
orderConsigneeBackVO
.
getCustomerContactsId
(),
orderItemDOList
,
8
);
}
catch
(
Exception
e
)
{
log
.
error
(
e
.
getMessage
());
}
if
(
Objects
.
nonNull
(
updateReqVO
.
getDisplayBillLadingPrice
())
&&
updateReqVO
.
getDisplayBillLadingPrice
()
!=
orderDO
.
getDisplayBillLadingPrice
())
{
if
(
Objects
.
nonNull
(
updateReqVO
.
getDisplayBillLadingPrice
())
&&
updateReqVO
.
getDisplayBillLadingPrice
()
!=
orderDO
.
getDisplayBillLadingPrice
())
{
// 是否显示提单价格的设置变动,添加变动日志
// 是否显示提单价格的设置变动,添加变动日志
// 记录货值变动日志
// 记录货值变动日志
...
...
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