web-app下单对收货人校验规则的修改

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

@@ -519,6 +519,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                             .eq(CustomerContactsDO::getPhoneNew, memberUserDO.getMobile())
                             .eq(CustomerContactsDO::getAreaCode, memberUserDO.getAreaCode())).eq(CustomerContactsDO::getDeleted, 0).last("limit 1"));
         }
+        Boolean noConsignee = false;
         if (Objects.nonNull(customerContacts)) {
             //发货人联系人
             consignorCustomerDO = customerService.getCustomer(customerContacts.getCustomerId());
@@ -529,6 +530,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 if (consignorCountryDO != null) {
                     orderConsignorDO.setCountryAbbreviation(consignorCountryDO.getNameShort());
                 }
+                noConsignee = Objects.nonNull(consignorCustomerDO.getNoConsignee()) && consignorCustomerDO.getNoConsignee();
             }
             if (StringUtils.isBlank(customerContacts.getPhoneNew())) {
                 throw exception(CONSIGNOR_PHONE_NOT_NULL);
@@ -584,8 +586,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             orderCargoControlDO.setIsActual(Boolean.TRUE);
             orderCargoControlMapper.insert(orderCargoControlDO);
         }
-
-        OrderConsigneeDO orderConsigneeDO = new OrderConsigneeDO();
+        OrderConsigneeDO orderConsigneeDO = null;
+        // 当订单为控货订单，且发货人客户档案未设置控货无收货人，则需要校验收货人信息
+        if (order.getIsCargoControl() && !noConsignee) {
+            orderConsigneeDO = new OrderConsigneeDO();
             orderConsigneeDO.setOrderId(order.getOrderId());
             orderConsigneeDO.setCreator(creator);
             orderConsigneeDO.setUpdater(creator);
@@ -664,6 +668,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 }
             }
             orderConsigneeService.save(orderConsigneeDO);
+        }
         if (!Objects.equals(createReqVO.getStatus(), OrderStatusEnum.DRAFT.getValue())) {
             //customerType 发货人-1 收货人 2
             int customerType = this.checkOrderSalesman(order, createReqVO.getOfferId(), null, null, orderConsignorDO, orderConsigneeDO);