Merge branch 'master-zhengyi' into dev

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

@@ -5860,20 +5860,14 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         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);
-//            }
-//        }
-
+        // 2024-08-08 当订单入仓完成，需要校验订单业绩归属客户方，当前是否在公海，是则业绩归属客户经理为空，否不需要修改
+        CustomerDO customerDO = customerService.getCustomer(orderDO.getCustomerId());
+        if (Objects.nonNull(customerDO) && customerDO.getIsInOpenSea() && Objects.nonNull(customerDO.getEnterOpenSeaTime())){
+            orderDO.setSalesmanId(0L);
+            orderDO.setDeptId(0L);
+            orderDO.setIsInOpenSea(customerDO.getIsInOpenSea());
+            orderMapper.updateById(orderDO);
+        }
         orderBusinessService.costCalculation(userId,
                 orderDO,
                 orderConsignorDO.getCustomerId(),