From ada88614c27289e2717a1eccc893b4c4c5cf0836 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Wed, 28 Jan 2026 09:39:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=BA=97=E9=93=BA=E8=B4=B9=E7=8E=87?=
 =?UTF-8?q?=EF=BC=8C=E7=9F=BF=E6=9C=BA=E7=90=86=E8=AE=BA=E7=AE=97=E5=8A=9B?=
 =?UTF-8?q?=E5=92=8C=E5=AE=9E=E9=99=85=E7=AE=97=E5=8A=9B=E6=AF=94=E5=80=BC?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=9B=9B=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LeaseOrderInfoServiceImpl.java       | 20 +++++++++++++------
 .../service/impl/LeaseShopServiceImpl.java    |  3 ++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java
index 9b597bb..831914d 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java
@@ -580,7 +580,7 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
         for (LeaseOrderItem leaseOrderItem : leaseOrderItems) {
             BigDecimal theoryPower = leaseOrderItem.getTheoryPower();
             BigDecimal practicalPower = leaseOrderItem.getPracticalPower();
-            BigDecimal powerRatio = practicalPower.divide(theoryPower, 2, RoundingMode.HALF_UP);
+            BigDecimal powerRatio = practicalPower.divide(theoryPower, 4, RoundingMode.HALF_UP);
             BigDecimal alreadyPayRealAmount = leaseOrderItem.getAlreadyPayRealAmount();
 
             orderInfoDto.setTotalTheoryPower(orderInfoDto.getTotalTheoryPower().add(theoryPower));
@@ -607,7 +607,7 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
         }
         orderInfoDto.setPayCoin(list.get(0).getPayCoin());
         orderInfoDto.setPowerRatio(orderInfoDto.getTotalPracticalPower()
-                .divide(orderInfoDto.getTotalTheoryPower(), 2, RoundingMode.HALF_UP));
+                .divide(orderInfoDto.getTotalTheoryPower(), 4, RoundingMode.HALF_UP));
         orderInfoDto.setOrderItemDtoList(list);
 
         return Result.success(orderInfoDto);
@@ -895,14 +895,18 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
             LeaseShop leaseShop = shopMap.get(leaseMachine.getShopId());
             leaseShop.setSaleNumber(leaseShop.getSaleNumber() + orderInfoVo.getNumbers());
 
+            OrderMiningInfoDto orderMiningInfoDto = userAndMinerMap.get(machineId);
 
             LeaseOrderItem build = LeaseOrderItem.builder()
                     .userId(userEmail)
                     .orderId(leaseOrderInfo.getId())
                     .productMachineId(machineId)
                     .price(leaseMachinePrice.getPrice())
-                    .user(userAndMinerMap.get(machineId).getPoolUser())
-                    .miner(userAndMinerMap.get(machineId).getWorkerId())
+                    .pool(orderMiningInfoDto.getPoolName())
+                    .user(orderMiningInfoDto.getPoolUser())
+                    .miner(orderMiningInfoDto.getWorkerId())
+                    .coin(orderMiningInfoDto.getCoin())
+                    .algorithm(orderMiningInfoDto.getAlgorithm())
                     //.theoryIncome(leaseMachine.getTheoryIncome().multiply(BigDecimal.valueOf(orderInfoVo.getLeaseTime())))
                     .leaseTime(orderInfoVo.getLeaseTime())
                     .payCoin(leaseShopConfig.getPayCoin())
@@ -1031,7 +1035,7 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
        for (OrderMiningInfoDto addressInfo : orderMiningInfoDtoList) {
            String coin = addressInfo.getCoin();
            String walletAddress = addressInfo.getWalletAddress();
-          if (!WalletRuleCheckUtils.checkAddress(coin,walletAddress)){
+          if (StringUtils.isNotEmpty(walletAddress) && !WalletRuleCheckUtils.checkAddress(coin,walletAddress)){
               addressVerify = addressInfo.getWalletAddress() + "钱包地址格式错误";
               break;
           }
@@ -1105,7 +1109,11 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
             //已购商品信息
             orderMiningList.add(build);
             long timeout = ChronoUnit.HOURS.between(build.getStartTime(), build.getEndTime().plusHours(1));
-            redisService.setCacheObject7(combinationKey(poolName,walletAddress,coin,algo),"1",timeout, TimeUnit.HOURS);
+            if (StringUtils.isNotEmpty(walletAddress)){
+                redisService.setCacheObject7(combinationKey(poolName,walletAddress,coin,algo),"1",timeout, TimeUnit.HOURS);
+            }else if (StringUtils.isNotEmpty(poolUser)){
+                redisService.setCacheMapValue7(combinationKey(poolName,poolUser,coin,algo),poolWorkerId,"1",timeout, TimeUnit.HOURS);
+            }
         }
         leaseOrderMiningMapper.insertBatch(orderMiningList);
         macMessageMap.forEach(this::sendMessage);
diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java
index 435180b..8215e8a 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java
@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -184,7 +185,7 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
                     .id(leaseShop.getId())
                     .name(leaseShop.getName())
                     .image(leaseShop.getImage())
-                    .feeRate(leaseShop.getFeeRate())
+                    .feeRate(leaseShop.getFeeRate().setScale(4, RoundingMode.HALF_UP))
                     .description(leaseShop.getDescription())
                     .state(leaseShop.getState())
                     .del(leaseShop.getDel())