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

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

@@ -116,6 +116,7 @@ public class SettlementServiceImpl implements SettlementService {
                         OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(orderChild.getOwnerUserNo(),
                                 OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
                         settlementOwnerDetail.setPrepayFreight(ans);
+                        settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
 
                         //生成扣除流水
                         OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
@@ -146,7 +147,7 @@ public class SettlementServiceImpl implements SettlementService {
             } else {
                 settlementDriverDetail.setPrepayFreightFlag(0);
                 settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
-                settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
+                settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
             }
         } else {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SYNC_ERROR);