Skip to content

J
jiedao-api-boot-master
Commit 1ccbae41 authored by zhengyi's avatar zhengyi
Browse files
Options

审批详情获取状态判断，返回值修正

parent 5d218482
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java
View file @ 1ccbae41
...@@ -569,7 +569,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont ...@@ -569,7 +569,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
@Override @Override
public OrderCargoControlApplyVO approvalOrderCargoControlPickLimitUpdateByOrderId(Long orderId) { public OrderCargoControlApplyVO approvalOrderCargoControlPickLimitUpdateByOrderId(Long orderId) {
OrderApprovalDO orderApprovalDO = orderApprovalMapper.orderApprovalInfoByOrderIdAndType(orderId, 61); OrderApprovalDO orderApprovalDO = orderApprovalMapper.orderApprovalInfoByOrderIdAndType(orderId, 61);
if (Objects.isNull(orderApprovalDO)) { if (Objects.isNull(orderApprovalDO) || orderApprovalDO.getStatus() > 1) {
OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderId); OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderId);
OrderCargoControlApplyVO orderCargoControlApplyVO = new OrderCargoControlApplyVO(); OrderCargoControlApplyVO orderCargoControlApplyVO = new OrderCargoControlApplyVO();
BeanUtils.copyProperties(releaseInfoDto, orderCargoControlApplyVO); BeanUtils.copyProperties(releaseInfoDto, orderCargoControlApplyVO);
...@@ -585,7 +585,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont ...@@ -585,7 +585,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
@Override @Override
public OrderCargoControlApplyVO approvalOrderCargoControlOverseasWarehouseUpdateByOrderId(Long orderId) { public OrderCargoControlApplyVO approvalOrderCargoControlOverseasWarehouseUpdateByOrderId(Long orderId) {
OrderApprovalDO orderApprovalDO = orderApprovalMapper.orderApprovalInfoByOrderIdAndType(orderId, 62); OrderApprovalDO orderApprovalDO = orderApprovalMapper.orderApprovalInfoByOrderIdAndType(orderId, 62);
if (Objects.isNull(orderApprovalDO)) { if (Objects.isNull(orderApprovalDO) || orderApprovalDO.getStatus() > 1) {
OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderId); OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderId);
OrderCargoControlApplyVO orderCargoControlApplyVO = new OrderCargoControlApplyVO(); OrderCargoControlApplyVO orderCargoControlApplyVO = new OrderCargoControlApplyVO();
BeanUtils.copyProperties(releaseInfoDto, orderCargoControlApplyVO); BeanUtils.copyProperties(releaseInfoDto, orderCargoControlApplyVO);
......
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