Merge branch 'v19.6_carrier_optimization_20240717' into dev

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

@@ -91,6 +91,7 @@ public class OrderChildDtsListener  {
                     log.info("DTS运单取消释放借款冻结金额");
                     applicationEventPublisher.publishEvent(new OrderChildCancelEvent(this, after.getChildNo()));
                 }
+                afterLogicalProcessing(before,after);
 
             }else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 //数据删除
@@ -249,4 +250,20 @@ public class OrderChildDtsListener  {
 
     }
 
+    /**
+     * 后续逻辑处理
+     * @param before
+     * @param after
+     */
+    private void afterLogicalProcessing(OrderChildMessage before,OrderChildMessage after){
+        //运单取消处理
+        if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){
+            //如果运单有装车吨数，货单装车吨数需要扣除
+            if(Objects.nonNull(after.getLoadNet())){
+
+            }
+        }
+
+    }
+
 }

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -64,6 +64,10 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("已拉运吨数")
     private BigDecimal alreadyTransportWeight;
 
+    @TableField("already_load_weight")
+    @ApiModelProperty("已装车吨数")
+    private BigDecimal alreadyLoadWeight;
+
     @TableField("send_address_id")
     @ApiModelProperty("发货地址ID")
     private Integer sendAddressId;