承运与无车承运对接

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

@@ -26,13 +26,12 @@ import com.clx.performance.model.*;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.service.TransportSyncService;
-import com.clx.performance.service.broker.OrderChildSyncBrokerService;
+import com.clx.performance.service.broker.OrderChildBrokerService;
 import com.clx.performance.service.settle.NetworkDriverRunningWaterRecordService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 
@@ -72,7 +71,7 @@ public class OrderChildSyncTransportListener {
     private final ApplicationEventPublisher applicationEventPublisher;
     private final InvoicingCompanyService invoicingCompanyService;
     private final SettlementConfig settlementConfig;
-    private final OrderChildSyncBrokerService orderChildSyncBrokerService;
+    private final OrderChildBrokerService orderChildBrokerService;
     private final  OrderChildDao orderChildDao;
     /**
      * 承运同步网络货运运单
@@ -105,12 +104,6 @@ public class OrderChildSyncTransportListener {
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-//        // 开票服务费
-//        settlementOwnerDetail.setInvoiceServiceFee(invoiceServiceFeeCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
-//        // 开票金额
-//        settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),
-//                orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
-
 //        // 同步网络货运(禁用网络货运同步)
 //        ThirdOrderChildBrokerParam param = transportSyncService.generateOrderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
 //        HttpDTO httpDTOResult = transportFeignService.orderChildSync(param);
@@ -119,7 +112,7 @@ public class OrderChildSyncTransportListener {
 //        extracted(orderChild, bean, JSONUtil.parse(bean).toString(), settlementOwnerDetail, invoiceType, settlementDriverDetail);
 
         // 同步broker
-        orderChildSyncBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
+        orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
     }
 
     public void extracted(OrderChild orderChild, OrderChildSyncDTO bean, String remark,

performance-web/src/main/java/com/clx/performance/service/broker/OrderChildSyncBrokerService.java → performance-web/src/main/java/com/clx/performance/service/broker/OrderChildBrokerService.java

@@ -5,7 +5,7 @@ import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 
-public interface OrderChildSyncBrokerService {
+public interface OrderChildBrokerService {
 
     void orderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
                         SettlementDriverDetail settlementDriverDetail);

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

@@ -13,7 +13,7 @@ import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
-import com.clx.performance.service.broker.OrderChildSyncBrokerService;
+import com.clx.performance.service.broker.OrderChildBrokerService;
 import com.clx.performance.vo.pc.broker.*;
 import com.clx.user.feign.DocumentFeign;
 import com.clx.user.feign.DriverFeign;
@@ -31,7 +31,7 @@ import java.util.List;
 
 @Slf4j
 @Service
-public class OrderChildSyncBroker implements OrderChildSyncBrokerService {
+public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
 
     @Autowired
     private BrokerService brokerService;