Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17

clx-performance-web/src/main/java/com/clx/performance/service/impl/PendingFreightServiceImpl.java

@@ -86,7 +86,7 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
 
         if(pendingFreightOptional.isPresent()){
             PendingFreight pendingFreight = pendingFreightOptional.get();
-            pendingFreight.setId(pendingFreight.getId());
+            item.setId(pendingFreight.getId());
 
             if(!Objects.equals(pendingFreight.getSendAddressId(),data.getSendAddressId())
             || !Objects.equals(pendingFreight.getReceiveAddressId(),data.getReveiveAddressId())){
@@ -95,13 +95,13 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
                 FeignAddressVO.Address sendAddress = sendAndReceiveAddress.get().getSendAddress();
                 FeignAddressVO.Address receiveAddress = sendAndReceiveAddress.get().getReceiveAddress();
 
-                pendingFreight.setSendAddress(addressService.generateAddressDetail(sendAddress.getProvince(),
+                item.setSendAddress(addressService.generateAddressDetail(sendAddress.getProvince(),
                         sendAddress.getCity(),sendAddress.getCounty(),sendAddress.getAddress()));
                 //计算重车运距
-                pendingFreight.setOrderDistance(calcOrderDistance(sendAddress,receiveAddress,data.getOrderNo()));
+                item.setOrderDistance(calcOrderDistance(sendAddress,receiveAddress,data.getOrderNo()));
 
             }
-            pendingFreightDao.updateEntityByKey(pendingFreight);
+            pendingFreightDao.updateEntityByKey(item);
         }else{
             item.setOrderNo(data.getOrderNo());