diff --git a/mall-portal/src/main/java/com/macro/mall/portal/component/CancelOrderReceiver.java b/mall-portal/src/main/java/com/macro/mall/portal/component/CancelOrderReceiver.java index a3158f2..a2aa107 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/component/CancelOrderReceiver.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/component/CancelOrderReceiver.java @@ -13,13 +13,13 @@ import org.springframework.stereotype.Component; * Created by macro on 2018/9/14. */ @Component -@RabbitListener(queues = "${rabbitmq.queue.name.cancelOrder}") +@RabbitListener(queues = "mall.order.cancel") public class CancelOrderReceiver { private static Logger LOGGER =LoggerFactory.getLogger(CancelOrderReceiver.class); @Autowired private OmsPortalOrderService portalOrderService; @RabbitHandler - public void process(Long orderId){ + public void handle(Long orderId){ portalOrderService.cancelOrder(orderId); LOGGER.info("process orderId:{}",orderId); } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/component/CancelOrderSender.java b/mall-portal/src/main/java/com/macro/mall/portal/component/CancelOrderSender.java index 3225a33..f7e7025 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/component/CancelOrderSender.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/component/CancelOrderSender.java @@ -1,10 +1,13 @@ package com.macro.mall.portal.component; +import com.macro.mall.portal.domain.QueueEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.amqp.AmqpException; import org.springframework.amqp.core.AmqpTemplate; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.core.MessagePostProcessor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; /** @@ -14,13 +17,19 @@ import org.springframework.stereotype.Component; @Component public class CancelOrderSender { private static Logger LOGGER =LoggerFactory.getLogger(CancelOrderSender.class); - @Value("${rabbitmq.queue.name.cancelOrder}") - private String QUEUE_NAME_CANCEL_ORDER; @Autowired private AmqpTemplate amqpTemplate; - public void send(Long orderId){ - amqpTemplate.convertAndSend(QUEUE_NAME_CANCEL_ORDER,orderId); + public void sendMessage(Long orderId,final long delayTimes){ + //给延迟队列发送消息 + amqpTemplate.convertAndSend(QueueEnum.QUEUE_TTL_ORDER_CANCEL.getExchange(), QueueEnum.QUEUE_TTL_ORDER_CANCEL.getRouteKey(), orderId, new MessagePostProcessor() { + @Override + public Message postProcessMessage(Message message) throws AmqpException { + //给消息设置延迟毫秒值 + message.getMessageProperties().setExpiration(String.valueOf(delayTimes)); + return message; + } + }); LOGGER.info("send orderId:{}",orderId); } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/config/RabbitMqConfig.java b/mall-portal/src/main/java/com/macro/mall/portal/config/RabbitMqConfig.java index 0b1e0d9..8218a13 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/config/RabbitMqConfig.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/config/RabbitMqConfig.java @@ -1,7 +1,7 @@ package com.macro.mall.portal.config; -import org.springframework.amqp.core.Queue; -import org.springframework.beans.factory.annotation.Value; +import com.macro.mall.portal.domain.QueueEnum; +import org.springframework.amqp.core.*; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -11,13 +11,69 @@ import org.springframework.context.annotation.Configuration; */ @Configuration public class RabbitMqConfig { - @Value("${rabbitmq.queue.name.cancelOrder}") - private String QUEUE_NAME_CANCEL_ORDER; + /** - * 超时取消订单的消息 + * 订单消息实际消费队列所绑定的交换机 */ @Bean - public Queue cancelOrderQueue(){ - return new Queue(QUEUE_NAME_CANCEL_ORDER); + DirectExchange orderDirect() { + return (DirectExchange) ExchangeBuilder + .directExchange(QueueEnum.QUEUE_ORDER_CANCEL.getExchange()) + .durable(true) + .build(); } + + /** + * 订单延迟队列队列所绑定的交换机 + */ + @Bean + DirectExchange orderTtlDirect() { + return (DirectExchange) ExchangeBuilder + .directExchange(QueueEnum.QUEUE_TTL_ORDER_CANCEL.getExchange()) + .durable(true) + .build(); + } + + /** + * 订单实际消费队列 + */ + @Bean + public Queue orderQueue() { + return new Queue(QueueEnum.QUEUE_ORDER_CANCEL.getName()); + } + + /** + * 订单延迟队列（死信队列） + */ + @Bean + public Queue orderTtlQueue() { + return QueueBuilder + .durable(QueueEnum.QUEUE_TTL_ORDER_CANCEL.getName()) + .withArgument("x-dead-letter-exchange", QueueEnum.QUEUE_ORDER_CANCEL.getExchange())//到期后转发的交换机 + .withArgument("x-dead-letter-routing-key", QueueEnum.QUEUE_ORDER_CANCEL.getRouteKey())//到期后转发的路由键 + .build(); + } + + /** + * 将订单队列绑定到交换机 + */ + @Bean + Binding orderBinding(DirectExchange orderDirect,Queue orderQueue){ + return BindingBuilder + .bind(orderQueue) + .to(orderDirect) + .with(QueueEnum.QUEUE_ORDER_CANCEL.getRouteKey()); + } + + /** + * 将订单延迟队列绑定到交换机 + */ + @Bean + Binding orderTtlBinding(DirectExchange orderTtlDirect,Queue orderTtlQueue){ + return BindingBuilder + .bind(orderTtlQueue) + .to(orderTtlDirect) + .with(QueueEnum.QUEUE_TTL_ORDER_CANCEL.getRouteKey()); + } + } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderController.java b/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderController.java index c12594d..883e1a2 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderController.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/controller/OmsPortalOrderController.java @@ -1,6 +1,5 @@ package com.macro.mall.portal.controller; -import com.macro.mall.portal.component.CancelOrderSender; import com.macro.mall.portal.domain.CommonResult; import com.macro.mall.portal.domain.ConfirmOrderResult; import com.macro.mall.portal.domain.OrderParam; @@ -21,8 +20,6 @@ import org.springframework.web.bind.annotation.*; public class OmsPortalOrderController { @Autowired private OmsPortalOrderService portalOrderService; - @Autowired - private CancelOrderSender cancelOrderSender; @ApiOperation("根据购物车信息生成确认单信息") @RequestMapping(value = "/generateConfirmOrder",method = RequestMethod.POST) @ResponseBody @@ -55,7 +52,7 @@ public class OmsPortalOrderController { @RequestMapping(value = "/cancelOrder",method = RequestMethod.POST) @ResponseBody public Object cancelOrder(Long orderId){ - cancelOrderSender.send(orderId); + portalOrderService.sendDelayMessageCancelOrder(orderId); return new CommonResult().success(null); } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/domain/QueueEnum.java b/mall-portal/src/main/java/com/macro/mall/portal/domain/QueueEnum.java index a18d45e..e81594c 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/domain/QueueEnum.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/domain/QueueEnum.java @@ -11,11 +11,11 @@ public enum QueueEnum { /** * 消息通知队列 */ - MESSAGE_QUEUE_ORDER("mall.order.direct", "mall.order.cancel", "mall.order.cancel"), + QUEUE_ORDER_CANCEL("mall.order.direct", "mall.order.cancel", "mall.order.cancel"), /** * 消息通知ttl队列 */ - MESSAGE_TTL_QUEUE_ORDER("mall.order.topic.ttl", "mall.order.cancel.ttl", "mall.order.cancel.ttl"); + QUEUE_TTL_ORDER_CANCEL("mall.order.direct.ttl", "mall.order.cancel.ttl", "mall.order.cancel.ttl"); /** * 交换名称 diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderService.java b/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderService.java index a67ef96..d66e345 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderService.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/OmsPortalOrderService.java @@ -38,4 +38,9 @@ public interface OmsPortalOrderService { */ @Transactional void cancelOrder(Long orderId); + + /** + * 发送延迟消息取消订单 + */ + void sendDelayMessageCancelOrder(Long orderId); } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java index 7ae3e5e..304a444 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java @@ -54,6 +54,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { private OmsOrderSettingMapper orderSettingMapper; @Autowired private OmsOrderItemMapper orderItemMapper; + @Autowired + private CancelOrderSender cancelOrderSender; @Override public ConfirmOrderResult generateConfirmOrder() { @@ -292,6 +294,15 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { } } + @Override + public void sendDelayMessageCancelOrder(Long orderId) { + //获取订单超时时间 + OmsOrderSetting orderSetting = orderSettingMapper.selectByPrimaryKey(1L); + long delayTimes = orderSetting.getNormalOrderOvertime()*60*1000; + //发送延迟消息 + cancelOrderSender.sendMessage(orderId,delayTimes); + } + /** * 生成18位订单编号:8位日期+2位平台号码+2位支付方式+6位以上自增id */ diff --git a/mall-portal/src/main/resources/application-dev.properties b/mall-portal/src/main/resources/application-dev.properties index 8bbf4ec..5aaf85a 100644 --- a/mall-portal/src/main/resources/application-dev.properties +++ b/mall-portal/src/main/resources/application-dev.properties @@ -66,5 +66,7 @@ spring.rabbitmq.port=5672 spring.rabbitmq.virtual-host=/mall spring.rabbitmq.username=mall spring.rabbitmq.password=mall +#첽ϢҪصΪtrue +spring.rabbitmq.publisher-confirms=true #===rabbitMq end===