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

@@ -20,7 +20,5 @@ 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

@@ -49,15 +49,6 @@ public class PendingFreightDaoImpl extends BaseDaoImpl<PendingFreightMapper, Pen
         return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
     }
 
-    @Override
-    public void updatePendingFreight(String orderNo, BigDecimal pendingFreight, BigDecimal avgPendingFreight) {
-        LambdaUpdateWrapper<PendingFreight> update = new LambdaUpdateWrapper<>();
-        update.set(PendingFreight :: getHistoryFreight,pendingFreight);
-        update.set(PendingFreight :: getHistoryAvgFreight,avgPendingFreight);
-        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<>();

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

@@ -325,8 +325,4 @@ 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);
-    }
 }