diff --git a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java index a246fe6ad..d5b61ad61 100644 --- a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java +++ b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java @@ -7,6 +7,8 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.Map; + /** * @author GYJoker */ @@ -132,8 +134,11 @@ public class RabbitPublisher { /** * 订单商品状态消息 */ - public void sendOrderDetailStatusMsg(String shopId) { - sendMsg(RabbitConstants.Queue.ORDER_DETAIL_STATUS_QUEUE, shopId); + public void sendOrderDetailStatusMsg(String shopId, String type) { + sendMsg(RabbitConstants.Queue.ORDER_DETAIL_STATUS_QUEUE, JSONObject.toJSONString(Map.of( + "shopId", shopId, + "type", type + ))); } private void sendMsg(String queue, String msg) { diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index f6b859b5f..410b05d35 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -316,10 +316,10 @@ public class ShopInfoServiceImpl extends ServiceImpl i if (flag) { sysUserService.updateById(sysUser); } + rabbitPublisher.sendOrderDetailStatusMsg(shopInfo.getId().toString(), "shopInfoUpdate"); return true; } - rabbitPublisher.sendOrderDetailStatusMsg(shopInfo.getId().toString()); return false; } diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index 02caa154d..4b713001b 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -325,7 +325,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { redisService.set(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId(), "", 60 * 15); } rabbitPublisher.sendOrderStockMsg(orderInfo.getId().toString()); - rabbitPublisher.sendOrderDetailStatusMsg(orderInfo.getShopId().toString()); + rabbitPublisher.sendOrderDetailStatusMsg(orderInfo.getShopId().toString(), "bc"); return orderInfo; } @@ -1340,7 +1340,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { rabbitPublisher.sendOrderPrintMsg(printParam, isPrint); // log.info("非事务环境下,直接发送订单{}打印消息", orderId); } - rabbitPublisher.sendOrderDetailStatusMsg(orderInfo.getShopId().toString()); + rabbitPublisher.sendOrderDetailStatusMsg(orderInfo.getShopId().toString(), "bc"); redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId()); } @@ -1790,7 +1790,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { } } - rabbitPublisher.sendOrderDetailStatusMsg(shopId.toString()); + rabbitPublisher.sendOrderDetailStatusMsg(shopId.toString(), "bc"); return true; } }