Merge branch 'v17.5_order_child_sync_broker_20240617' into test

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

 package com.clx.performance.service.impl;
 
 import cn.hutool.json.JSONUtil;
+import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.InvoicingCompanyEnum;
@@ -44,6 +45,7 @@ import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.*;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.service.child.OrderChildPostService;
+import com.clx.performance.service.impl.trace.TruckTraceServiceImpl;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
@@ -312,6 +314,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
 
         log.info("参数 getInvoicingCompanyId {}",orderInfo.getInvoicingCompanyId());
+        log.info("开票公司id  {} " ,orderInfo.getInvoicingCompanyId());
         /** 存在开票公司 **/
         if (Objects.nonNull(orderInfo.getInvoicingCompanyId())
                 && orderInfo.getInvoicingCompanyId() > 0) {
@@ -321,6 +324,9 @@ public class OrderChildServiceImpl implements OrderChildService {
                     invoicingCompanyVO.getSupportOwnerOrder(),orderGoods.getSettlementWay(),truckOwnerFlag);
             /** 是否支持车主接单,0:否,1:是,默认是
              * 逻辑：如果结算方式是 卸车净重（减货损）,开票公司支持车主模式 , 那么都可以接单 如果不支持车主模式 ,只能车主接单**/
+            log.info("是否支持车主模式  {} " ,invoicingCompanyVO.getSupportOwnerOrder());
+            log.info("结算方式  {} " ,orderGoods.getSettlementWay());
+            log.info("是否是车主  {} " ,truckOwnerFlag);
             if (Objects.equals(invoicingCompanyVO.getSupportOwnerOrder(), 1) &&
                     Objects.equals(orderGoods.getSettlementWay(), SettlementWayEnum.WayType.UNLOAD_LOSS.getCode())) {
                 if (!truckOwnerFlag) {

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

@@ -480,7 +480,7 @@ public class PaymentServiceImpl implements PaymentService {
         PayEncryptTools.sign(payUnitDTO, PrivateKeyConfig.privateKeyByte);
         /** 构建支付支付 ***/
         PayUserDTO payUserDTO = PayUserDTO.builder()
-                .pwd(payDTO.getPwd())
+                .pwd("noCheckPwd") // 暂时不校验用户密码
                 .system(SystemCodeEnum.PERFORMANCE_SERVICE.getCode())
                 .userCode(payDTO.getFrom())
                 .orderNo(orderPayment.getRelationNo())