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

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

@@ -70,4 +70,7 @@ public class OpenOrderChildDTO {
     @ApiModelProperty(value = "线下平台", example = "华祥", required = true, dataType = "String")
     private String invoicePlatform;
 
+    @ApiModelProperty(value = "开票状态 0 未开票 1 已开票 ", example = "1")
+    private Integer invoiceStatus;
+
 }

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

@@ -27,7 +27,7 @@ public class TransportVO {
     @ApiModelProperty(value = "同步失败原因", example = "1", dataType = "String")
     private String syncMsg;
 
-    @ApiModelProperty(value = "结算状态 0 未结算 1 已结算 2结算中 ", example = "1234124", dataType = "String")
+    @ApiModelProperty(value = "结算状态 0 未结算 1 已结算 2结算中 3结算失败 ", example = "1234124", dataType = "String")
     private Integer settleStatus;
     @ApiModelProperty(value = "结算方", example = "1", dataType = "String")
     private Integer settleOrg;

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

 package com.clx.performance.service.broker;
 
+import java.util.List;
+
 public interface OrderChildBrokerMqService {
     void orderChildSync(String childNo);
 
     void orderChildUpdate(String childNo);
+
+    void orderChildUpdate(List<String> childNoList);
+
 }

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

@@ -19,6 +19,8 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 @Slf4j
 @Service
 public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqHandlerService {
@@ -75,6 +77,10 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
                 .getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
+        if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){
+            return;
+        }
+
         try{
             // 更新broker
             orderChildBrokerService.orderChildUpdate(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);

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

@@ -14,6 +14,8 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Slf4j
 @Service
 public class OrderChildBrokerMqServiceImpl implements OrderChildBrokerMqService {
@@ -47,4 +49,13 @@ public class OrderChildBrokerMqServiceImpl implements OrderChildBrokerMqService
         rabbitTemplate.send(RabbitKeyBrokerConstants.DEFAULT_EXCHANGE,
                 RabbitKeyBrokerConstants.DEFAULT_DELAY_ROUTING_KEY, message);
     }
+
+    @Override
+    public void orderChildUpdate(List<String> childNoList) {
+
+        for (String childNo : childNoList) {
+            orderChildUpdate(childNo);
+        }
+    }
+
 }

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

@@ -66,7 +66,7 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
 
         TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
 
-        // 更新状态
+        // 运单同步
         settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.PROCESSING.getCode());
         settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
 
@@ -77,12 +77,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
     public void orderChildUpdate(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail, SettlementDriverDetail settlementDriverDetail) {
         TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
 
-        // 更新状态
-        settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.PROCESSING.getCode());
-        settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
-        brokerService.orderChildSync(transportParam);
-
-        brokerService.orderChildSync(transportParam);
+        // 运单更新
+        brokerService.orderChildUpdate(transportParam);
     }
 
     private TransportParam buildParam(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
@@ -278,6 +274,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         orderChildInfo.setReceiveNet(orderChild.getUnloadNet());
         orderChildInfo.setInvoiceFlag(settlementOwnerDetail.getInvoiceType());
         orderChildInfo.setInvoicePlatform(settlementOwnerDetail.getInvoicingCompanyShorterName());
+        orderChildInfo.setInvoiceStatus(Objects.equals(settlementOwnerDetail.getInvoiceStatus(),
+                SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode())? 1 : 0);
 
         transportParam.setOrder(orderInfo);
         transportParam.setOrderChildImage(imageList);

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

@@ -427,7 +427,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementMqService.settlementPlatformAutoConfirmUpdate(settlementOwnerDetail.getSettlementNo());
 
         }
-        else {
+        else if (Objects.equals(result.getSettleStatus(), 3) ) {
             SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
             settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
             settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
@@ -481,8 +481,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         // 预付运费判断
         if (settlementDriverDetail.getSettlementFreight().compareTo(BigDecimal.ZERO) <= 0) {
 
-            // 转普通单
-            settlementOwnerDetail.setInvoiceType(SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
+//            // 转普通单
+//            settlementOwnerDetail.setInvoiceType(SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
             settlementOwnerDetail.setInvoicingCompanyId(null);
             settlementOwnerDetail.setInvoicingCompanyShorterName(null);
             settlementOwnerDetail.setInvoicingCompanyGroupCode(null);
@@ -497,6 +497,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             settlementOwnerDetailDao.updatePreFreight(settlementOwnerDetail);
             settlementDriverDetailDao.updatePreFreight(settlementDriverDetail);
 
+            // 发送mq (更新无车承运)
+            orderChildBrokerMqService.orderChildSync(orderChild.getChildNo());
+
         } else {
 
             if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){

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

@@ -23,6 +23,7 @@ import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageInvoiceOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
 import com.clx.performance.param.pc.owner.PagePendingCarrierSettlementOwnerDetailParam;
+import com.clx.performance.service.broker.OrderChildBrokerMqService;
 import com.clx.performance.service.settle.SettlementCommonService;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
 import com.clx.performance.service.settle.SettlementPostService;
@@ -86,6 +87,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
     @Autowired
     private SettlementPostService settlementPostService;
 
+    @Autowired
+    private OrderChildBrokerMqService orderChildBrokerMqService;
     @Autowired
     private FileUploadFeign fileUploadFeign;