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

@@ -85,6 +85,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
             if (i == 1) {
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
+                        .mobile(networkDriverAccount.getMobile())
                         .usableBalance(account.getUsableBalance())
                         .alterationBalance(settlementDriverDetail.getFreight()).accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
@@ -130,6 +131,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .usableBalance(account.getUsableBalance())
+                        .mobile(networkDriverAccount.getMobile())
                         .alterationBalance(settlementDriverDetail.getFreight()).accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.FROZEN.getCode())
@@ -166,6 +168,7 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                 account = networkDriverAccountDao.getEntityByKey(build.getId()).get();
                 NetworkDriverRunningWaterRecord entity = NetworkDriverRunningWaterRecord.builder()
                         .usableBalance(account.getUsableBalance())
+                        .mobile(networkDriverAccount.getMobile())
                         .alterationBalance(settlementDriverDetail.getFreight()).accountBalance(account.getAccountBalance())
                         .frozenBalance(account.getFrozenBalance()).createBy("系统")
                         .fundType(NetworkDriverAccountEnum.FundType.EXPENDITURE.getCode())

performance-web/src/main/java/com/clx/performance/sqlProvider/settle/NetworkDriverRunningWaterRecordProvider.java

@@ -15,7 +15,7 @@ public class NetworkDriverRunningWaterRecordProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.running_water_no," +
                     " a.driver_user_no,a.driver_user_name, a.mobile,a.running_water_type,a.running_water_type_msg,a.fund_type_msg,a.account_balance, " +
-                    " a.fund_type,a.order_no,a.order_goods_no,a.child_no,a.alteration_balance" +
+                    " a.fund_type,a.order_no,a.order_goods_no,a.child_no,a.alteration_balance," +
                     "a.usable_balance,a.frozen_balance,a.take_out_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("network_driver_running_water_record a");