Merge branch 'refs/heads/v20.9_settlement_20240805' into test

performance-web/src/main/java/com/clx/performance/controller/temp/TempSettlementController.java

@@ -6,6 +6,7 @@ import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.settle.SettlementMqHandlerService;
 import com.clx.performance.service.settle.SettlementMqService;
+import com.clx.performance.vo.mq.SettlementDetailAddMqParam;
 import com.clx.performance.vo.mq.SettlementStatisticsMqParam;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
@@ -52,7 +53,12 @@ public class TempSettlementController {
     @RequestMapping(value = "/settlementDetailAdd", method = RequestMethod.GET)
     public Result settlementDetailAdd(Integer settlementOwnerDetailId, Integer settlementDriverDetailId) {
 
-        settlementMqService.settlementDetailAdd(settlementOwnerDetailId, settlementDriverDetailId);
+//        SettlementDetailAddMqParam mq = new SettlementDetailAddMqParam();
+//        mq.setSettlementOwnerDetailId(settlementOwnerDetailId);
+//        mq.setSettlementDriverDetailId(settlementDriverDetailId);
+//        settlementMqHandlerService.settlementDetailAdd(mq);
+
+        settlementMqService.settlementDetailAdd(settlementDriverDetailId, settlementOwnerDetailId);
 
         return Result.ok();
     }

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

@@ -66,10 +66,6 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
 
         TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
 
-        // 运单同步
-        settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.PROCESSING.getCode());
-        settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
-
         brokerService.orderChildSync(transportParam);
     }