Merge remote-tracking branch 'origin/v20.9_settlement_20240805' into v20.9_settlement_20240805

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOrderChildRiskDaoImpl.java

@@ -24,6 +24,7 @@ public class SettlementOrderChildRiskDaoImpl
     public boolean updateProcess(SettlementOrderChildRisk item) {
         return update(lUdWrapper()
                 .eq(SettlementOrderChildRisk::getId, item.getId())
+                .set(SettlementOrderChildRisk::getInvoiceType, item.getInvoiceType())
                 .set(SettlementOrderChildRisk::getStatus, item.getStatus())
                 .set(SettlementOrderChildRisk::getProcessMethod, item.getProcessMethod())
                 .set(SettlementOrderChildRisk::getProcessBy, item.getProcessBy())

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

@@ -249,6 +249,9 @@ public class OrderChildSyncTransportListener {
         dto.setOrderChild(orderChild);
         applicationEventPublisher.publishEvent(new OwnerLoanEvent(this, dto));
 
+        // 发送mq (运单更新)
+        orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetail.getChildNo());
+
     }
 
     private void generateTakeOutRunningWatter(OrderChild orderChild, BigDecimal ans, SettlementOwnerDetail settlementOwnerDetail, SettlementDriverDetail settlementDriverDetail) {

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

@@ -321,7 +321,13 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
                 settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
-                SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+                SettlementOrderChildRisk settlementOrderChildRisk = settlementOrderChildRiskDao.findLastByChildNo(mq.getChildNo()).orNull();
+                if (settlementOrderChildRisk!=null
+                        && Objects.equals(settlementOrderChildRisk.getStatus(), SettlementOrderChildRiskEnum.Status.INIT.getCode())){
+                    return;
+                }
+                settlementOrderChildRisk = new SettlementOrderChildRisk();
+
                 settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
                 settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
                 settlementOrderChildRisk.setDriverName(orderChild.getDriverName());
@@ -340,9 +346,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.SUCCESS.getCode());
                 settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
-                // 发送mq (运单更新)
-                orderChildBrokerMqService.orderChildUpdate(settlementOwnerDetail.getChildNo());
-
                 // 发送mq （结算）
                 settlementMqService.settle(orderChild.getChildNo(), invoiceType, remark);
             }
@@ -379,7 +382,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
             settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
-            SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+            SettlementOrderChildRisk settlementOrderChildRisk = settlementOrderChildRiskDao.findLastByChildNo(mq.getChildNo()).orNull();
+            if (settlementOrderChildRisk!=null
+                    && Objects.equals(settlementOrderChildRisk.getStatus(), SettlementOrderChildRiskEnum.Status.INIT.getCode())){
+                return;
+            }
+            settlementOrderChildRisk = new SettlementOrderChildRisk();
             settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
             settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
             settlementOrderChildRisk.setDriverName(orderChild.getDriverName());
@@ -445,7 +453,12 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
             settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
-            SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+            SettlementOrderChildRisk settlementOrderChildRisk = settlementOrderChildRiskDao.findLastByChildNo(mq.getChildNo()).orNull();
+            if (settlementOrderChildRisk!=null
+                    && Objects.equals(settlementOrderChildRisk.getStatus(), SettlementOrderChildRiskEnum.Status.INIT.getCode())){
+                return;
+            }
+            settlementOrderChildRisk = new SettlementOrderChildRisk();
             settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
             settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
             settlementOrderChildRisk.setDriverName(orderChild.getDriverName());

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

@@ -147,6 +147,11 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         //借款抵扣金额初始化
         settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
 
+        //设置开票公司信息
+        settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
+        settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
+        settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+
         // 查询开票公司
         InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
                 settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -171,10 +176,7 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
                 settlementCommonService.settlementFreightCalc(orderGoods.getSettlementWay(),settlementOwnerDetail));
 
         settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
-        //设置开票公司信息
-        settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
-        settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
-        settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+
         settlementOwnerDetail.setReportFlag(orderChild.getReportFlag());
 
         settlementOwnerDetail.setInvoiceChannel(SettlementOwnerDetailEnum.InvoiceChannel.BROKER.getCode());