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

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

 package com.clx.performance.listener;
 
 import cn.hutool.json.JSONUtil;
+import com.clx.order.enums.OrderEnum;
 import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.config.SettlementConfig;
@@ -111,8 +112,16 @@ public class OrderChildSyncTransportListener {
 //        OrderChildSyncDTO bean = JSONUtil.toBean(decrypt, OrderChildSyncDTO.class);
 //        extracted(orderChild, bean, JSONUtil.parse(bean).toString(), settlementOwnerDetail, invoiceType, settlementDriverDetail);
 
-        // 同步broker
-        orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
+        if (Objects.equals(settlementOwnerDetail.getReportFlag(), OrderEnum.ReportFlag.NO.getCode())){
+            // 不上报走普通单
+            extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, invoiceType);
+        }
+        else{
+
+            // 同步broker
+            orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
+        }
+
     }
 
     public void extracted(OrderChild orderChild, OrderChildSyncDTO bean, String remark,

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

@@ -877,7 +877,9 @@ public class OrderChildServiceImpl implements OrderChildService {
                 Objects.nonNull(net) && net.compareTo(BigDecimal.ZERO) != 0
         )
         {
-            platformServiceFeeNew = net.multiply(freightPrice).setScale(2, RoundingMode.HALF_UP).multiply(platformServiceFeeRate).setScale(2, RoundingMode.HALF_UP);
+            platformServiceFeeNew = net.multiply(freightPrice).setScale(2, RoundingMode.HALF_UP)
+                    //平台服务费率  * 100
+                    .multiply(platformServiceFeeRate).movePointLeft(2).setScale(2, RoundingMode.HALF_UP);
             changeDeposit = platformServiceFeeNew.subtract(platformServiceFee);
 
         }