收货人为空时合单与拆单bug修复

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java

@@ -586,7 +586,7 @@ public class OrderDO extends BaseDO {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "收货人信息")
-    @NotNull(message = "收货人信息不能为空")
+//    @NotNull(message = "收货人信息不能为空")
     private OrderConsigneeDO orderConsigneeDO;
 
     @TableField(exist = false)

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/merge/MergeServiceImpl.java

@@ -517,7 +517,9 @@ public class MergeServiceImpl extends AbstractService<MergeMapper, MergeDO> impl
                 orderDO.setOrderNo(newOrderNo);
                 //将几个id设置成空  生成新的收货 发货人和始发 目的信息
                 orderDO.getOrderDepartureDO().setId(null);
-                orderDO.getOrderConsigneeDO().setId(null);
+                if (Objects.nonNull(orderDO.getOrderConsigneeDO())) {
+                    orderDO.getOrderConsigneeDO().setId(null);
+                }
                 orderDO.getOrderConsignorDO().setId(null);
                 orderDO.getOrderObjectiveDO().setId(null);
                 orderDO.setGuanLianOrderStatus(null);

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

@@ -3821,15 +3821,17 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         }
         // 订单收货人信息
         OrderConsigneeDO consigneeDO = orderDO.getOrderConsigneeDO();
-        consigneeDO.setUpdater(creator);
-        consigneeDO.setUpdateTime(now);
-        if (consigneeDO.getId() == null || consigneeDO.getId() <= 0L) {
-            consigneeDO.setCreator(creator);
-            consigneeDO.setCreateTime(now);
-            consigneeDO.setOrderId(orderDO.getOrderId());
-            orderConsigneeService.save(consigneeDO);
-        } else {
-            orderConsigneeService.updateById(consigneeDO);
+        if(Objects.nonNull(consigneeDO)) {
+            consigneeDO.setUpdater(creator);
+            consigneeDO.setUpdateTime(now);
+            if (consigneeDO.getId() == null || consigneeDO.getId() <= 0L) {
+                consigneeDO.setCreator(creator);
+                consigneeDO.setCreateTime(now);
+                consigneeDO.setOrderId(orderDO.getOrderId());
+                orderConsigneeService.save(consigneeDO);
+            } else {
+                orderConsigneeService.updateById(consigneeDO);
+            }
         }
         List<OrderItemDO> orderItemDOList = orderDO.getOrderItemDOList();
         // 订单控货人信息
@@ -4096,18 +4098,20 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         orderConsignorService.saveOrUpdate(consignorDO);
         // 订单收货人信息
         OrderConsigneeDO consigneeDO = orderDO.getOrderConsigneeDO();
-        if (Objects.nonNull(oldOrder)) {
-            OrderConsigneeDO oldConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, oldOrder.getOrderId()).last("limit 1"));
-            consigneeDO.setId(oldConsigneeDO.getId());
-        } else {
-            consigneeDO.setId(null);
-            consigneeDO.setCreator(creator);
-            consigneeDO.setCreateTime(now);
+        if (Objects.nonNull(consigneeDO)) {
+            if (Objects.nonNull(oldOrder)) {
+                OrderConsigneeDO oldConsigneeDO = orderConsigneeService.getOne(new LambdaQueryWrapper<OrderConsigneeDO>().eq(OrderConsigneeDO::getOrderId, oldOrder.getOrderId()).last("limit 1"));
+                consigneeDO.setId(oldConsigneeDO.getId());
+            } else {
+                consigneeDO.setId(null);
+                consigneeDO.setCreator(creator);
+                consigneeDO.setCreateTime(now);
+            }
+            consigneeDO.setUpdater(creator);
+            consigneeDO.setUpdateTime(now);
+            consigneeDO.setOrderId(orderDO.getOrderId());
+            orderConsigneeService.saveOrUpdate(consigneeDO);
         }
-        consigneeDO.setUpdater(creator);
-        consigneeDO.setUpdateTime(now);
-        consigneeDO.setOrderId(orderDO.getOrderId());
-        orderConsigneeService.saveOrUpdate(consigneeDO);
 
         // 订单控货人信息
         if (orderDO.getIsCargoControl()) {