szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:peng-ou/haoka-server into develop

This commit is contained in:
Owen 2025-03-04 10:15:57 +08:00
parent 5fcb9231ae a87b5d1a10
commit 93124340e5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/OrderMessageConsumer.java
View File

@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.haoka.service.orderCatch; package cn.iocoder.yudao.module.haoka.service.orderCatch;
import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import cn.iocoder.yudao.module.haoka.controller.admin.orderCatch.po.DouDianOrderMessage; import cn.iocoder.yudao.module.haoka.controller.admin.orderCatch.po.DouDianOrderMessage;
import com.doudian.open.utils.JsonUtil;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.Queue; import org.springframework.amqp.rabbit.annotation.Queue;
@ -21,11 +21,12 @@ public class OrderMessageConsumer {
private OrderCatchService orderCatchService; private OrderCatchService orderCatchService;
@RabbitListener(queuesToDeclare = { @Queue(value = DouDianOrderMessage.QUEUE,durable = "true", autoDelete = "false") }, ackMode = "MANUAL") @RabbitListener(queuesToDeclare = { @Queue(value = DouDianOrderMessage.QUEUE,durable = "true", autoDelete = "false") }, ackMode = "MANUAL")
public void onMessage(DouDianOrderMessage message, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) { public void onMessage(String message, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
try { try {
log.info("[onMessage][消息内容({})]", JsonUtil.toJson(message)); log.info("[onMessage][消息内容({})]", message);
TenantContextHolder.setTenantId(162L); TenantContextHolder.setTenantId(162L);
orderCatchService.catchOrders(message.getMessages()); DouDianOrderMessage orderMessage = JSONUtil.toBean(message, DouDianOrderMessage.class);
orderCatchService.catchOrders(orderMessage.getMessages());
// 手动确认消息 // 手动确认消息
channel.basicAck(deliveryTag, false); channel.basicAck(deliveryTag, false);
} catch (Exception e) { } catch (Exception e) {

6
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/OrderMessageProducer.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.haoka.service.orderCatch; package cn.iocoder.yudao.module.haoka.service.orderCatch;
import cn.hutool.json.JSONUtil;
import cn.iocoder.yudao.module.haoka.controller.admin.orderCatch.po.DouDianOrderMessage; import cn.iocoder.yudao.module.haoka.controller.admin.orderCatch.po.DouDianOrderMessage;
import cn.iocoder.yudao.module.haoka.controller.admin.orderCatch.po.Message; import cn.iocoder.yudao.module.haoka.controller.admin.orderCatch.po.Message;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -9,6 +10,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
import java.util.Optional;
import java.util.UUID; import java.util.UUID;
@Slf4j @Slf4j
@ -27,6 +29,8 @@ public class OrderMessageProducer {
message.setMessages(messages); message.setMessages(messages);
// 为消息添加唯一ID // 为消息添加唯一ID
CorrelationData correlationData = new CorrelationData(UUID.randomUUID().toString()); CorrelationData correlationData = new CorrelationData(UUID.randomUUID().toString());
rabbitTemplate.convertAndSend(DouDianOrderMessage.QUEUE, message, correlationData); String jsonStr = JSONUtil.toJsonStr(message);
log.error("订单消息内容：{}", jsonStr);
rabbitTemplate.convertAndSend(DouDianOrderMessage.QUEUE, Optional.ofNullable(jsonStr), correlationData);
} }
} }