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

clx-performance-web/src/main/java/com/clx/performance/dao/PendingFreightDao.java

@@ -21,4 +21,6 @@ public interface PendingFreightDao extends BaseDao<PendingFreightMapper, Pending
     IPage<PendingFreight> pagePendingFreight(PagePendingFreightParam param);
 
     void updatePendingFreight(String orderNo, BigDecimal pendingFreight, BigDecimal avgPendingFreight);
+
+    void updateSameLineHistoryFreight(Integer sendAddressId, Integer receiveAddressId, BigDecimal historyFreight, BigDecimal avgHistoryFreight);
 }

clx-performance-web/src/main/java/com/clx/performance/dao/impl/PendingFreightDaoImpl.java

@@ -57,4 +57,16 @@ public class PendingFreightDaoImpl extends BaseDaoImpl<PendingFreightMapper, Pen
         update.eq(PendingFreight :: getOrderNo,orderNo);
         baseMapper.update(update);
     }
+
+    @Override
+    public void updateSameLineHistoryFreight(Integer sendAddressId, Integer receiveAddressId, BigDecimal historyFreight, BigDecimal avgHistoryFreight) {
+        LambdaUpdateWrapper<PendingFreight> update = new LambdaUpdateWrapper<>();
+        update.set(PendingFreight :: getHistoryFreight,historyFreight);
+        update.set(PendingFreight :: getHistoryAvgFreight,avgHistoryFreight);
+        update.eq(PendingFreight :: getSendAddressId,sendAddressId);
+        update.eq(PendingFreight :: getReceiveAddressId,receiveAddressId);
+        update.in(PendingFreight :: getOrderStatus,OrderEnum.PENDING_FREIGHT_STATUS_LIST);
+        baseMapper.update(update);
+    }
+
 }

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

@@ -122,6 +122,7 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
             item.setHistoryFreight(historyFreight);
             item.setHistoryAvgFreight(historyAvgFreight);
             pendingFreightDao.saveEntity(item);
+            pendingFreightDao.updateSameLineHistoryFreight(data.getSendAddressId(),data.getReveiveAddressId(),historyFreight,historyAvgFreight);
         }
     }
 
@@ -151,7 +152,7 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
 
         pendingFreightDao.updateOrderedAndLoadTruckRate(orderNo,dto.getOrderedRate(),dto.getLoadTruckRate());
 
-        pendingFreightDao.updatePendingFreight(orderNo,pendingFreight,avgPendingFreight);
+        pendingFreightDao.updateSameLineHistoryFreight(orderGoods.getSendAddressId(),orderGoods.getReceiveAddressId(),pendingFreight,avgPendingFreight);
 
     }
 
@@ -324,4 +325,8 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
         //创建excel
         return ExcelUtil.create(excelSheet);
     }
+
+    public void updateSameLineHistoryFreight(Integer sendAddressId,Integer receiveAddressId,BigDecimal historyFreight,BigDecimal avgHistoryFreight){
+        pendingFreightDao.updateSameLineHistoryFreight(sendAddressId,receiveAddressId,historyFreight,avgHistoryFreight);
+    }
 }