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
9f4160b1
Commit
9f4160b1
authored
Dec 19, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单审批动态更新bug修复
parent
9bf6f6ac
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+5
-5
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 @
9f4160b1
...
...
@@ -4363,9 +4363,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
}
}
}
// 这里存在状态更新,当前订单如果无审批状态,且审批动态文案不为空时,需要重置审批动态文案为空字符串(避免订单更新时不执行null值更新)
if
(
currentOrderDO
.
getAuditType
()
==
0
&&
StringUtils
.
isNotBlank
(
currentOrderDO
.
getAuditResult
()))
{
currentOrderDO
.
setAuditResult
(
""
);
}
if
(
Objects
.
nonNull
(
auditType
))
{
//
TODO
这里可能出现并行的审批任务,当结束一个审批任务变更为0时,需要同步查询当前正在进行的其他审批任务
// 这里可能出现并行的审批任务,当结束一个审批任务变更为0时,需要同步查询当前正在进行的其他审批任务
currentOrderDO
.
setAuditType
(
auditType
);
currentOrderDO
.
setAuditResult
(
auditResult
);
if
(
StringUtils
.
isNotBlank
(
auditResult
))
{
...
...
@@ -4376,9 +4379,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
this
.
checkOrderProcessingApprovalType
(
currentOrderDO
,
auditType
,
auditResult
);
}
}
if
(
currentOrderDO
.
getAuditType
()
==
0
&&
StringUtils
.
isNotBlank
(
currentOrderDO
.
getAuditResult
()))
{
currentOrderDO
.
setAuditResult
(
""
);
}
orderMapper
.
updateById
(
currentOrderDO
);
// 完成入仓时设置入仓体积和入仓重量
...
...
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