From f9cf42b9a85cbde963084926e42b9e06e988285c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BA=86=E7=A5=A5?= <w18722008525@gmail.com>
Date: Tue, 30 Sep 2025 23:28:28 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E6=A0=B8=E9=94=80=E7=A0=81=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80=E5=90=8E=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6=E9=83=BD?=
 =?UTF-8?q?=E5=B7=B2=E6=A0=B8=E9=94=80=20=E9=83=BD=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E5=90=8E=E5=B0=86=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/VerificationCodeServiceImpl.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java
index 8260b455d..aa1a322a1 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/VerificationCodeServiceImpl.java
@@ -113,6 +113,17 @@ public class VerificationCodeServiceImpl  extends ServiceImpl<VerificationCodesM
         verificationCodes.setUsedMerchantId(tenantId);
         verificationCodes.setVerificationTime(LocalDateTime.now());
         codeMapper.updateById(verificationCodes);
+
+        //先检查订单明细的核销码是否都已经核销
+        boolean allUsed = codeMapper.selectCount(Wrappers.lambdaQuery(VerificationCodes.class)
+            .eq(VerificationCodes::getOrderItemId, verificationCodes.getOrderItemId())
+            .eq(VerificationCodes::getStatus, VerificationCodeStatus.TO_BE_USED.getCode())) == 0;
+        if (allUsed) {
+            // 更新订单状态为已核销
+            orderMapper.update(Wrappers.lambdaUpdate(Order.class)
+                .eq(Order::getId, verificationCodes.getOrderId())
+                .set(Order::getStatus, OrderStatusEnum.CLOSED.getValue()));
+        }
     }