Skip to content

J
jiedao-api-boot-master
Commit e967483c authored by 332784038@qq.com's avatar 332784038@qq.com
Browse files
Options

Merge branch 'master-fix' into dev

parents 961528a4 140dacde
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @ e967483c
...@@ -6257,17 +6257,17 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -6257,17 +6257,17 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1")); new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
// 更新所属客户经理(业务员) // 更新所属客户经理(业务员)
if (Objects.isNull(orderDO.getParentOrderId()) || // if (Objects.isNull(orderDO.getParentOrderId()) ||
orderDO.getParentOrderId() == 0 || // orderDO.getParentOrderId() == 0 ||
orderDO.getSplitSeparateOrder()) { // orderDO.getSplitSeparateOrder()) {
// 拆单子订单不执行客户经理分配规则，以原单为主 // // 拆单子订单不执行客户经理分配规则，以原单为主
if (Objects.nonNull(orderDO.getCustomerId()) && // if (Objects.nonNull(orderDO.getCustomerId()) &&
orderDO.getCustomerId() > 0) { // orderDO.getCustomerId() > 0) {
addOrderCustomerService(orderDO, // addOrderCustomerService(orderDO,
Objects.equals(orderConsignorDO.getCustomerId(), // Objects.equals(orderConsignorDO.getCustomerId(),
orderDO.getCustomerId()) ? 1 : 2); // orderDO.getCustomerId()) ? 1 : 2);
} // }
} // }
orderBusinessService.costCalculation(userId, orderBusinessService.costCalculation(userId,
orderDO, orderDO,
...@@ -6286,12 +6286,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -6286,12 +6286,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1")); OrderConsignorDO orderConsignorDO = orderConsignorService.getOne(new LambdaQueryWrapper<OrderConsignorDO>().eq(OrderConsignorDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsignorDO::getId).last("limit 1"));
OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1")); OrderConsigneeDO orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, orderDO.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
// 更新所属客户经理(业务员) // 更新所属客户经理(业务员)
if (Objects.isNull(orderDO.getParentOrderId()) || orderDO.getParentOrderId() == 0 || orderDO.getSplitSeparateOrder()) { // if (Objects.isNull(orderDO.getParentOrderId()) || orderDO.getParentOrderId() == 0 || orderDO.getSplitSeparateOrder()) {
// 拆单子订单不执行客户经理分配规则，以原单为主 // // 拆单子订单不执行客户经理分配规则，以原单为主
if (Objects.nonNull(orderDO.getCustomerId()) && orderDO.getCustomerId() > 0) { // if (Objects.nonNull(orderDO.getCustomerId()) && orderDO.getCustomerId() > 0) {
addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2); // addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2);
} // }
} // }
orderBusinessService.costCalculation(userId, orderBusinessService.costCalculation(userId,
orderDO, orderDO,
orderConsignorDO.getCustomerId(), orderConsignorDO.getCustomerId(),
......
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