From 62ec516156ff48023413b41f6406882f1cf2f1e1 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Mon, 26 Jan 2026 10:36:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8D=96=E5=AE=B6=E5=AE=9E=E6=94=B6?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=20=E5=87=8F=E5=8E=BB=E6=89=8B=E7=BB=AD?=
 =?UTF-8?q?=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/entity/LeasePayRecordMessage.java   | 13 +++++++++++++
 .../service/impl/LeaseUserServiceImpl.java    | 19 +++++++++++++++----
 .../m2pool/lease/task/OrderAndPayTask.java    |  4 +++-
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/m2pool/lease/entity/LeasePayRecordMessage.java b/src/main/java/com/m2pool/lease/entity/LeasePayRecordMessage.java
index 05ccc6b..e472003 100644
--- a/src/main/java/com/m2pool/lease/entity/LeasePayRecordMessage.java
+++ b/src/main/java/com/m2pool/lease/entity/LeasePayRecordMessage.java
@@ -147,4 +147,17 @@ public class LeasePayRecordMessage implements Serializable {
     @TableField(exist = false)
     private Long sellerId;
 
+    /**
+     * 卖家实收金额 = 店铺手续费比例 * 买家实际支付金额
+     */
+    @TableField(exist = false)
+    private BigDecimal receivedAmount;
+
+
+    /**
+     * 卖家手续费比例
+     */
+    @TableField(exist = false)
+    private BigDecimal feeRate;
+
 }
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 b3be2f4..b5ccc97 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java
@@ -1045,6 +1045,7 @@ public class LeaseUserServiceImpl extends ServiceImpl<LeaseUserMapper, LeaseUser
     @Transactional
     public Result<UserWalletDataDto> bindWallet(ChainAndCoinVo chainAndCoinVo) {
         Long authId = SecurityUtils.getUserId();
+        String username = SecurityUtils.getUsername();
         //同一用户同一个链只会存在一个钱包
         List<UserWalletDataDto> userWalletDataDtoList = leaseUserWalletDataMapper.getWalletInfoByChain(chainAndCoinVo.getChain(),authId);
         UserWalletDataDto result;
@@ -1054,7 +1055,6 @@ public class LeaseUserServiceImpl extends ServiceImpl<LeaseUserMapper, LeaseUser
             if (bindAddress != null){
                 String address = bindAddress.getAddress();
                 String qrcode = QrCodeUtils.creatRrCode(bindAddress.getAddress(), 200, 200);
-                String username = SecurityUtils.getUsername();
                 String queueId = UuidGeneratorUtil.generateUuidWithoutHyphen();
                 result = UserWalletDataDto.builder()
                         .queueId(queueId)
@@ -1080,12 +1080,23 @@ public class LeaseUserServiceImpl extends ServiceImpl<LeaseUserMapper, LeaseUser
                 leaseAutoAddressMapper.updateById(bindAddress);
                 //监听钱包
                 sendMessage(result,username,authId);
+
             }else{
                 return Result.fail("没有可用的地址,请联系管理员生成可用的钱包地址");
             }
         }else{
             for (UserWalletDataDto userWalletDataDto : userWalletDataDtoList) {
                 if (userWalletDataDto.getFromSymbol().equals(chainAndCoinVo.getCoin())){
+                    //开发环境
+                    sendMessage(UserWalletDataDto.builder()
+                            .queueId(userWalletDataDto.getQueueId())
+                            .fromAddress(userWalletDataDto.getFromAddress())
+                            .fromChain(chainAndCoinVo.getChain())
+                            .fromSymbol(chainAndCoinVo.getCoin())
+                            .balance(BigDecimal.ZERO)
+                            .userId(userWalletDataDto.getUserId())
+                            .qrcode(userWalletDataDto.getQrcode())
+                            .build(),username,authId);
                     return  Result.success(userWalletDataDto);
                 }
             }
@@ -1169,7 +1180,7 @@ public class LeaseUserServiceImpl extends ServiceImpl<LeaseUserMapper, LeaseUser
      */
     public void sendMessage(UserWalletDataDto userWalletDataDto,String  username,Long authId){
         try {
-            System.out.println("发送mq消息");
+           String userKey = username+"--"+authId;
             long l = System.currentTimeMillis()/1000;
             RabbitmqPayRechargeMessage build = RabbitmqPayRechargeMessage.builder()
                     .queue_id(userWalletDataDto.getQueueId())
@@ -1178,11 +1189,11 @@ public class LeaseUserServiceImpl extends ServiceImpl<LeaseUserMapper, LeaseUser
                     .symbol(userWalletDataDto.getFromSymbol())
                     .timestamp(l)
                     .sign(HashUtils.sha256(l))
-                    .user_email(username)
+                    .user_email(userKey)
                     .build();
             rabbitTemplate.convertAndSend(PAY_RECHARGE_QUEUE,build);
             //记录监听钱包开始时间
-            ledgerLogService.logOperation(userWalletDataDto.getFromAddress()+"--"+username+"--"+authId, "-----监听钱包开始------","");
+            ledgerLogService.logOperation(userWalletDataDto.getFromAddress()+"--"+userKey, "-----监听钱包开始------","");
         }catch (Exception e){
             throw new PaymentException("获取钱包信息失败,请刷新重试");
         }
diff --git a/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java b/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
index 77ced45..040909e 100644
--- a/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
+++ b/src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
@@ -830,6 +830,7 @@ public class OrderAndPayTask {
                     .status(1)
                     .sellerEmail(leaseShop.getUserEmail())
                     .receivedAmount(totalRealAmount.subtract(totalRealAmount.multiply(leaseShop.getFeeRate())))
+                    .feeRate(leaseShop.getFeeRate())
                     .build();
 
             reocrdList.add(build);
@@ -863,7 +864,8 @@ public class OrderAndPayTask {
                 "支付币种" + item.getFromSymbol();
 
         String sellerInfo = "订单号：" + item.getOrderNumber() +
-                "收款金额：" + item.getRealAmount()+
+                "收款金额：" + item.getReceivedAmount()+
+                "手续费率：" + item.getFeeRate()+
                 "支付地址：" + item.getFromAddress()+
                 "支付链：" + item.getFromChain()+
                 "支付币种" + item.getFromSymbol() ;