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

@@ -83,7 +83,6 @@ public class SettlementServiceImpl implements SettlementService {
             invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
             settlementDriverDetail.setPrepayFreightFlag(0);
             settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
-            settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
         } else {
             OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
             //是否通过风控,调用网络货运
@@ -164,6 +163,10 @@ public class SettlementServiceImpl implements SettlementService {
         // 结算金额
         settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
 
+        if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) < 0) {
+            settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
+        }
+
         settlementOwnerDetail.setInvoiceType(invoiceType);
         settlementDriverDetail.setInvoiceType(invoiceType);