Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

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

@@ -84,10 +84,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         settlementOwnerDetail.setLossFreight(lossFreightCalc(settlementOwnerDetail.getLossPrice(), settlementOwnerDetail.getLossWeight()));
 
         // 预付运费
-        BigDecimal ans = settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight());
-        if (ans.compareTo(BigDecimal.ZERO) <= 0) {
-            settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
-        }
+        settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
 
         // 开票服务费
         settlementOwnerDetail.setInvoiceServiceFeeRate(
@@ -101,9 +98,10 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
                 settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
                 orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
 
-//        // 结算金额
-//        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderGoods.getSettlementWay(),settlementOwnerDetail));
-//
+        // 结算金额
+        settlementOwnerDetail.setSettlementFreight(
+                settlementCommonService.settlementFreightCalc(orderGoods.getSettlementWay(),settlementOwnerDetail));
+
         //借款抵扣金额初始化
         settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);