angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 去掉续约相关逻辑；

This commit is contained in:
cabbage 2025-07-03 16:04:20 +08:00
parent 773717e82f
commit 2f78a8a7d4
4 changed files with 104 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java
View File

@ -379,7 +379,7 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
@Override @Override
public void memberContinueMQ(List<MemberContinueDTO> memberContinueDTOList) { public void memberContinueMQ(List<MemberContinueDTO> memberContinueDTOList) {
rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, memberContinueDTOList); // rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, memberContinueDTOList);
} }
@Override @Override

110
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -804,14 +804,14 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// log.info("生产秒结消息，order.second.exchange：{}", JSONUtil.toJsonStr(saOrderExt)); // log.info("生产秒结消息，order.second.exchange：{}", JSONUtil.toJsonStr(saOrderExt));
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); // rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { // if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
// 推送会员续约处理MQ // // 推送会员续约处理MQ
rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, // rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY,
MemberContinueDTO.builder() // MemberContinueDTO.builder()
.pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) // .pkMemberList(Collections.singletonList(saOrderExt.getPkMember()))
.eMemberContinue(EMemberContinue.REGISTER_ORDER) // .eMemberContinue(EMemberContinue.REGISTER_ORDER)
.build()); // .build());
} // }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -929,14 +929,14 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); // rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt); rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt);
if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { // if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
// 推送会员续约处理MQ // // 推送会员续约处理MQ
rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, // rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY,
MemberContinueDTO.builder() // MemberContinueDTO.builder()
.pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) // .pkMemberList(Collections.singletonList(saOrderExt.getPkMember()))
.eMemberContinue(EMemberContinue.UPGRADE_ORDER) // .eMemberContinue(EMemberContinue.UPGRADE_ORDER)
.build()); // .build());
} // }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -1022,14 +1022,14 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
} }
try { try {
if (EOrderType.RENEWAL_ORDER.getValue() == saOrderExt.getOrderType()) { // if (EOrderType.RENEWAL_ORDER.getValue() == saOrderExt.getOrderType()) {
// 续约专区推送MQ // // 续约专区推送MQ
rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, // rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY,
MemberContinueDTO.builder() // MemberContinueDTO.builder()
.pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) // .pkMemberList(Collections.singletonList(saOrderExt.getPkMember()))
.eMemberContinue(EMemberContinue.BUY_GIFT) // .eMemberContinue(EMemberContinue.BUY_GIFT)
.build()); // .build());
} // }
// // 推送秒结数据 // // 推送秒结数据
// rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt); // rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
} catch (Exception e) { } catch (Exception e) {
@ -1653,22 +1653,22 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 推送MQ，处理活动回退 // 推送MQ，处理活动回退
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_CANCEL_EXCHANGE, RabbitMqConstants.ORDER_CANCEL_KEY, mqList); rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_CANCEL_EXCHANGE, RabbitMqConstants.ORDER_CANCEL_KEY, mqList);
if (EOrderType.UPGRADE_ORDER.getValue() == mqList.get(0).getOrderType()) { // if (EOrderType.UPGRADE_ORDER.getValue() == mqList.get(0).getOrderType()) {
// 升级订单撤单，只能一次撤一单，推送会员续约处理MQ // // 升级订单撤单，只能一次撤一单，推送会员续约处理MQ
rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, // rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY,
MemberContinueDTO.builder() // MemberContinueDTO.builder()
.pkMemberList(Collections.singletonList(mqList.get(0).getPkMember())) // .pkMemberList(Collections.singletonList(mqList.get(0).getPkMember()))
.eMemberContinue(EMemberContinue.UPGRADE_CANCEL) // .eMemberContinue(EMemberContinue.UPGRADE_CANCEL)
.build()); // .build());
} else if (EOrderType.REGISTER_ORDER.getValue() == mqList.get(0).getOrderType()) { // } else if (EOrderType.REGISTER_ORDER.getValue() == mqList.get(0).getOrderType()) {
// 注册订单撤单，推送会员续约处理MQ // // 注册订单撤单，推送会员续约处理MQ
List<Long> pkMemberList = mqList.stream().map(SaOrderExt::getPkMember).collect(Collectors.toList()); // List<Long> pkMemberList = mqList.stream().map(SaOrderExt::getPkMember).collect(Collectors.toList());
rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, // rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY,
MemberContinueDTO.builder() // MemberContinueDTO.builder()
.pkMemberList(pkMemberList) // .pkMemberList(pkMemberList)
.eMemberContinue(EMemberContinue.REGISTER_CANCEL) // .eMemberContinue(EMemberContinue.REGISTER_CANCEL)
.build()); // .build());
} // }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -2464,21 +2464,21 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 推送MQ，处理活动回退 // 推送MQ，处理活动回退
rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_CANCEL_EXCHANGE, RabbitMqConstants.ORDER_CANCEL_KEY, Collections.singletonList(saOrderExt)); rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_CANCEL_EXCHANGE, RabbitMqConstants.ORDER_CANCEL_KEY, Collections.singletonList(saOrderExt));
if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) { // if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
// 升级订单撤单，推送会员续约处理MQ // // 升级订单撤单，推送会员续约处理MQ
rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, // rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY,
MemberContinueDTO.builder() // MemberContinueDTO.builder()
.pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) // .pkMemberList(Collections.singletonList(saOrderExt.getPkMember()))
.eMemberContinue(EMemberContinue.UPGRADE_CANCEL) // .eMemberContinue(EMemberContinue.UPGRADE_CANCEL)
.build()); // .build());
} else if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) { // } else if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
// 注册订单撤单，推送会员续约处理MQ // // 注册订单撤单，推送会员续约处理MQ
rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, // rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY,
MemberContinueDTO.builder() // MemberContinueDTO.builder()
.pkMemberList(Collections.singletonList(saOrderExt.getPkMember())) // .pkMemberList(Collections.singletonList(saOrderExt.getPkMember()))
.eMemberContinue(EMemberContinue.REGISTER_CANCEL) // .eMemberContinue(EMemberContinue.REGISTER_CANCEL)
.build()); // .build());
} // }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

26
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java
View File

@ -81,19 +81,19 @@ public class RabbitMqConstants {
*/ */
public static final String BUSINESS_LOG_KEY = PREFIX + "business.log.key"; public static final String BUSINESS_LOG_KEY = PREFIX + "business.log.key";
/** // /**
* 会员续约 exchange // * 会员续约 exchange
*/ // */
public static final String MEMBER_CONTINUE_EXCHANGE = PREFIX + "member.continue.exchange"; // public static final String MEMBER_CONTINUE_EXCHANGE = PREFIX + "member.continue.exchange";
/** // /**
* 会员续约 queue // * 会员续约 queue
*/ // */
public static final String MEMBER_CONTINUE_QUEUE = PREFIX + "member.continue.queue"; // public static final String MEMBER_CONTINUE_QUEUE = PREFIX + "member.continue.queue";
//
/** // /**
* 会员续约 key // * 会员续约 key
*/ // */
public static final String MEMBER_CONTINUE_KEY = PREFIX + "member.continue.key"; // public static final String MEMBER_CONTINUE_KEY = PREFIX + "member.continue.key";
////////////////////////////// 会员撤单统一推送 EXCHANGE 和 KEY ////////////////////////////// ////////////////////////////// 会员撤单统一推送 EXCHANGE 和 KEY //////////////////////////////
/** /**

70
bd-third/src/main/java/com/hzs/third/mqcall/listener/MemberContinueListener.java
View File

@ -23,40 +23,40 @@ public class MemberContinueListener {
@DubboReference @DubboReference
IMemberServiceApi iMemberServiceApi; IMemberServiceApi iMemberServiceApi;
/** // /**
* 会员续约处理，当会员注册、撤单、升级奖衔等进行处理 // * 会员续约处理，当会员注册、撤单、升级奖衔等进行处理
* // *
* @param message // * @param message
* @param channel // * @param channel
* @throws Exception // * @throws Exception
*/ // */
@RabbitListener(bindings = @QueueBinding( // @RabbitListener(bindings = @QueueBinding(
exchange = @Exchange(value = RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, type = "topic"), // exchange = @Exchange(value = RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, type = "topic"),
value = @Queue(value = RabbitMqConstants.MEMBER_CONTINUE_QUEUE, durable = "true", autoDelete = "false"), // value = @Queue(value = RabbitMqConstants.MEMBER_CONTINUE_QUEUE, durable = "true", autoDelete = "false"),
key = RabbitMqConstants.MEMBER_CONTINUE_KEY)) // key = RabbitMqConstants.MEMBER_CONTINUE_KEY))
@RabbitHandler // @RabbitHandler
public void onMessage(Message<MemberContinueDTO> message, Channel channel) throws Exception { // public void onMessage(Message<MemberContinueDTO> message, Channel channel) throws Exception {
// 手动应答 // // 手动应答
Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG); // Long deliveryTag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG);
channel.basicAck(deliveryTag, false); // channel.basicAck(deliveryTag, false);
//
MemberContinueDTO memberContinueDTO = message.getPayload(); // MemberContinueDTO memberContinueDTO = message.getPayload();
log.info("会员续约MQ处理. 参数：{}", memberContinueDTO); // log.info("会员续约MQ处理. 参数：{}", memberContinueDTO);
//
// 拿到信息之后，延迟1秒再处理，防止出现MQ消费处理速度比正常业务处理速度快 // // 拿到信息之后，延迟1秒再处理，防止出现MQ消费处理速度比正常业务处理速度快
Thread.sleep(1000); // Thread.sleep(1000);
//
if (null == memberContinueDTO.getEMemberContinue() // if (null == memberContinueDTO.getEMemberContinue()
|| CollectionUtil.isEmpty(memberContinueDTO.getPkMemberList())) { // || CollectionUtil.isEmpty(memberContinueDTO.getPkMemberList())) {
log.error("会员续约MQ处理缺少信息"); // log.error("会员续约MQ处理缺少信息");
return; // return;
} // }
//
// 调用会员服务处理同姓名、同手机号有效期及休止期逻辑 // // 调用会员服务处理同姓名、同手机号有效期及休止期逻辑
R resultR = iMemberServiceApi.handleMemberContinue(memberContinueDTO); // R resultR = iMemberServiceApi.handleMemberContinue(memberContinueDTO);
if (!resultR.isSuccess()) { // if (!resultR.isSuccess()) {
log.error("会员续约处理异常，msg: {}", resultR.getMsg()); // log.error("会员续约处理异常，msg: {}", resultR.getMsg());
} // }
} // }
} }