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