From 813d5f59b46f7415274729fd238df4259169fce4 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Thu, 15 Jan 2026 10:00:28 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=90=8E,asic=E7=9F=BF=E6=9C=BA=E7=A7=9F=E5=94=AE=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=9C=AA=E6=AD=A3=E5=B8=B8=E6=89=A3=E9=99=A4=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

---
 .../impl/LeaseOrderInfoServiceImpl.java       | 14 ++++++-------
 .../mapper/lease/LeaseMachineMapper.xml       | 20 +++++++++----------
 2 files changed, 17 insertions(+), 17 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 67083f6..b32bd94 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseOrderInfoServiceImpl.java
@@ -707,13 +707,13 @@ public class LeaseOrderInfoServiceImpl extends ServiceImpl<LeaseOrderInfoMapper,
         }
         Map<Long, OrderMiningInfoDto> userAndMinerMap = orderMiningInfoDtoList.stream().collect(Collectors.toMap(OrderMiningInfoDto::getMachineId, Function.identity()));
         GoogleInfo googleInfo = leaseUserMapper.getGoogleInfoByEmail(userEmail);
-        if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){
-            //未绑定定谷歌验证器
-            return Result.fail("您的账号未开启双重验证,请先开启验证!");
-        }
-        if(!GoogleAuthenticator.checkCode(googleInfo.getSecret(), orderAndCodeVo.getCode(), System.currentTimeMillis())){
-            return Result.fail("谷歌验证码错误");
-        }
+        //if(googleInfo == null || StringUtils.isBlank(googleInfo.getSecret())){
+        //    //未绑定定谷歌验证器
+        //    return Result.fail("您的账号未开启双重验证,请先开启验证!");
+        //}
+        //if(!GoogleAuthenticator.checkCode(googleInfo.getSecret(), orderAndCodeVo.getCode(), System.currentTimeMillis())){
+        //    return Result.fail("谷歌验证码错误");
+        //}
         Map<Long, OrderInfoVo> collect1 = orderInfoVoList.stream()
                 .collect(Collectors.toMap(OrderInfoVo::getMachineId,Function.identity()));
         List<LeaseMachine> machineList = leaseMachineMapper.selectBatchIds(collect1.keySet());
diff --git a/src/main/resources/mapper/lease/LeaseMachineMapper.xml b/src/main/resources/mapper/lease/LeaseMachineMapper.xml
index 9521114..23852cc 100644
--- a/src/main/resources/mapper/lease/LeaseMachineMapper.xml
+++ b/src/main/resources/mapper/lease/LeaseMachineMapper.xml
@@ -471,28 +471,28 @@
         SET
         sale_out_numbers = CASE
             <foreach collection="list" item="item">
-                WHEN id = #{item.id} AND sale_out_numbers = #{item.lockNumbers}
-                THEN sale_out_numbers + #{item.saleOutNumbers}
+                WHEN id = #{item.id}
+                THEN #{item.saleOutNumbers}
             </foreach>
-            ELSE sale_out_numbers
+            ELSE 0
         END,
         can_sale_numbers = CASE
             <foreach collection="list" item="item">
-                WHEN id = #{item.id} AND sale_out_numbers = #{item.lockNumbers}
-                THEN can_sale_numbers - #{item.canSaleNumbers}
+                WHEN id = #{item.id}
+                THEN #{item.canSaleNumbers}
             </foreach>
-            ELSE can_sale_numbers
+            ELSE 0
         END,
         sale_state = CASE
             <foreach collection="list" item="item">
-                WHEN id = #{item.id} AND sale_out_numbers = #{item.lockNumbers}
-                THEN CASE WHEN (sale_out_numbers + #{item.saleOutNumbers}) >= sale_numbers THEN 1 ELSE sale_state END
+                WHEN id = #{item.id}
+                THEN CASE WHEN sale_out_numbers  >= sale_numbers THEN 1 ELSE sale_state END
             </foreach>
             ELSE sale_state
         END
-        WHERE id IN (
+        WHERE (id, sale_out_numbers) IN (
             <foreach collection="list" item="item" separator=",">
-                #{item.id}
+                (#{item.id}, #{item.lockNumbers})
             </foreach>
         )
     </update>