From d09254f0bb6249da368728c5369f0c840382d4a7 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 18 Apr 2025 09:55:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/account/service/impl/AccInfoServiceImpl.java | 9 ++++++++- .../core/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java index b50f3b1..f7bc544 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java @@ -324,7 +324,14 @@ public class AccInfoServiceImpl implements IAccInfoService { .eq(AccInfo::getUserId, accountEnableDisableParam.getUserId())); if (flag > 0) { this.accOperationHistoryService.addAccOperationHistory(accountEnableDisableParam.getUserId(), accountEnableDisableParam.getAccStatus().intValue()); - this.accMqSender.accChangeMQ(Collections.singletonList(accountEnableDisableParam.getUserId()), accountEnableDisableParam.getAccStatus().intValue()); + try { + DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(accountEnableDisableParam.getUserId()),"update"); + String jsonString = JacksonUtil.writeValueAsString(bean); + log.info("账户变动发送mq内容：{}", jsonString); + MqUtil.pushToTenantAllDevice(bean, LeMqConstant.Topic.DEVICE_UPDATE_PERSONAL_CONFIG_V4); + } catch (Exception e) { + log.error("发送MQ消息失败", e); + } } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index d1e75b5..6955cf9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -176,8 +176,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService } String payOrderKey = String.format("sc:order_pay_orderId_%s", orderId); if (!RedisUtil.setNx(payOrderKey, 1, 2)) { - log.info("退单处理中：{}", payOrderKey); - throw new ServiceException("退单处理中"); + log.info("支付处理中：{}", payOrderKey); + throw new ServiceException("支付处理中"); } if(orderInfo.getOrderState().equals(OrderRefundStateEnum.FINISH.getKey())) { throw new ServiceException("订单已退");