diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/Lucky24GiftSendService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/Lucky24GiftSendService.java index fd4398179..fc3cb90d0 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/Lucky24GiftSendService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/gift/Lucky24GiftSendService.java @@ -120,7 +120,8 @@ public class Lucky24GiftSendService { jedisService.hwrite(RedisKey.lucky_24_status.getKey(), caches); - rocketMQService.asyncSendBatchLucky24Message(messageList); + //rocketMQService.asyncSendBatchLucky24Message(messageList); + rocketMQService.sendBatchLucky24Message(messageList); } public Lucky24Record drawMultiple2(Lucky24GiftConfig config, Lucky24GiftConfig partitionConfig, long senderUid, Users sender, int partitionId, diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mq/RocketMQService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mq/RocketMQService.java index 8a9f7bc71..197616ad2 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mq/RocketMQService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mq/RocketMQService.java @@ -47,6 +47,23 @@ public class RocketMQService { } } + /** + * 送礼物消息,发送到MQ + * + * @param lucky24Messages + */ + public void sendBatchLucky24Message(Collection lucky24Messages) { + List> messageList = lucky24Messages.stream() + .map(giftMessage -> MessageBuilder.withPayload(JSON.toJSONString(giftMessage)).build()) + .collect(Collectors.toList()); + SendResult sendResult = rocketMQTemplate.syncSend(MqConstant.LUCKY_24_TOPIC, messageList); + if (SendStatus.SEND_OK.equals(sendResult.getSendStatus())){ + log.info("sendLucky24Message success result: {} message: {}", JSON.toJSONString(sendResult), messageList); + } else { + log.error("sendLucky24Message fail result: {} message: {}", JSON.toJSONString(sendResult), messageList); + } + } + /** * 送礼物消息,发送到MQ * diff --git a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/Lucky24MessageConsumer.java b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/Lucky24MessageConsumer.java index 92b06552b..bfdea9f9d 100644 --- a/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/Lucky24MessageConsumer.java +++ b/accompany-mq/accompany-mq-web/src/main/java/com/accompany/mq/consumer/Lucky24MessageConsumer.java @@ -14,7 +14,8 @@ import org.springframework.stereotype.Component; @Slf4j @Component @ConditionalOnProperty(name = "spring.application.name", havingValue = "web") -@RocketMQMessageListener(topic = MqConstant.LUCKY_24_TOPIC, consumerGroup = MqConstant.LUCKY_24_CONSUME_GROUP, consumeMode = ConsumeMode.ORDERLY) +//@RocketMQMessageListener(topic = MqConstant.LUCKY_24_TOPIC, consumerGroup = MqConstant.LUCKY_24_CONSUME_GROUP, consumeMode = ConsumeMode.ORDERLY) +@RocketMQMessageListener(topic = MqConstant.LUCKY_24_TOPIC, consumerGroup = MqConstant.LUCKY_24_CONSUME_GROUP) public class Lucky24MessageConsumer extends AbstractMessageListener { @Autowired