bugfix-SAS-1990

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -1897,11 +1897,19 @@ public class AcceptCarriageOrderService {
         orderDetailVO.setLoadAddress(loadOrderAddress.getName());
         orderDetailVO.setLoadContacts(loadOrderAddress.getContacts());
         orderDetailVO.setLoadPhone(loadOrderAddress.getPhone());
-        orderDetailVO.setLoadAddressDetail(loadOrderAddress.getCityName() + loadOrderAddress.getDetailAddress());
+        if (loadOrderAddress.getDetailAddress().contains(loadOrderAddress.getCityName())) {
+            orderDetailVO.setLoadAddressDetail(loadOrderAddress.getDetailAddress());
+        } else {
+            orderDetailVO.setLoadAddressDetail(loadOrderAddress.getCityName() + loadOrderAddress.getDetailAddress());
+        }
         orderDetailVO.setUnloadAddress(unloadOrderAddress.getName());
         orderDetailVO.setUnloadContacts(unloadOrderAddress.getContacts());
         orderDetailVO.setUnloadPhone(unloadOrderAddress.getPhone());
-        orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getCityName() + unloadOrderAddress.getDetailAddress());
+        if (unloadOrderAddress.getDetailAddress().contains(unloadOrderAddress.getCityName())) {
+            orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getDetailAddress());
+        } else {
+            orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getCityName() + unloadOrderAddress.getDetailAddress());
+        }
         orderDetailVO.setSettlementCycle(logisticsOrder.getSettlementCycle() == null ? null : String.valueOf(logisticsOrder.getSettlementCycle()));
         orderDetailVO.setBillingMode(logisticsOrder.getBillingMode());
         orderDetailVO.setScheduleStartTime(logisticsOrder.getStartTime() == null ? null : logisticsOrder.getStartTime());