Merge branch 'test' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

@@ -457,6 +457,10 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                         if (consigeeCustomer != null) {
                             orderConsigneeDO.setCustomerId(consigeeCustomer.getCustomerId());
                             orderConsigneeDO.setCustomerContactsId(consigeeCustomer.getId());
+                            CustomerDO customerDO = customerService.getCustomer(consigeeCustomer.getCustomerId());
+                            if (Objects.nonNull(customerDO)) {
+                                orderConsigneeDO.setCustomerNumber(customerDO.getNumber());
+                            }
                             orderConsigneeService.updateById(orderConsigneeDO);
 
                             // 并更新其他收货人
@@ -469,6 +473,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                                 for (OrderConsigneeDO consigneeDO : otherConsigneeDOList) {
                                     consigneeDO.setCustomerId(consigeeCustomer.getCustomerId());
                                     consigneeDO.setCustomerContactsId(consigeeCustomer.getId());
+                                    if (Objects.nonNull(customerDO)) {
+                                        orderConsigneeDO.setCustomerNumber(customerDO.getNumber());
+                                    }
                                     orderConsigneeService.updateById(consigneeDO);
                                 }
                             }