Skip to content

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

订单控货且有收货人才限制修改收货人业务bug修复

parent 196deb73
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ da71d7ea
...@@ -612,7 +612,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -612,7 +612,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
// 当订单为控货订单，且发货人客户档案未设置控货无收货人，则需要校验收货人信息 // 当订单为控货订单，且发货人客户档案未设置控货无收货人，则需要校验收货人信息
if (!order.getIsCargoControl() || hasConsignee) { if (!order.getIsCargoControl() || hasConsignee) {
// 控货订单有收货人则限制修改收货人 // 控货订单有收货人则限制修改收货人
if (order.getIsCargoControl()) { if (order.getIsCargoControl() && hasConsignee) {
order.setIsLimitUpdateConsignee(Boolean.TRUE); order.setIsLimitUpdateConsignee(Boolean.TRUE);
} else { } else {
order.setIsLimitUpdateConsignee(Boolean.FALSE); order.setIsLimitUpdateConsignee(Boolean.FALSE);
...@@ -706,7 +706,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -706,7 +706,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeService.save(orderConsigneeDO); orderConsigneeService.save(orderConsigneeDO);
} else { } else {
// 控货订单没有收货人则不限制修改收货人 // 控货订单没有收货人则不限制修改收货人
if (order.getIsCargoControl() && !hasConsignee) { if (order.getIsCargoControl() && hasConsignee) {
order.setIsLimitUpdateConsignee(Boolean.TRUE); order.setIsLimitUpdateConsignee(Boolean.TRUE);
} else { } else {
order.setIsLimitUpdateConsignee(Boolean.FALSE); order.setIsLimitUpdateConsignee(Boolean.FALSE);
...@@ -840,7 +840,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -840,7 +840,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
OrderConsigneeDO orderConsigneeDO = null; OrderConsigneeDO orderConsigneeDO = null;
if (!order.getIsCargoControl() || hasConsignee) { if (!order.getIsCargoControl() || hasConsignee) {
// 控货订单有收货人则限制修改收货人 // 控货订单有收货人则限制修改收货人
if (order.getIsCargoControl()) { if (order.getIsCargoControl() && hasConsignee) {
order.setIsLimitUpdateConsignee(Boolean.TRUE); order.setIsLimitUpdateConsignee(Boolean.TRUE);
} else { } else {
order.setIsLimitUpdateConsignee(Boolean.FALSE); order.setIsLimitUpdateConsignee(Boolean.FALSE);
...@@ -960,7 +960,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -960,7 +960,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
} else { } else {
// 控货订单没有收货人则不限制修改收货人 // 控货订单没有收货人则不限制修改收货人
if (order.getIsCargoControl() && !hasConsignee) { if (order.getIsCargoControl() && hasConsignee) {
order.setIsLimitUpdateConsignee(Boolean.TRUE); order.setIsLimitUpdateConsignee(Boolean.TRUE);
} else { } else {
order.setIsLimitUpdateConsignee(Boolean.FALSE); order.setIsLimitUpdateConsignee(Boolean.FALSE);
...@@ -3253,7 +3253,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3253,7 +3253,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, updateObj.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1")); OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, updateObj.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
if (!updateObj.getIsCargoControl() || hasConsignee) { if (!updateObj.getIsCargoControl() || hasConsignee) {
// 控货订单有收货人则限制修改收货人 // 控货订单有收货人则限制修改收货人
if (updateObj.getIsCargoControl()) { if (updateObj.getIsCargoControl() && hasConsignee) {
updateObj.setIsLimitUpdateConsignee(Boolean.TRUE); updateObj.setIsLimitUpdateConsignee(Boolean.TRUE);
} else { } else {
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE); updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
...@@ -3342,7 +3342,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3342,7 +3342,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderConsigneeDO = null; orderConsigneeDO = null;
} }
// 控货订单没有收货人则不限制修改收货人 // 控货订单没有收货人则不限制修改收货人
if (updateObj.getIsCargoControl() && !hasConsignee) { if (updateObj.getIsCargoControl() && hasConsignee) {
updateObj.setIsLimitUpdateConsignee(Boolean.TRUE); updateObj.setIsLimitUpdateConsignee(Boolean.TRUE);
} else { } else {
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE); updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
...@@ -3495,7 +3495,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3495,7 +3495,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (!updateObj.getIsCargoControl() || hasConsignee) { if (!updateObj.getIsCargoControl() || hasConsignee) {
// 控货订单有收货人则限制修改收货人 // 控货订单有收货人则限制修改收货人
if (updateObj.getIsCargoControl()) { if (updateObj.getIsCargoControl() && hasConsignee) {
updateObj.setIsLimitUpdateConsignee(Boolean.TRUE); updateObj.setIsLimitUpdateConsignee(Boolean.TRUE);
} else { } else {
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE); updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
...@@ -3610,7 +3610,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -3610,7 +3610,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
consigneeDO = null; consigneeDO = null;
// 控货订单没有收货人则不限制修改收货人 // 控货订单没有收货人则不限制修改收货人
if (updateObj.getIsCargoControl() && !hasConsignee) { if (updateObj.getIsCargoControl() && hasConsignee) {
updateObj.setIsLimitUpdateConsignee(Boolean.TRUE); updateObj.setIsLimitUpdateConsignee(Boolean.TRUE);
} else { } else {
updateObj.setIsLimitUpdateConsignee(Boolean.FALSE); updateObj.setIsLimitUpdateConsignee(Boolean.FALSE);
......
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