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,8 +79,12 @@ 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);
             invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
-
+        } else {
             OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
             //是否通过风控,调用网络货运
             ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
@@ -116,6 +120,8 @@ public class SettlementServiceImpl implements SettlementService {
                             OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(orderChild.getOwnerUserNo(),
                                     OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
                             settlementOwnerDetail.setPrepayFreight(ans);
+                            settlementDriverDetail.setPrepayFreightFlag(1);
+
                             settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
 
                             //生成扣除流水
@@ -153,16 +159,10 @@ public class SettlementServiceImpl implements SettlementService {
                 throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SYNC_ERROR);
 
             }
-
-        if (SettlementOwnerEnum.InvoiceType.ONLINE.getCode().equals(invoiceType) && settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
-            settlementDriverDetail.setPrepayFreightFlag(1);
         }
 
-
         settlementOwnerDetail.setInvoiceType(invoiceType);
         settlementDriverDetail.setInvoiceType(invoiceType);
-        // 结算金额
-        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
 
         //设置司机预付运费标示
         if (settlementOwnerDetail.getPrepayFreight().compareTo(BigDecimal.ZERO) > 0) {
@@ -212,7 +212,8 @@ 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{ //订单结算方式为“卸车净重”时，结算金额=实际净重*平台运费报价-预付运费