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

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.order.enums.OrderEnum;
 import com.clx.performance.dao.PendingFreightDao;
 import com.clx.performance.mapper.PendingFreightMapper;
 import com.clx.performance.model.PendingFreight;
@@ -43,6 +44,7 @@ public class PendingFreightDaoImpl extends BaseDaoImpl<PendingFreightMapper, Pen
     @Override
     public IPage<PendingFreight> pagePendingFreight(PagePendingFreightParam param) {
         LambdaQueryWrapper<PendingFreight> query = new LambdaQueryWrapper<>();
+        query.in(PendingFreight :: getOrderStatus, OrderEnum.PENDING_FREIGHT_STATUS_LIST);
         query.orderByDesc(PendingFreight :: getId);
         return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
     }

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

@@ -84,7 +84,7 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
 
         if(pendingFreightOptional.isPresent()){
             PendingFreight pendingFreight = pendingFreightOptional.get();
-            item.setId(pendingFreight.getId());
+            pendingFreight.setId(pendingFreight.getId());
 
             if(!Objects.equals(pendingFreight.getSendAddressId(),data.getSendAddressId())
             || !Objects.equals(pendingFreight.getReceiveAddressId(),data.getReveiveAddressId())){
@@ -93,13 +93,23 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
                 FeignAddressVO.Address sendAddress = sendAndReceiveAddress.get().getSendAddress();
                 FeignAddressVO.Address receiveAddress = sendAndReceiveAddress.get().getReceiveAddress();
 
-                item.setSendAddress(addressService.generateAddressDetail(sendAddress.getProvince(),
+                pendingFreight.setSendAddress(addressService.generateAddressDetail(sendAddress.getProvince(),
                         sendAddress.getCity(),sendAddress.getCounty(),sendAddress.getAddress()));
                 //计算重车运距
-                item.setOrderDistance(calcOrderDistance(sendAddress,receiveAddress,data.getOrderNo()));
+                pendingFreight.setOrderDistance(calcOrderDistance(sendAddress,receiveAddress,data.getOrderNo()));
 
             }
-            pendingFreightDao.updateEntityByKey(item);
+            //计算线路历史挂单运费
+            BigDecimal historyFreight = this.queryLinePendingFreight(data.getSendAddressId(),
+                    data.getReveiveAddressId());
+            //计算线路历史平均挂单运费
+            BigDecimal historyAvgFreight = this.queryLineAvgPendingFreight(data.getSendAddressId(),
+                    data.getReveiveAddressId());
+
+            pendingFreight.setHistoryFreight(historyFreight);
+            pendingFreight.setHistoryAvgFreight(historyAvgFreight);
+
+            pendingFreightDao.updateEntityByKey(pendingFreight);
         }else{
             item.setOrderNo(data.getOrderNo());
 
@@ -268,7 +278,7 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
         fieldList.add(new ExcelField(2, "煤源位置", "sendAddress", 5000));
         fieldList.add(new ExcelField(3, "物流经理", "seniorLogisticsManagerName", 5000));
         fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
-        fieldList.add(new ExcelField(5, "热值", "goodsTypeName", 5000));
+        fieldList.add(new ExcelField(5, "热值", "goodsModel", 5000));
         fieldList.add(new ExcelField(6, "是否C类煤源", "sendOverStandardMsg", 5000));
         fieldList.add(new ExcelField(7, "任务吨数(吨)", "taskWeight", 5000));
         fieldList.add(new ExcelField(8, "接单率", "orderedRate", 5000));
@@ -291,17 +301,17 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
             rowData.add(new ExcelData(vo.getSendAddress(),"-"));
             rowData.add(new ExcelData(vo.getSeniorLogisticsManagerName(),"-"));
             rowData.add(new ExcelData(vo.getGoodsName(), "-"));
-            rowData.add(new ExcelData(vo.getGoodsTypeName(), "-"));
+            rowData.add(new ExcelData(vo.getGoodsModel(), "-"));
             rowData.add(new ExcelData(vo.getSendOverStandardMsg(), "-"));
             rowData.add(new ExcelData(vo.getTaskWeight(), "-"));
             rowData.add(new ExcelData(vo.getOrderedRate(), "-"));
             rowData.add(new ExcelData(vo.getLoadTruckRate(), "-"));
             rowData.add(new ExcelData(vo.getOrderDistance(), "-"));
             rowData.add(new ExcelData(vo.getSendAddressExpenses(), "-"));
-            rowData.add(new ExcelData(vo.getHistoryFreight(), "-"));
-            rowData.add(new ExcelData(vo.getHistoryAvgFreight(), "-"));
-            rowData.add(new ExcelData(vo.getPredictionFreightPrice(), "-"));
-            rowData.add(new ExcelData(vo.getLogisticsFreight(), "-"));
+            rowData.add(new ExcelData(Objects.nonNull(vo.getHistoryFreight())?vo.getHistoryFreight().movePointLeft(2):null,"-"));
+            rowData.add(new ExcelData(Objects.nonNull(vo.getHistoryAvgFreight())?vo.getHistoryFreight().movePointLeft(2):null,"-"));
+            rowData.add(new ExcelData(Objects.nonNull(vo.getPredictionFreightPrice())?vo.getHistoryFreight().movePointLeft(2):null,"-"));
+            rowData.add(new ExcelData(Objects.nonNull(vo.getLogisticsFreight())?vo.getHistoryFreight().movePointLeft(2):null,"-"));
             rowData.add(new ExcelData(""));
             dataList.add(rowData);
         }

performance-api/src/main/java/com/clx/performance/vo/pc/PagePendingFreightVO.java

@@ -56,13 +56,11 @@ public class PagePendingFreightVO {
     @Schema(description="货物名称")
     private String goodsName;
 
-    
-    @Schema(description="热值编码")
-    private String goodsTypeCode;
+
 
     
     @Schema(description="热值名称")
-    private String goodsTypeName;
+    private String goodsModel;
 
     
     @Schema(description="是否C类煤源  0 否  1 是")