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

@@ -79,11 +79,11 @@ public class SettlementServiceImpl implements SettlementService {
         if (settlementOwnerDetail.getInvoiceType() != null) {return;}
         // 开票金额
         settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
-        // 结算金额 小于0就是普通单
-        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
-        if (settlementOwnerDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) <= 0) {
-            settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
+        if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) < 0) {
             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();
             //是否通过风控,调用网络货运
@@ -161,6 +161,9 @@ public class SettlementServiceImpl implements SettlementService {
             }
         }
 
+        // 结算金额
+        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
+
         settlementOwnerDetail.setInvoiceType(invoiceType);
         settlementDriverDetail.setInvoiceType(invoiceType);
 
@@ -212,8 +215,7 @@ public class SettlementServiceImpl implements SettlementService {
      * 结算金额
      */
     private BigDecimal settlementFreightCalc(Integer settlementWay,SettlementOwnerDetail settlementOwnerDetail){
-        if(Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())){
-            //订单结算方式为“装车净重”时，结算金额=实际净重*平台运费报价-预付运费-货损金额。
+        if(Objects.equals(settlementWay, SettlementWayEnum.WayType.LOAD.getCode())){ //订单结算方式为“装车净重”时，结算金额=实际净重*平台运费报价-预付运费-货损金额。
             return settlementOwnerDetail.getWeight().multiply(settlementOwnerDetail.getFreightPrice())
                     .subtract(settlementOwnerDetail.getPrepayFreight()).subtract(settlementOwnerDetail.getLossFreight());
         }else{ //订单结算方式为“卸车净重”时，结算金额=实际净重*平台运费报价-预付运费