diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java index f7ff8af2..646faf46 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java @@ -379,7 +379,7 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService { @Override public void memberContinueMQ(List memberContinueDTOList) { - rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, memberContinueDTOList); +// rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, memberContinueDTOList); } @Override diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 97b68ff1..3fe04eaf 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -804,14 +804,14 @@ public class SaOrderServiceImpl extends ServiceImpl impl // log.info("生产秒结消息，order.second.exchange：{}", JSONUtil.toJsonStr(saOrderExt)); // rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); - if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { - // 推送会员续约处理MQ - rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, - MemberContinueDTO.builder() - .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) - .eMemberContinue(EMemberContinue.REGISTER_ORDER) - .build()); - } +// if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { +// // 推送会员续约处理MQ +// rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, +// MemberContinueDTO.builder() +// .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) +// .eMemberContinue(EMemberContinue.REGISTER_ORDER) +// .build()); +// } } catch (Exception e) { e.printStackTrace(); } @@ -929,14 +929,14 @@ public class SaOrderServiceImpl extends ServiceImpl impl // rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt); - if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { - // 推送会员续约处理MQ - rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, - MemberContinueDTO.builder() - .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) - .eMemberContinue(EMemberContinue.UPGRADE_ORDER) - .build()); - } +// if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { +// // 推送会员续约处理MQ +// rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, +// MemberContinueDTO.builder() +// .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) +// .eMemberContinue(EMemberContinue.UPGRADE_ORDER) +// .build()); +// } } catch (Exception e) { e.printStackTrace(); } @@ -1022,14 +1022,14 @@ public class SaOrderServiceImpl extends ServiceImpl impl } try { - if (EOrderType.RENEWAL_ORDER.getValue() == saOrderExt.getOrderType()) { - // 续约专区推送MQ - rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, - MemberContinueDTO.builder() - .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) - .eMemberContinue(EMemberContinue.BUY_GIFT) - .build()); - } +// if (EOrderType.RENEWAL_ORDER.getValue() == saOrderExt.getOrderType()) { +// // 续约专区推送MQ +// rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, +// MemberContinueDTO.builder() +// .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) +// .eMemberContinue(EMemberContinue.BUY_GIFT) +// .build()); +// } // // 推送秒结数据 // rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); } catch (Exception e) { @@ -1653,22 +1653,22 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 推送MQ，处理活动回退 rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_CANCEL_EXCHANGE, RabbitMqConstants.ORDER_CANCEL_KEY, mqList); - if (EOrderType.UPGRADE_ORDER.getValue() == mqList.get(0).getOrderType()) { - // 升级订单撤单，只能一次撤一单，推送会员续约处理MQ - rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, - MemberContinueDTO.builder() - .pkMemberList(Collections.singletonList(mqList.get(0).getPkMember())) - .eMemberContinue(EMemberContinue.UPGRADE_CANCEL) - .build()); - } else if (EOrderType.REGISTER_ORDER.getValue() == mqList.get(0).getOrderType()) { - // 注册订单撤单，推送会员续约处理MQ - List pkMemberList = mqList.stream().map(SaOrderExt::getPkMember).collect(Collectors.toList()); - rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, - MemberContinueDTO.builder() - .pkMemberList(pkMemberList) - .eMemberContinue(EMemberContinue.REGISTER_CANCEL) - .build()); - } +// if (EOrderType.UPGRADE_ORDER.getValue() == mqList.get(0).getOrderType()) { +// // 升级订单撤单，只能一次撤一单，推送会员续约处理MQ +// rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, +// MemberContinueDTO.builder() +// .pkMemberList(Collections.singletonList(mqList.get(0).getPkMember())) +// .eMemberContinue(EMemberContinue.UPGRADE_CANCEL) +// .build()); +// } else if (EOrderType.REGISTER_ORDER.getValue() == mqList.get(0).getOrderType()) { +// // 注册订单撤单，推送会员续约处理MQ +// List pkMemberList = mqList.stream().map(SaOrderExt::getPkMember).collect(Collectors.toList()); +// rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, +// MemberContinueDTO.builder() +// .pkMemberList(pkMemberList) +// .eMemberContinue(EMemberContinue.REGISTER_CANCEL) +// .build()); +// } } catch (Exception e) { e.printStackTrace(); } @@ -2464,21 +2464,21 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 推送MQ，处理活动回退 rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_CANCEL_EXCHANGE, RabbitMqConstants.ORDER_CANCEL_KEY, Collections.singletonList(saOrderExt)); - if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { - // 升级订单撤单，推送会员续约处理MQ - rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, - MemberContinueDTO.builder() - .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) - .eMemberContinue(EMemberContinue.UPGRADE_CANCEL) - .build()); - } else if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { - // 注册订单撤单，推送会员续约处理MQ - rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, - MemberContinueDTO.builder() - .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) - .eMemberContinue(EMemberContinue.REGISTER_CANCEL) - .build()); - } +// if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { +// // 升级订单撤单，推送会员续约处理MQ +// rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, +// MemberContinueDTO.builder() +// .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) +// .eMemberContinue(EMemberContinue.UPGRADE_CANCEL) +// .build()); +// } else if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { +// // 注册订单撤单，推送会员续约处理MQ +// rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, +// MemberContinueDTO.builder() +// .pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) +// .eMemberContinue(EMemberContinue.REGISTER_CANCEL) +// .build()); +// } } catch (Exception e) { e.printStackTrace(); } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java index 780768be..5cce9d31 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java @@ -81,19 +81,19 @@ public class RabbitMqConstants { */ public static final String BUSINESS_LOG_KEY = PREFIX + "business.log.key"; - /** - * 会员续约 exchange - */ - public static final String MEMBER_CONTINUE_EXCHANGE = PREFIX + "member.continue.exchange"; - /** - * 会员续约 queue - */ - public static final String MEMBER_CONTINUE_QUEUE = PREFIX + "member.continue.queue"; - - /** - * 会员续约 key - */ - public static final String MEMBER_CONTINUE_KEY = PREFIX + "member.continue.key"; +// /** +// * 会员续约 exchange +// */ +// public static final String MEMBER_CONTINUE_EXCHANGE = PREFIX + "member.continue.exchange"; +// /** +// * 会员续约 queue +// */ +// public static final String MEMBER_CONTINUE_QUEUE = PREFIX + "member.continue.queue"; +// +// /** +// * 会员续约 key +// */ +// public static final String MEMBER_CONTINUE_KEY = PREFIX + "member.continue.key"; ////////////////////////////// 会员撤单统一推送 EXCHANGE 和 KEY ////////////////////////////// /** diff --git a/bd-third/src/main/java/com/hzs/third/mqcall/listener/MemberContinueListener.java b/bd-third/src/main/java/com/hzs/third/mqcall/listener/MemberContinueListener.java index f9d02c6c..e8964457 100644 --- a/bd-third/src/main/java/com/hzs/third/mqcall/listener/MemberContinueListener.java +++ b/bd-third/src/main/java/com/hzs/third/mqcall/listener/MemberContinueListener.java @@ -23,40 +23,40 @@ public class MemberContinueListener { @DubboReference IMemberServiceApi iMemberServiceApi; - /** - * 会员续约处理，当会员注册、撤单、升级奖衔等进行处理 - * - * @param message - * @param channel - * @throws Exception - */ - @RabbitListener(bindings = @QueueBinding( - exchange = @Exchange(value = RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, type = "topic"), - value = @Queue(value = RabbitMqConstants.MEMBER_CONTINUE_QUEUE, durable = "true", autoDelete = "false"), - key = RabbitMqConstants.MEMBER_CONTINUE_KEY)) - @RabbitHandler - public void onMessage(Message message, Channel channel) throws Exception { - // 手动应答 - Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); - channel.basicAck(deliveryTag, false); - - MemberContinueDTO memberContinueDTO = message.getPayload(); - log.info("会员续约MQ处理. 参数：{}", memberContinueDTO); - - // 拿到信息之后，延迟1秒再处理，防止出现MQ消费处理速度比正常业务处理速度快 - Thread.sleep(1000); - - if (null == memberContinueDTO.getEMemberContinue() - || CollectionUtil.isEmpty(memberContinueDTO.getPkMemberList())) { - log.error("会员续约MQ处理缺少信息"); - return; - } - - // 调用会员服务处理同姓名、同手机号有效期及休止期逻辑 - R resultR = iMemberServiceApi.handleMemberContinue(memberContinueDTO); - if (!resultR.isSuccess()) { - log.error("会员续约处理异常，msg: {}", resultR.getMsg()); - } - } +// /** +// * 会员续约处理，当会员注册、撤单、升级奖衔等进行处理 +// * +// * @param message +// * @param channel +// * @throws Exception +// */ +// @RabbitListener(bindings = @QueueBinding( +// exchange = @Exchange(value = RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, type = "topic"), +// value = @Queue(value = RabbitMqConstants.MEMBER_CONTINUE_QUEUE, durable = "true", autoDelete = "false"), +// key = RabbitMqConstants.MEMBER_CONTINUE_KEY)) +// @RabbitHandler +// public void onMessage(Message message, Channel channel) throws Exception { +// // 手动应答 +// Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); +// channel.basicAck(deliveryTag, false); +// +// MemberContinueDTO memberContinueDTO = message.getPayload(); +// log.info("会员续约MQ处理. 参数：{}", memberContinueDTO); +// +// // 拿到信息之后，延迟1秒再处理，防止出现MQ消费处理速度比正常业务处理速度快 +// Thread.sleep(1000); +// +// if (null == memberContinueDTO.getEMemberContinue() +// || CollectionUtil.isEmpty(memberContinueDTO.getPkMemberList())) { +// log.error("会员续约MQ处理缺少信息"); +// return; +// } +// +// // 调用会员服务处理同姓名、同手机号有效期及休止期逻辑 +// R resultR = iMemberServiceApi.handleMemberContinue(memberContinueDTO); +// if (!resultR.isSuccess()) { +// log.error("会员续约处理异常，msg: {}", resultR.getMsg()); +// } +// } }