提交 06596ead authored 作者: huyufan's avatar huyufan

修改BUG

上级 510cd971
...@@ -108,17 +108,17 @@ public class GoodsOrderController { ...@@ -108,17 +108,17 @@ public class GoodsOrderController {
if (sendLazyTime.isAfter(now)) { if (sendLazyTime.isAfter(now)) {
epochMilli = sendLazyTime.minusMinutes(now.getMinute()).getMinute() * 60 * 1000; epochMilli = sendLazyTime.minusMinutes(now.getMinute()).getMinute() * 60 * 1000;
log.info("选择时间在当前时间之后,则设置延迟队列时间,时间为:{}", epochMilli); log.info("执行订单状态更改,选择时间在当前时间之后,则设置延迟队列时间,时间为:{}", epochMilli);
//选择时间在当前时间之后,则设置延迟队列时间 //选择时间在当前时间之后,则设置延迟队列时间
} }
if (epochMilli == 0L) { if (epochMilli == 0L) {
log.info("epochMilli时间为0,时间为:{}", epochMilli); log.info("执行订单状态更改,epochMilli时间为0,时间为:{}", epochMilli);
rabbitTemplate.send( rabbitTemplate.send(
RabbitKeyConstants.ORDER_ON_DEAD_EXCHANGE, RabbitKeyConstants.ORDER_ON_DEAD_ROUTE_KEY, message RabbitKeyConstants.ORDER_ON_DEAD_EXCHANGE, RabbitKeyConstants.ORDER_ON_DEAD_ROUTE_KEY, message
); );
} else { } else {
log.info("epochMilli时间不为0,时间为:{}", epochMilli); log.info("执行订单状态更改,epochMilli时间不为0,时间为:{}", epochMilli);
rabbitTemplate.send(RabbitKeyConstants.ORDER_POSTED_EXCHANGE, RabbitKeyConstants.ORDER_POSTED_ROUTE_KEY, MessageBuilder.withBody(orderNo.toString().getBytes()).build()); rabbitTemplate.send(RabbitKeyConstants.ORDER_POSTED_EXCHANGE, RabbitKeyConstants.ORDER_POSTED_ROUTE_KEY, MessageBuilder.withBody(orderNo.toString().getBytes()).build());
message.getMessageProperties().setExpiration(String.valueOf(epochMilli)); message.getMessageProperties().setExpiration(String.valueOf(epochMilli));
......
...@@ -155,29 +155,30 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe ...@@ -155,29 +155,30 @@ public class OneGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
} }
public void sendMq(Map<String, LocalDateTime> mqMap, LocalDateTime now) { public void sendMq(Map<String, LocalDateTime> mqMap, LocalDateTime now) {
log.info("执行sendMq方法,mqMap大小为:{}", mqMap.size());
for (Map.Entry<String, LocalDateTime> entry : mqMap.entrySet()) { for (Map.Entry<String, LocalDateTime> entry : mqMap.entrySet()) {
log.info("发送货单更改挂单中延迟消息,时间:{},orderGoodsNo:{}", entry.getKey(), entry.getValue()); log.info("货单更改挂单中,发送货单更改挂单中延迟消息,时间:{},orderGoodsNo:{}", entry.getValue(), entry.getKey());
Message message = MessageBuilder.withBody(entry.getKey().getBytes()).build(); Message message = MessageBuilder.withBody(entry.getKey().getBytes()).build();
long epochMilli = 0L; long epochMilli = 0L;
if (entry.getValue().isAfter(now)) { if (entry.getValue().isAfter(now)) {
epochMilli = entry.getValue().minusMinutes(now.getMinute()).getMinute() * 60 * 1000; epochMilli = entry.getValue().minusMinutes(now.getMinute()).getMinute() * 60 * 1000;
log.info("选择时间在当前时间之后,则设置延迟队列时间,时间为:{}", epochMilli); log.info("货单更改挂单中,选择时间在当前时间之后,则设置延迟队列时间,时间为:{}", epochMilli);
} }
if (epochMilli == 0L) { if (epochMilli == 0L) {
log.info("epochMilli时间为0,时间为:{}", epochMilli); log.info("货单更改挂单中,epochMilli时间为0,时间为:{}", epochMilli);
log.info("货单更改挂单中直接发延迟队列,因为时间早于当前时间"); log.info("货单更改挂单中直接发延迟队列,因为时间早于当前时间");
rabbitTemplate.send( rabbitTemplate.send(
RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY, message RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY, message
); );
} else { } else {
log.info("epochMilli时间不为0,时间为:{}", epochMilli); log.info("货单更改挂单中,epochMilli时间不为0,时间为:{}", epochMilli);
log.info("货单更改挂单中发送延迟消息,因为挂单时间大于当前时间{}", epochMilli); log.info("货单更改挂单中发送延迟消息,因为挂单时间大于当前时间{}", epochMilli);
message.getMessageProperties().setExpiration(String.valueOf(epochMilli)); message.getMessageProperties().setExpiration(String.valueOf(epochMilli));
rabbitTemplate.send( rabbitTemplate.send(
RabbitKeyConstants.ORDER_GOODS_ON_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY, message RabbitKeyConstants.ORDER_GOODS_ON_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_ROUTE_KEY, message
); );
} }
} }
......
...@@ -150,26 +150,30 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing ...@@ -150,26 +150,30 @@ public class ThreeGoodsOrderStrategy implements GoodsOrderStrategy, Initializing
} }
public void sendMq(Map<String, LocalDateTime> mqMap, LocalDateTime now) { public void sendMq(Map<String, LocalDateTime> mqMap, LocalDateTime now) {
log.info("执行sendMq方法,mqMap大小为:{}", mqMap.size());
for (Map.Entry<String, LocalDateTime> entry : mqMap.entrySet()) { for (Map.Entry<String, LocalDateTime> entry : mqMap.entrySet()) {
log.info("货单更改挂单中,发送货单更改挂单中延迟消息,时间:{},orderGoodsNo:{}", entry.getValue(), entry.getKey());
Message message = MessageBuilder.withBody(entry.getKey().getBytes()).build(); Message message = MessageBuilder.withBody(entry.getKey().getBytes()).build();
long epochMilli = 0L; long epochMilli = 0L;
if (entry.getValue().isAfter(now)) { if (entry.getValue().isAfter(now)) {
epochMilli = entry.getValue().minusMinutes(now.getMinute()).getMinute() * 60 * 1000; epochMilli = entry.getValue().minusMinutes(now.getMinute()).getMinute() * 60 * 1000;
log.info("选择时间在当前时间之后,则设置延迟队列时间,时间为:{}", epochMilli); log.info("货单更改挂单中,选择时间在当前时间之后,则设置延迟队列时间,时间为:{}", epochMilli);
} }
if (epochMilli == 0L) { if (epochMilli == 0L) {
log.info("epochMilli时间为0,时间为:{}", epochMilli); log.info("货单更改挂单中,epochMilli时间为0,时间为:{}", epochMilli);
log.info("货单更改挂单中直接发延迟队列,因为时间早于当前时间");
rabbitTemplate.send( rabbitTemplate.send(
RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY, message RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY, message
); );
} else { } else {
log.info("epochMilli时间不为0,时间为:{}", epochMilli); log.info("货单更改挂单中,epochMilli时间不为0,时间为:{}", epochMilli);
log.info("货单更改挂单中发送延迟消息,因为挂单时间大于当前时间{}", epochMilli);
message.getMessageProperties().setExpiration(String.valueOf(epochMilli)); message.getMessageProperties().setExpiration(String.valueOf(epochMilli));
rabbitTemplate.send( rabbitTemplate.send(
RabbitKeyConstants.ORDER_GOODS_ON_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY, message RabbitKeyConstants.ORDER_GOODS_ON_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_ROUTE_KEY, message
); );
} }
} }
......
...@@ -155,26 +155,30 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe ...@@ -155,26 +155,30 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
} }
public void sendMq(Map<String, LocalDateTime> mqMap, LocalDateTime now) { public void sendMq(Map<String, LocalDateTime> mqMap, LocalDateTime now) {
log.info("执行sendMq方法,mqMap大小为:{}", mqMap.size());
for (Map.Entry<String, LocalDateTime> entry : mqMap.entrySet()) { for (Map.Entry<String, LocalDateTime> entry : mqMap.entrySet()) {
log.info("货单更改挂单中,发送货单更改挂单中延迟消息,时间:{},orderGoodsNo:{}", entry.getValue(), entry.getKey());
Message message = MessageBuilder.withBody(entry.getKey().getBytes()).build(); Message message = MessageBuilder.withBody(entry.getKey().getBytes()).build();
long epochMilli = 0L; long epochMilli = 0L;
if (entry.getValue().isAfter(now)) { if (entry.getValue().isAfter(now)) {
epochMilli = entry.getValue().minusMinutes(now.getMinute()).getMinute() * 60 * 1000; epochMilli = entry.getValue().minusMinutes(now.getMinute()).getMinute() * 60 * 1000;
log.info("选择时间在当前时间之后,则设置延迟队列时间,时间为:{}", epochMilli); log.info("货单更改挂单中,选择时间在当前时间之后,则设置延迟队列时间,时间为:{}", epochMilli);
} }
if (epochMilli == 0L) { if (epochMilli == 0L) {
log.info("epochMilli时间为0,时间为:{}", epochMilli); log.info("货单更改挂单中,epochMilli时间为0,时间为:{}", epochMilli);
log.info("货单更改挂单中直接发延迟队列,因为时间早于当前时间");
rabbitTemplate.send( rabbitTemplate.send(
RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY, message RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY, message
); );
} else { } else {
log.info("epochMilli时间不为0,时间为:{}", epochMilli); log.info("货单更改挂单中,epochMilli时间不为0,时间为:{}", epochMilli);
log.info("货单更改挂单中发送延迟消息,因为挂单时间大于当前时间{}", epochMilli);
message.getMessageProperties().setExpiration(String.valueOf(epochMilli)); message.getMessageProperties().setExpiration(String.valueOf(epochMilli));
rabbitTemplate.send( rabbitTemplate.send(
RabbitKeyConstants.ORDER_GOODS_ON_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY, message RabbitKeyConstants.ORDER_GOODS_ON_EXCHANGE, RabbitKeyConstants.ORDER_GOODS_ON_ROUTE_KEY, message
); );
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论