1.修复分包托运地址管理bug

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

@@ -1761,8 +1761,8 @@ public class KwtLogisticsOrderConsignmentService {
                 if (address.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
                     continue;
                 }
-                if (parentLoadOrderMap.get(address.getAddressId()) != null) {
-                    KwtLogisticsOrderAddress loadAddressData = parentLoadOrderMap.get(address.getAddressId());
+                if (parentLoadOrderMap.get(Long.parseLong(address.getAddressId())) != null) {
+                    KwtLogisticsOrderAddress loadAddressData = parentLoadOrderMap.get(Long.parseLong(address.getAddressId()));
                     KwtLogisticsOrderAddress loadOrderAddress = new KwtLogisticsOrderAddress();
                     long addressId = new IdWorker(NumberConstant.ONE).nextId();
                     loadOrderAddress.setId(addressId);
@@ -1772,6 +1772,7 @@ public class KwtLogisticsOrderConsignmentService {
                     loadOrderAddress.setDetailAddress(loadAddressData.getDetailAddress());
                     loadOrderAddress.setContacts(loadAddressData.getContacts());
                     loadOrderAddress.setLOrderId(orderId);
+                    loadOrderAddress.setSort(address.getSort());
                     loadOrderAddress.setLat(loadAddressData.getLat());
                     loadOrderAddress.setFence(loadAddressData.getFence());
                     loadOrderAddress.setCityName(loadAddressData.getCityName());
@@ -1829,8 +1830,8 @@ public class KwtLogisticsOrderConsignmentService {
                 if (address.getAmount().compareTo(new BigDecimal("0.00")) == 0) {
                     continue;
                 }
-                if (parentLoadOrderMap.get(address.getAddressId()) != null) {
-                    KwtLogisticsOrderAddress loadAddressData = parentLoadOrderMap.get(address.getAddressId());
+                if (parentUnloadOrderMap.get(Long.parseLong(address.getAddressId())) != null) {
+                    KwtLogisticsOrderAddress loadAddressData = parentUnloadOrderMap.get(Long.parseLong(address.getAddressId()));
                     KwtLogisticsOrderAddress unloadOrderAddress = new KwtLogisticsOrderAddress();
                     long addressId = new IdWorker(NumberConstant.ONE).nextId();
                     unloadOrderAddress.setId(addressId);
@@ -1856,6 +1857,7 @@ public class KwtLogisticsOrderConsignmentService {
                     unloadOrderAddress.setLng(loadAddressData.getLng());
                     unloadOrderAddress.setRemark(loadAddressData.getRemark());
                     unloadOrderAddress.setStatus(loadAddressData.getStatus());
+                    unloadOrderAddress.setSort(address.getSort());
                     logisticsOrderAddressMapper.insert(unloadOrderAddress);
 
                     KwtLogisticsOrderAmount orderAmount = new KwtLogisticsOrderAmount();