From a88cf2611fa4b01eef43560395a9e49fcba57c24 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Tue, 13 Jan 2026 14:50:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=88=A0=E9=99=A4=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=AD=E8=AE=A2=E5=8D=95=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/m2pool/lease/mapper/LeaseOrderItemMapper.java  |  8 ++++++++
 .../lease/service/impl/LeaseShopServiceImpl.java       | 10 ++++++++++
 .../resources/mapper/lease/LeaseOrderItemMapper.xml    | 10 ++++++++++
 3 files changed, 28 insertions(+)

diff --git a/src/main/java/com/m2pool/lease/mapper/LeaseOrderItemMapper.java b/src/main/java/com/m2pool/lease/mapper/LeaseOrderItemMapper.java
index 4ab96da..82ba0d5 100644
--- a/src/main/java/com/m2pool/lease/mapper/LeaseOrderItemMapper.java
+++ b/src/main/java/com/m2pool/lease/mapper/LeaseOrderItemMapper.java
@@ -5,6 +5,7 @@ import com.m2pool.lease.dto.OrderStatusDto;
 import com.m2pool.lease.dto.v2.OrderTimeInfoDto;
 import com.m2pool.lease.entity.LeaseOrderItem;
 import com.m2pool.lease.entity.LeasePaymentRecord;
+import com.m2pool.lease.entity.LeaseShopConfig;
 import com.m2pool.lease.mq.message.RabbitmqPayAutoReturnInfoMessage;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
@@ -80,4 +81,11 @@ public interface LeaseOrderItemMapper extends BaseMapper<LeaseOrderItem> {
     List<OrderTimeInfoDto> getOneDayApartOrder();
 
 
+    /**
+     * 检测店铺正在运行中的订单数量
+     * @param list
+     * @return
+     */
+    long checkShopExistRunningOrderNumbers(@Param("list") List<LeaseShopConfig> list);
+
 }
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 51224a3..b7e8637 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java
@@ -243,6 +243,8 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
         if (leaseMachineMapper.checkHasSaleMachineByShopId(shopId) >= 1){
             throw new MachineException("注销失败,店铺存在租约中矿机");
         }
+
+
         //校验是否存在余额不为0的钱包
         List<LeaseShopConfig> leaseShopConfigs = leaseShopConfigMapper.selectList(new LambdaQueryWrapper<LeaseShopConfig>()
                 .select(LeaseShopConfig::getId,LeaseShopConfig::getBalance)
@@ -250,6 +252,13 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
         if (leaseShopConfigs.stream().anyMatch(leaseShopConfig -> leaseShopConfig.getBalance().compareTo(BigDecimal.ZERO) > 0)){
             throw new MachineException("注销失败,店铺存在余额不为0的钱包");
         }
+
+        //校验是否存在订单
+        long runningOrderCount = leaseOrderItemMapper.checkShopExistRunningOrderNumbers(leaseShopConfigs);
+        if (runningOrderCount > 0) {
+            throw new MachineException("注销失败,店铺钱包存在未完成的订单");
+        }
+
         leaseMachineMapper.update(LeaseMachine.builder().del(true).build(), new LambdaUpdateWrapper<LeaseMachine>()
                 .eq(LeaseMachine::getShopId, shopId));
 
@@ -492,6 +501,7 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
         Long l = leaseOrderItemMapper.selectCount(new LambdaQueryWrapper<LeaseOrderItem>()
                 .eq(LeaseOrderItem::getChain, config.getChain())
                 .eq(LeaseOrderItem::getFromSymbol, config.getPayCoin())
+                .eq(LeaseOrderItem::getFromAddress, config.getPayAddress())
                 .ne(LeaseOrderItem::getStatus, 0)
         );
         if (l > 0){
diff --git a/src/main/resources/mapper/lease/LeaseOrderItemMapper.xml b/src/main/resources/mapper/lease/LeaseOrderItemMapper.xml
index 35c2b81..0bb3b98 100644
--- a/src/main/resources/mapper/lease/LeaseOrderItemMapper.xml
+++ b/src/main/resources/mapper/lease/LeaseOrderItemMapper.xml
@@ -116,6 +116,16 @@
         WHERE
             STATUS = 1
     </select>
+    <select id="checkShopExistRunningOrderNumbers" resultType="java.lang.Long">
+        SELECT COUNT(*)
+        FROM lease_order_item
+        WHERE status = 1
+        AND (
+            <foreach collection="list" item="item" separator=" OR ">
+                (chain = #{item.chain} AND from_symbol = #{item.payCoin} AND from_address = #{item.payAddress})
+            </foreach>
+        )
+    </select>
 
 
 </mapper>