From 26e784e2d5af0c674cef6bc9276e3ef5cfb31bd7 Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Mon, 26 Jan 2026 11:09:05 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8D=E5=85=85=E5=80=BC?= =?UTF-8?q?=E5=92=8C=E6=8F=90=E7=8E=B0=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=A1=AE=E5=AE=9E=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/m2pool/lease/mq/MessageReceiver.java | 43 +++++++++++-------- .../service/impl/LeaseUserServiceImpl.java | 20 ++++----- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/m2pool/lease/mq/MessageReceiver.java b/src/main/java/com/m2pool/lease/mq/MessageReceiver.java index 91b1f60..a3f9eb7 100644 --- a/src/main/java/com/m2pool/lease/mq/MessageReceiver.java +++ b/src/main/java/com/m2pool/lease/mq/MessageReceiver.java @@ -550,7 +550,6 @@ public class MessageReceiver { // //测试 开发环境 充值测试 //@RabbitListener(queues = RabbitmqConstant.PAY_RECHARGE_QUEUE,containerFactory ="rabbitListenerContainerFactory") - //@Transactional(rollbackFor = Exception.class) //public void listenerPayRechargeQueueMessage(@Payload RabbitmqPayRechargeMessage payAutoReturnMessage) { // String s = UuidGeneratorUtil.generateUuidWithoutHyphen(); // ////发送充值消息 @@ -570,33 +569,39 @@ public class MessageReceiver { // RabbitmqPayRechargeReturnMessage rabbitmqPayRechargeReturnMessage1 = RabbitmqPayRechargeReturnMessage.builder() // .queue_id(payAutoReturnMessage.getQueue_id()) // .status(1) - // .amount(BigDecimal.valueOf(20)) + // .amount(BigDecimal.valueOf(100)) // .chain(payAutoReturnMessage.getChain()) // .symbol(payAutoReturnMessage.getSymbol()) // .address(payAutoReturnMessage.getAddress()) + // .user_email(payAutoReturnMessage.getUser_email()) + // .fromAddress(payAutoReturnMessage.getAddress()) // .tx_hash(s) // .build(); // rabbitTemplate.convertAndSend(RabbitmqConstant.PAY_RECHARGE_RETURN_QUEUE,rabbitmqPayRechargeReturnMessage1); //} - //提现 - @RabbitListener(queues = RabbitmqConstant.PAY_WITHDRAW_QUEUE,containerFactory ="rabbitListenerContainerFactory") - @Transactional(rollbackFor = Exception.class) - public void listenerWithdrawQueueMessage(@Payload RabbitmqPayWithdrawMessage payAutoReturnMessage) { - //发送充值消息 - RabbitmqPayWithdrawReturnMessage rabbitmqPayRechargeReturnMessage = RabbitmqPayWithdrawReturnMessage.builder() - .queue_id(payAutoReturnMessage.getQueue_id()) - .status(1) - .amount(payAutoReturnMessage.getAmount()) - .chain(payAutoReturnMessage.getChain()) - .symbol(payAutoReturnMessage.getSymbol()) - .from_address(payAutoReturnMessage.getFrom_address()) - .tx_hash(UuidGeneratorUtil.generateUuidWithoutHyphen()) - .fee(payAutoReturnMessage.getFee()) - .build(); - rabbitTemplate.convertAndSend(RabbitmqConstant.PAY_WITHDRAW_RETURN_QUEUE,rabbitmqPayRechargeReturnMessage); - } + ////提现 + //@RabbitListener(queues = RabbitmqConstant.PAY_WITHDRAW_QUEUE,containerFactory ="rabbitListenerContainerFactory") + //public void listenerWithdrawQueueMessage(@Payload RabbitmqPayWithdrawMessage payAutoReturnMessage) throws InterruptedException { + // Thread.sleep(10000); + // RabbitmqPayWithdrawReturnMessage rabbitmqPayRechargeReturnMessage = RabbitmqPayWithdrawReturnMessage.builder() + // .queue_id(payAutoReturnMessage.getQueue_id()) + // .status(1) + // .amount(payAutoReturnMessage.getAmount()) + // .chain(payAutoReturnMessage.getChain()) + // .symbol(payAutoReturnMessage.getSymbol()) + // .from_address(payAutoReturnMessage.getFrom_address()) + // .tx_hash(UuidGeneratorUtil.generateUuidWithoutHyphen()) + // .fee(payAutoReturnMessage.getFee()) + // .user_email(payAutoReturnMessage.getUser_email()) + // .build(); + // //提现100 提现失败 + // if (payAutoReturnMessage.getAmount().equals(BigDecimal.valueOf(100))){ + // rabbitmqPayRechargeReturnMessage.setStatus(0); + // } + // rabbitTemplate.convertAndSend(RabbitmqConstant.PAY_WITHDRAW_RETURN_QUEUE,rabbitmqPayRechargeReturnMessage); + //} ////测试 开发环境 删除钱包测试 diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java index b5ccc97..0f2e3c6 100644 --- a/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java +++ b/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java @@ -1087,16 +1087,16 @@ public class LeaseUserServiceImpl extends ServiceImpl