订单修改审批将无收货人修改为有收货人时保存收货人信息bug修复

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

@@ -2747,8 +2747,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                 }
                 infoVO = new ApplyInfoVO();
                 infoVO.setName("收货人电话/Consignee's phone number");
-                infoVO.setOrgValue("+" + orderConsigneeBackVO.getCountryCode() + orderConsigneeBackVO.getPhone());
-                infoVO.setNewValue("+" + consigneeContactsDO.getAreaCode() + consigneeContactsDO.getPhoneNew());
+                infoVO.setOrgValue(StringUtils.isBlank(orderConsigneeBackVO.getPhone())? "空": ("+" + orderConsigneeBackVO.getCountryCode() + orderConsigneeBackVO.getPhone()));
+                infoVO.setNewValue(StringUtils.isBlank(consigneeContactsDO.getPhoneNew())? "空": ("+" + consigneeContactsDO.getAreaCode() + consigneeContactsDO.getPhoneNew()));
                 orderConsigneeBackVO.setCountryCode(consigneeContactsDO.getAreaCode());
                 orderConsigneeBackVO.setPhone(consigneeContactsDO.getPhoneNew());
                 applyInfoList.add(infoVO);
@@ -5878,7 +5878,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
             }
         } else {
             if (Objects.nonNull(consigneeDO)) {
-                orderConsigneeService.updateById(consigneeDO);
+                // 这里可能是由无收货人修改为有收货人，主键id为null
+                orderConsigneeService.saveOrUpdate(consigneeDO);
                 if (orderBackVO.getIsCargoControl()) {
                     // 控货订单有收货人则限制修改收货人
                     isLimitUpdateConsignee = Boolean.TRUE;