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

performance-api/src/main/java/com/clx/performance/vo/pc/broker/OpenOrderChildDTO.java

@@ -73,4 +73,7 @@ public class OpenOrderChildDTO {
     @ApiModelProperty(value = "开票状态 0 未开票 1 已开票 ", example = "1")
     private Integer invoiceStatus;
 
+    @ApiModelProperty(value = "结算状态 1 已结算 ", example = "1234124", dataType = "String")
+    private Integer settleStatus;
+
 }

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

@@ -278,6 +278,7 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setInvoicePlatform(settlementOwnerDetail.getInvoicingCompanyShorterName());
         orderChildInfo.setInvoiceStatus(Objects.equals(settlementOwnerDetail.getInvoiceStatus(),
                 SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode())? 1 : 0);
+        orderChildInfo.setSettleStatus(Objects.equals(settlementOwnerDetail.getPayStatus(), SettlementOwnerDetailEnum.PayStatus.YES.getCode())? 1 : 0);
 
         transportParam.setOrder(orderInfo);
         transportParam.setOrderChildImage(imageList);

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

@@ -20,10 +20,7 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.PaymentService;
-import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
-import com.clx.performance.service.settle.OrderChildSyncTransportRecordService;
-import com.clx.performance.service.settle.SettlementDriverDetailService;
-import com.clx.performance.service.settle.SettlementDriverService;
+import com.clx.performance.service.settle.*;
 import com.clx.performance.struct.settle.SettlementDriverDetailStruct;
 import com.msl.common.result.Result;
 import lombok.AllArgsConstructor;
@@ -64,6 +61,8 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
     private final SettlementOwnerDetailDao settlementOwnerDetailDao;
     private final SettlementDriverDao settlementDriverDao;
 
+    private final SettlementPostService settlementPostService;
+
     @Override
     public void addOrderChildSyncTransportRecord(SettlementDriverDetail detail) {
         OrderChildSyncTransportRecord record = struct.convertRecord(detail);
@@ -130,5 +129,7 @@ public class OrderChildSyncTransportRecordServiceImpl implements OrderChildSyncT
         }catch (Exception e){
             log.error("支付平台服务费异常 {}",e);
         }
+
+        settlementPostService.updatePaySuccess(settlementOwnerDetail);
     }
 }

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

@@ -1011,6 +1011,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         // 发送mq 结算统计
         settlementMqService.settlementStatistics(childNo);
 
+        // 发送mq (更新无车承运)
+        orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetail.getChildNo());
+
     }
 
     @Transactional(rollbackFor = Exception.class)

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

 package com.clx.performance.service.impl.settle;
 
 import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.service.settle.SettlementPostService;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +17,9 @@ public class SettlementPostServiceImpl implements SettlementPostService {
     @Autowired
     private SettlementMqService settlementMqService;
 
+    @Autowired
+    private OrderChildBrokerMqService orderChildBrokerMqService;
+
 
     @Override
     public void updateInvoiceCompany(List<SettlementOwnerDetail> list){
@@ -26,4 +30,10 @@ public class SettlementPostServiceImpl implements SettlementPostService {
         }
 
     }
+
+    @Override
+    public void updatePaySuccess(SettlementOwnerDetail settlementOwnerDetail) {
+        // 发送mq (更新无车承运)
+        orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetail.getChildNo());
+    }
 }

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

@@ -7,4 +7,6 @@ import java.util.List;
 public interface SettlementPostService {
 
     void updateInvoiceCompany(List<SettlementOwnerDetail> list);
+
+    void updatePaySuccess(SettlementOwnerDetail settlementOwnerDetail);
 }