Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

performance-web/src/main/java/com/clx/performance/model/settle/NetworkDriverRunningWaterRecord.java

@@ -67,25 +67,17 @@ public class NetworkDriverRunningWaterRecord implements HasKey<Integer> {
     @ApiModelProperty("资金类型简介")
     private String fundTypeMsg;
 
-    @TableField("relation_id")
-    @ApiModelProperty("")
-    private Long relationId;
-
-    @TableField("order_id")
-    @ApiModelProperty("订单ID")
-    private Integer orderId;
-
     @TableField("order_no")
     @ApiModelProperty("订单编号")
     private String orderNo;
 
-    @TableField("order_child_id")
-    @ApiModelProperty("运单ID")
-    private Integer orderChildId;
+    @TableField("order_goods_no")
+    @ApiModelProperty("货单编号")
+    private String orderGoodsNo;
 
-    @TableField("order_child_no")
+    @TableField("child_no")
     @ApiModelProperty("运单编号")
-    private String orderChildNo;
+    private String childNo;
 
     @TableField("alteration_balance")
     @ApiModelProperty("变动金额")

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

@@ -95,7 +95,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                         .runningWaterNo(idGenerateSnowFlake.nextId(2L))
                         .runningWaterTypeMsg(NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getMsg())
                         .runningWaterType(NetworkDriverAccountEnum.RunningWaterStatus.SETTLEMENT.getCode())
-
+                        .childNo(settlementDriverDetail.getChildNo())
+                        .orderNo(settlementDriverDetail.getOrderNo())
+                        .orderGoodsNo(settlementDriverDetail.getOrderGoodsNo())
                         .build();
 
                 networkDriverRunningWaterRecordDao.saveEntity(entity);
@@ -137,7 +139,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                         .runningWaterNo(idGenerateSnowFlake.nextId(3L))
                         .runningWaterTypeMsg(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getMsg())
                         .runningWaterType(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_FROZEN.getCode())
-
+                        .childNo(settlementDriverDetail.getChildNo())
+                        .orderNo(settlementDriverDetail.getOrderNo())
+                        .orderGoodsNo(settlementDriverDetail.getOrderGoodsNo())
                         .build();
 
                 networkDriverRunningWaterRecordDao.saveEntity(entity);
@@ -171,7 +175,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                         .runningWaterNo(idGenerateSnowFlake.nextId(3L))
                         .runningWaterTypeMsg(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getMsg())
                         .runningWaterType(NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getCode())
-
+                        .childNo(settlementDriverDetail.getChildNo())
+                        .orderNo(settlementDriverDetail.getOrderNo())
+                        .orderGoodsNo(settlementDriverDetail.getOrderGoodsNo())
                         .build();
 
                 networkDriverRunningWaterRecordDao.saveEntity(entity);