Commit 289747b6 authored by Smile's avatar Smile

bug338 报价单-结果-关联订单没有更新业绩

parent e3b97634
...@@ -1005,7 +1005,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1005,7 +1005,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
public int checkOrderSalesman(OrderDO order, Long offerId, CustomerDO consignorDO, CustomerDO consigneeDO, OrderConsignorDO orderConsignorDO, OrderConsigneeDO orderConsigneeDO) { public int checkOrderSalesman(OrderDO order, Long offerId, CustomerDO consignorDO, CustomerDO consigneeDO, OrderConsignorDO orderConsignorDO, OrderConsigneeDO orderConsigneeDO) {
order.setHasConsignee(Objects.nonNull(orderConsigneeDO)); // 订单是否填写了收货人
int customerType = 1; //1-业绩归属发货人,2-业绩归属收货人 int customerType = 1; //1-业绩归属发货人,2-业绩归属收货人
if (Objects.isNull(orderConsigneeDO)) {//订单收货人 if (Objects.isNull(orderConsigneeDO)) {//订单收货人
orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, order.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1")); orderConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, order.getOrderId()).orderByDesc(OrderConsigneeDO::getId).last("limit 1"));
...@@ -1019,6 +1018,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -1019,6 +1018,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
if (Objects.isNull(consigneeDO) && Objects.nonNull(orderConsigneeDO)) { if (Objects.isNull(consigneeDO) && Objects.nonNull(orderConsigneeDO)) {
consigneeDO = customerService.getCustomer(orderConsigneeDO.getCustomerId());//收货人客户 consigneeDO = customerService.getCustomer(orderConsigneeDO.getCustomerId());//收货人客户
} }
order.setHasConsignee(Objects.nonNull(orderConsigneeDO)); // 订单是否填写了收货人
// 原客户经理 // 原客户经理
Long orgCustomerId = Objects.isNull(order.getCustomerId()) ? 0L : order.getCustomerId(); Long orgCustomerId = Objects.isNull(order.getCustomerId()) ? 0L : order.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