Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test

performance-web/src/main/java/com/clx/performance/controller/pc/CarrierOrderChildController.java

@@ -121,6 +121,7 @@ public class CarrierOrderChildController {
 
     @ApiOperation(value = "履约进度表-历史线路拉运量", notes = "<br>By:l刘海泉")
     @GetMapping("/getHistoryLineTransportVolume")
+    @UnitCovert(param = false)
     public Result<List<HistoryLineTranVolumeChartVO>> getHistoryLineTransportVolume(@NotBlank(message = "订单编号不能为空") String orderNo) {
         return Result.ok(orderChildService.getHistoryLineTransportVolume(orderNo));
     }

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDtsListener.java

@@ -131,7 +131,7 @@ public class OrderGoodsDtsListener {
              //货单状态发生变化(从已挂单变成挂单中)
             (
                 (Objects.equals(before.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CREATED.getCode()) &&
-                 Objects.equals(before.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.PAYING.getCode()))
+                 Objects.equals(after.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.PAYING.getCode()))
             ||     //挂单中之后的状态的挂单运费发生变化
                 (after.getOrderGoodsStatus() >= OrderGoodsStatusEnum.Status.PAYING.getCode() &&
                  !Objects.equals(before.getPendingOrderFreight(),after.getPendingOrderFreight()))