空运订单预装分拣锁定价格与解锁价格时对客户业绩归属业务逻辑的变动修改

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -3679,8 +3679,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
             // 更新所属客户经理(业务员)
             if (!OrderStatusEnum.DRAFT.getValue().equals(updateObj.getStatus())
-                    && Objects.nonNull(updateObj.getCustomerId())
-                    && updateObj.getCustomerId() > 0) {
+                    && Objects.nonNull(updateObj.getIsChargeCustomer()) && updateObj.getIsChargeCustomer()) {
                 addOrderCustomerService(updateObj, customerType);
                 //setUpdateOrderCustomerServiceCustomerId(updateReqVO,  updateObj,consignorDO,consigneeDO,orderConsignorDO,orderConsigneeDO);
             }
@@ -6316,12 +6315,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"));
             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.nonNull(orderDO.getCustomerId()) && orderDO.getCustomerId() > 0) {
-                    addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2);
-                }
-            }
+//            if (Objects.isNull(orderDO.getParentOrderId()) || orderDO.getParentOrderId() == 0 || orderDO.getSplitSeparateOrder()) {
+//                // 拆单子订单不执行客户经理分配规则，以原单为主
+//                if (Objects.nonNull(orderDO.getCustomerId()) && orderDO.getCustomerId() > 0) {
+//                    addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2);
+//                }
+//            }
             orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(),
                     orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 16);
         }
@@ -6341,12 +6340,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"));
             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.nonNull(orderDO.getCustomerId()) && orderDO.getCustomerId() > 0) {
-                    addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2);
-                }
-            }
+//            if (Objects.isNull(orderDO.getParentOrderId()) || orderDO.getParentOrderId() == 0 || orderDO.getSplitSeparateOrder()) {
+//                // 拆单子订单不执行客户经理分配规则，以原单为主
+//                if (Objects.nonNull(orderDO.getCustomerId()) && orderDO.getCustomerId() > 0) {
+//                    addOrderCustomerService(orderDO, Objects.equals(orderConsignorDO.getCustomerId(), orderDO.getCustomerId()) ? 1 : 2);
+//                }
+//            }
             orderBusinessService.costCalculation(userId, orderDO, orderConsignorDO.getCustomerId(), orderConsigneeDO.getCustomerId(),
                     orderConsignorDO.getCustomerContactsId(), orderConsigneeDO.getCustomerContactsId(), orderItemDOList, 17);
         }