diff --git a/payment-base-app/pom.xml b/payment-base-app/pom.xml index efb28e8..d5087e5 100644 --- a/payment-base-app/pom.xml +++ b/payment-base-app/pom.xml @@ -95,10 +95,10 @@ - + diff --git a/payment-base-app/src/main/java/com/base/springcloud/handle/RBSQueueHandler.java b/payment-base-app/src/main/java/com/base/springcloud/handle/RBSQueueHandler.java index 9f69cb0..828b9cb 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/handle/RBSQueueHandler.java +++ b/payment-base-app/src/main/java/com/base/springcloud/handle/RBSQueueHandler.java @@ -1,17 +1,11 @@ package com.base.springcloud.handle; -import com.base.springcloud.bo.OrderBO; -import com.base.springcloud.entity.Order; import com.base.springcloud.service.PaymentService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.awt.font.OpenType; -import java.util.Optional; - @Component public class RBSQueueHandler { @@ -20,10 +14,10 @@ public class RBSQueueHandler { @Autowired private PaymentService paymentService; - @RabbitListener(queues = "order_queue") + /*@RabbitListener(queues = "order_queue") public void orderInfo(OrderBO orderBO) { logger.info("正在获取订单: {} 状态", Optional.ofNullable(orderBO.getOrder()).map(o->o.getOrderNo()).orElse("无效单据")); paymentService.queryOrder(orderBO); - } + }*/ } \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java index 7549978..11507a6 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java @@ -7,7 +7,6 @@ import com.base.springcloud.entity.Order; import com.base.springcloud.service.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.amqp.core.AmqpTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,8 +31,8 @@ public class PaymentServiceImp implements PaymentService { @Autowired private WecPaymentService wecPaymentService; - @Autowired - private AmqpTemplate amqpTemplate; + //@Autowired + //private AmqpTemplate amqpTemplate; @Override @@ -62,7 +61,8 @@ public class PaymentServiceImp implements PaymentService { // 遍历查询第三方订单信息 for (OrderBO orderBO : orderList){ // 异步处理数据 - amqpTemplate.convertSendAndReceive(PaymentConstant.ORDER_QUEUE,orderBO); + queryOrder(orderBO); + //amqpTemplate.convertSendAndReceive(PaymentConstant.ORDER_QUEUE,orderBO); } } diff --git a/payment-base-app/src/main/resources/application.yml b/payment-base-app/src/main/resources/application.yml index 4e8ece0..5e60d42 100644 --- a/payment-base-app/src/main/resources/application.yml +++ b/payment-base-app/src/main/resources/application.yml @@ -26,11 +26,11 @@ spring: username: root password: hnrr%%360 #rabbitmq 配置 - rabbitmq: - host: localhost - port: 5672 - username: rbs-payment - password: pay123123 + #rabbitmq: + #host: localhost + #port: 5672 + #username: rbs-payment + #password: pay123123 # redis 配置 redis: # 地址