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

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

@@ -74,9 +74,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, settlementDriverDetail.getDriverUserNo()).get();
         log.info("查询出NetworkDriverAccount{}", JSONUtil.parse(networkDriverAccount));
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
-                .usableBalance(settlementDriverDetail.getPrepayFreight())
+                .usableBalance(settlementDriverDetail.getFreight())
                 .frozenBalance(BigDecimal.ZERO)
-                .accountBalance(settlementDriverDetail.getPrepayFreight()).build();
+                .accountBalance(settlementDriverDetail.getFreight()).build();
         while (true) {
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
@@ -86,7 +86,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .usableBalance(account.getUsableBalance())
-                        .alterationBalance(settlementDriverDetail.getPrepayFreight()).accountBalance(account.getAccountBalance())
+                        .alterationBalance(settlementDriverDetail.getFreight()).accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.INCOME.getCode())
                         .fundTypeMsg(NetworkDriverAccountEnum.FundType.INCOME.getMsg())
@@ -118,9 +118,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, settlementDriverDetail.getDriverUserNo()).get();
         log.info("查询出NetworkDriverAccount{}", JSONUtil.parse(networkDriverAccount));
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
-                .frozenBalance(settlementDriverDetail.getPrepayFreight())
+                .frozenBalance(settlementDriverDetail.getFreight())
                 .accountBalance(BigDecimal.ZERO)
-                .usableBalance(settlementDriverDetail.getPrepayFreight()).build();
+                .usableBalance(settlementDriverDetail.getFreight()).build();
         while (true) {
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
@@ -130,7 +130,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .usableBalance(account.getUsableBalance())
-                        .alterationBalance(settlementDriverDetail.getPrepayFreight()).accountBalance(account.getAccountBalance())
+                        .alterationBalance(settlementDriverDetail.getFreight()).accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.FROZEN.getCode())
                         .fundTypeMsg(NetworkDriverAccountEnum.FundType.FROZEN.getMsg())
@@ -155,9 +155,9 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
         NetworkDriverAccount networkDriverAccount = networkDriverAccountDao.getOneByField(NetworkDriverAccount::getDriverUserNo, settlementDriverDetail.getDriverUserNo()).get();
 
         NetworkDriverAccount build = NetworkDriverAccount.builder().id(networkDriverAccount.getId())
-                .frozenBalance(settlementDriverDetail.getPrepayFreight().negate())
+                .frozenBalance(settlementDriverDetail.getFreight().negate())
                 .usableBalance(BigDecimal.ZERO)
-                .accountBalance(settlementDriverDetail.getPrepayFreight()).build();
+                .accountBalance(settlementDriverDetail.getFreight()).build();
         while (true) {
             NetworkDriverAccount account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
             build.setModifiedTime(account.getModifiedTime());
@@ -166,7 +166,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .usableBalance(account.getUsableBalance())
-                        .alterationBalance(settlementDriverDetail.getPrepayFreight()).accountBalance(account.getAccountBalance())
+                        .alterationBalance(settlementDriverDetail.getFreight()).accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.EXPENDITURE.getCode())
                         .fundTypeMsg(NetworkDriverAccountEnum.FundType.EXPENDITURE.getMsg())
@@ -220,7 +220,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 .status(NetworkDriverAccountEnum.CaseOutRecordStatus.WAIT_PLATFORM_PAY.getCode())
                 .statusMsg(NetworkDriverAccountEnum.CaseOutRecordStatus.WAIT_PLATFORM_PAY.getMsg())
                 .bank(bankCardVO.getBank()).collectionBankCode(bankCardVO.getBankCode())
-                .payee(bankCardVO.getName()).alterationBalance(settlementDriverDetail.getPrepayFreight())
+                .payee(bankCardVO.getName()).alterationBalance(settlementDriverDetail.getFreight())
                 .orderNo(settlementDriverDetail.getOrderNo()).orderGoodsNo(settlementDriverDetail.getOrderGoodsNo())
                 .childNo(settlementDriverDetail.getChildNo())
                 .platform("网运平台").createBy("系统").build();