Merge branch 'v17.5_order_child_sync_broker_20240617' into test

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

@@ -327,7 +327,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             log.info("是否支持车主模式  {} " ,invoicingCompanyVO.getSupportOwnerOrder());
             log.info("结算方式  {} " ,orderGoods.getSettlementWay());
             log.info("是否是车主  {} " ,truckOwnerFlag);
-            if (Objects.equals(invoicingCompanyVO.getSupportOwnerOrder(), 1) &&
+            if (Objects.equals(invoicingCompanyVO.getSupportOwnerOrder(), 0) &&
                     Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
                 if (!truckOwnerFlag) {
                     throw new ServiceSystemException(PerformanceResultEnum.ORDER_DRIVER_LIMIT);
@@ -481,13 +481,6 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         // 新增运单
         orderChildDao.saveEntity(orderChild);
-
-        // 更新出车状态
-        updateDriverOrderStatusLock(orderChild.getDriverUserNo(), orderChild.getTruckId());
-
-        // 新增日志
-        orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.CREATED.getCode(),
-                OrderChildLogEnum.Type.CREATED.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
         // 冻结司机保证金
         if(deposit.compareTo(BigDecimal.ZERO) ==1){
             PayPlatformFeeParam payPlatformFeeParam = new PayPlatformFeeParam();
@@ -498,6 +491,13 @@ public class OrderChildServiceImpl implements OrderChildService {
             //冻结司机押金
             paymentService.paymentPlatformFee(payPlatformFeeParam);
         }
+        // 更新出车状态
+        updateDriverOrderStatusLock(orderChild.getDriverUserNo(), orderChild.getTruckId());
+
+        // 新增日志
+        orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.CREATED.getCode(),
+                OrderChildLogEnum.Type.CREATED.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+
         // 司机接单后置逻辑
         orderChildPostService.orderChildAdd(orderChild.getChildNo());