Commit 9f4160b1 authored by zhengyi's avatar zhengyi

订单审批动态更新bug修复

parent 9bf6f6ac
......@@ -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);
// 完成入仓时设置入仓体积和入仓重量
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment