lizixuan/cloud_hash_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 修复充值和提现日志打印确实用户信息的问题

Browse Source
This commit is contained in:
yyb
2026-01-26 11:09:05 +08:00
parent b1aef6f4c7
commit 26e784e2d5
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/m2pool/lease/mq/MessageReceiver.java
View File

@@ -550,7 +550,6 @@ public class MessageReceiver {
// //
//测试 开发环境 充值测试 //测试 开发环境 充值测试
//@RabbitListener(queues = RabbitmqConstant.PAY_RECHARGE_QUEUE,containerFactory ="rabbitListenerContainerFactory") //@RabbitListener(queues = RabbitmqConstant.PAY_RECHARGE_QUEUE,containerFactory ="rabbitListenerContainerFactory")
//@Transactional(rollbackFor = Exception.class)
//public void listenerPayRechargeQueueMessage(@Payload RabbitmqPayRechargeMessage payAutoReturnMessage) { //public void listenerPayRechargeQueueMessage(@Payload RabbitmqPayRechargeMessage payAutoReturnMessage) {
// String s = UuidGeneratorUtil.generateUuidWithoutHyphen(); // String s = UuidGeneratorUtil.generateUuidWithoutHyphen();
// ////发送充值消息 // ////发送充值消息
@@ -570,33 +569,39 @@ public class MessageReceiver {
// RabbitmqPayRechargeReturnMessage rabbitmqPayRechargeReturnMessage1 = RabbitmqPayRechargeReturnMessage.builder() // RabbitmqPayRechargeReturnMessage rabbitmqPayRechargeReturnMessage1 = RabbitmqPayRechargeReturnMessage.builder()
// .queue_id(payAutoReturnMessage.getQueue_id()) // .queue_id(payAutoReturnMessage.getQueue_id())
// .status(1) // .status(1)
// .amount(BigDecimal.valueOf(20)) // .amount(BigDecimal.valueOf(100))
// .chain(payAutoReturnMessage.getChain()) // .chain(payAutoReturnMessage.getChain())
// .symbol(payAutoReturnMessage.getSymbol()) // .symbol(payAutoReturnMessage.getSymbol())
// .address(payAutoReturnMessage.getAddress()) // .address(payAutoReturnMessage.getAddress())
// .user_email(payAutoReturnMessage.getUser_email())
// .fromAddress(payAutoReturnMessage.getAddress())
// .tx_hash(s) // .tx_hash(s)
// .build(); // .build();
// rabbitTemplate.convertAndSend(RabbitmqConstant.PAY_RECHARGE_RETURN_QUEUE,rabbitmqPayRechargeReturnMessage1); // rabbitTemplate.convertAndSend(RabbitmqConstant.PAY_RECHARGE_RETURN_QUEUE,rabbitmqPayRechargeReturnMessage1);
//} //}
//提现 ////提现
@RabbitListener(queues = RabbitmqConstant.PAY_WITHDRAW_QUEUE,containerFactory ="rabbitListenerContainerFactory") //@RabbitListener(queues = RabbitmqConstant.PAY_WITHDRAW_QUEUE,containerFactory ="rabbitListenerContainerFactory")
@Transactional(rollbackFor = Exception.class) //public void listenerWithdrawQueueMessage(@Payload RabbitmqPayWithdrawMessage payAutoReturnMessage) throws InterruptedException {
public void listenerWithdrawQueueMessage(@Payload RabbitmqPayWithdrawMessage payAutoReturnMessage) { // Thread.sleep(10000);
//发送充值消息 // RabbitmqPayWithdrawReturnMessage rabbitmqPayRechargeReturnMessage = RabbitmqPayWithdrawReturnMessage.builder()
RabbitmqPayWithdrawReturnMessage rabbitmqPayRechargeReturnMessage = RabbitmqPayWithdrawReturnMessage.builder() // .queue_id(payAutoReturnMessage.getQueue_id())
.queue_id(payAutoReturnMessage.getQueue_id()) // .status(1)
.status(1) // .amount(payAutoReturnMessage.getAmount())
.amount(payAutoReturnMessage.getAmount()) // .chain(payAutoReturnMessage.getChain())
.chain(payAutoReturnMessage.getChain()) // .symbol(payAutoReturnMessage.getSymbol())
.symbol(payAutoReturnMessage.getSymbol()) // .from_address(payAutoReturnMessage.getFrom_address())
.from_address(payAutoReturnMessage.getFrom_address()) // .tx_hash(UuidGeneratorUtil.generateUuidWithoutHyphen())
.tx_hash(UuidGeneratorUtil.generateUuidWithoutHyphen()) // .fee(payAutoReturnMessage.getFee())
.fee(payAutoReturnMessage.getFee()) // .user_email(payAutoReturnMessage.getUser_email())
.build(); // .build();
rabbitTemplate.convertAndSend(RabbitmqConstant.PAY_WITHDRAW_RETURN_QUEUE,rabbitmqPayRechargeReturnMessage); // //提现100 提现失败
} // if (payAutoReturnMessage.getAmount().equals(BigDecimal.valueOf(100))){
// rabbitmqPayRechargeReturnMessage.setStatus(0);
// }
// rabbitTemplate.convertAndSend(RabbitmqConstant.PAY_WITHDRAW_RETURN_QUEUE,rabbitmqPayRechargeReturnMessage);
//}
////测试 开发环境 删除钱包测试 ////测试 开发环境 删除钱包测试

20
src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java
View File

@@ -1087,16 +1087,16 @@ public class LeaseUserServiceImpl extends ServiceImpl<LeaseUserMapper, LeaseUser
}else{ }else{
for (UserWalletDataDto userWalletDataDto : userWalletDataDtoList) { for (UserWalletDataDto userWalletDataDto : userWalletDataDtoList) {
if (userWalletDataDto.getFromSymbol().equals(chainAndCoinVo.getCoin())){ if (userWalletDataDto.getFromSymbol().equals(chainAndCoinVo.getCoin())){
//开发环境 ////开发环境
sendMessage(UserWalletDataDto.builder() //sendMessage(UserWalletDataDto.builder()
.queueId(userWalletDataDto.getQueueId()) // .queueId(userWalletDataDto.getQueueId())
.fromAddress(userWalletDataDto.getFromAddress()) // .fromAddress(userWalletDataDto.getFromAddress())
.fromChain(chainAndCoinVo.getChain()) // .fromChain(chainAndCoinVo.getChain())
.fromSymbol(chainAndCoinVo.getCoin()) // .fromSymbol(chainAndCoinVo.getCoin())
.balance(BigDecimal.ZERO) // .balance(BigDecimal.ZERO)
.userId(userWalletDataDto.getUserId()) // .userId(userWalletDataDto.getUserId())
.qrcode(userWalletDataDto.getQrcode()) // .qrcode(userWalletDataDto.getQrcode())
.build(),username,authId); // .build(),username,authId);
return Result.success(userWalletDataDto); return Result.success(userWalletDataDto);
} }
} }