承运与无车承运对接

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

@@ -29,6 +29,7 @@ import com.clx.performance.service.impl.UniqueOrderNumService;
 import com.clx.performance.service.settle.*;
 import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.utils.RedisUtil;
+import com.clx.performance.utils.spring.ApplicationContextUtils;
 import com.clx.performance.vo.mq.*;
 import com.clx.performance.vo.pc.broker.TransportVO;
 import com.clx.user.vo.feign.DriverInfoFeignVo;
@@ -114,8 +115,6 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private BrokerService brokerService;
 
-    @Autowired
-    private SettlementOwnerService settlementOwnerService;
     @Autowired
     private OrderChildSyncTransportRecordService orderChildSyncTransportRecordService;
 
@@ -268,7 +267,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             InvoicingStatusNotifyDTO invoicingStatusNotifyDTO = new InvoicingStatusNotifyDTO();
             invoicingStatusNotifyDTO.setChildNoList(Arrays.asList(mq.getChildNo()));
 
-            settlementOwnerService.invoicingStatusNotify(invoicingStatusNotifyDTO);
+            ApplicationContextUtils.getBean(SettlementOwnerService.class)
+                    .invoicingStatusNotify(invoicingStatusNotifyDTO);
         }
     }
 

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

@@ -26,10 +26,13 @@ public class SettlementMqServiceImpl implements SettlementMqService {
         mq.setSettlementDriverDetailId(settlementDriverDetailId);
         mq.setSettlementOwnerDetailId(settlementOwnerDetailId);
 
-        MqDelay<MqWrapper<SettlementDetailAddMqParam>> delay = new MqDelay<>(RabbitKeySettlementConstants.DEFAULT_EXCHANGE, RabbitKeySettlementConstants.SETTLEMENT_DETAIL_ADD_ROUTING_KEY, new MqWrapper<>(mq));
+        MqDelay<MqWrapper<SettlementDetailAddMqParam>> delay =
+                new MqDelay<>(RabbitKeySettlementConstants.DEFAULT_EXCHANGE,
+                        RabbitKeySettlementConstants.SETTLEMENT_DETAIL_ADD_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();
         message.getMessageProperties().setExpiration("5000");
-        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE, RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
+        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE,
+                RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
 
     }
 
@@ -45,7 +48,8 @@ public class SettlementMqServiceImpl implements SettlementMqService {
                         RabbitKeySettlementConstants.SETTLEMENT_DETAIL_INVOICE_TYPE_SYC_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();
         message.getMessageProperties().setExpiration("5000");
-        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE, RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
+        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE,
+                RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
     }
 
 
@@ -59,7 +63,8 @@ public class SettlementMqServiceImpl implements SettlementMqService {
                         RabbitKeySettlementConstants.SETTLEMENT_INVOICE_TYPE_SYNC_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();
         message.getMessageProperties().setExpiration("5000");
-        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE, RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
+        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE,
+                RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
     }
 
     @Override
@@ -72,7 +77,8 @@ public class SettlementMqServiceImpl implements SettlementMqService {
                 RabbitKeySettlementConstants.SETTLEMENT_SETTLE_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();
         message.getMessageProperties().setExpiration("5000");
-        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE, RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
+        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE,
+                RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
     }
 
     @Override
@@ -83,7 +89,8 @@ public class SettlementMqServiceImpl implements SettlementMqService {
                 RabbitKeySettlementConstants.SETTLEMENT_INVOICE_STATUS_SYNC_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();
         message.getMessageProperties().setExpiration("5000");
-        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE, RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
+        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE,
+                RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
     }
 
     @Override
@@ -94,7 +101,8 @@ public class SettlementMqServiceImpl implements SettlementMqService {
                 RabbitKeySettlementConstants.SETTLEMENT_PAY_STATUS_SYNC_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();
         message.getMessageProperties().setExpiration("5000");
-        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE, RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
+        rabbitTemplate.send(RabbitKeySettlementConstants.DEFAULT_EXCHANGE,
+                RabbitKeySettlementConstants.DEFAULT_DELAY_ROUTING_KEY, message);
     }
 
 }