更改接站信息

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderRepositoryServiceImpl.java

@@ -274,7 +274,10 @@ public class TradeOrderRepositoryServiceImpl implements TradeOrderRepositoryServ
             newDetail.setName(newVisitorId != null ? newVisitorId.getName() : (newVisitorId2 != null ? newVisitorId2.getName() : oldDetail.getName()));
             newDetail.setIdCard(newVisitorId != null ? newVisitorId.getCredentialNo() : (newVisitorId2 != null ? newVisitorId2.getCredentialNo() : oldDetail.getIdCard()) );
             newDetail.setTenantId(oldDetail.getTenantId());
-            newDetail.setPhone(newVisitorId != null ? newVisitorId.getMobile() : (newVisitorId2 != null ? newVisitorId2.getMobile() :  oldDetail.getPhone()));
+            String phone = (oldDetail.getPhone() != null && !oldDetail.getPhone().isEmpty()) ? oldDetail.getPhone()
+                    : ((newVisitorId != null && newVisitorId.getMobile() != null && !newVisitorId.getMobile().isEmpty()) ? newVisitorId.getMobile()
+                    : (newVisitorId2 != null && newVisitorId2.getMobile() != null && !newVisitorId2.getMobile().isEmpty()) ? newVisitorId2.getMobile() : null);
+            newDetail.setPhone(phone);
             newDetail.setRemark(oldDetail.getRemark());
             newDetail.setStatus(oldDetail.getStatus());
             newDetail.setSignTime(oldDetail.getSignTime());