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

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

@@ -71,10 +71,9 @@ public class SettlementDriverDetailServiceImpl  implements SettlementDriverDetai
         settlementDriverDetail.setPlatformServiceFeeRate(orderChild.getPlatformServiceFeeRate()==null
                 ? BigDecimal.ZERO
                 : orderChild.getPlatformServiceFeeRate());
-        settlementDriverDetail.setPlatformServiceFee(
-                settlementDriverDetail.getSettlementFreight()
-                        .multiply(settlementDriverDetail.getPlatformServiceFeeRate().movePointLeft(2))
-                                .setScale(0, RoundingMode.HALF_UP));
+        settlementDriverDetail.setPlatformServiceFee(orderChild.getPlatformServiceFee()==null
+                ? BigDecimal.ZERO
+                : orderChild.getPlatformServiceFee());
 
         settlementDriverDetailDao.saveEntity(settlementDriverDetail);