From 400196b480018927d18d4e66c45ebb945178b540 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:41:30 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E6=92=A4=E9=94=80=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E7=9A=84=E7=A9=BA=E5=80=BC=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/business/impl/MemberBusinessImpl.java      |  3 +++
 .../service/impl/VerificationCodeServiceImpl.java     | 11 -----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/business/impl/MemberBusinessImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/business/impl/MemberBusinessImpl.java
index 01de69394..c9f9a0e48 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/business/impl/MemberBusinessImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/business/impl/MemberBusinessImpl.java
@@ -84,6 +84,9 @@ public class MemberBusinessImpl extends BusinessImpl<IMemberService, MemberConve
     @Override
     public MemberVO info(Serializable id) {
         MemberVO vo= super.info(id);
+        if(vo==null){
+            return vo;
+        }
         Integer score = service.getMyVlogLikeCount(Long.valueOf(id.toString()));
         vo.setVlogLikeCount(score);
         Integer  myFansCount= fansService.myFansCount(Long.valueOf(id.toString()));
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 aa1a322a1..8260b455d 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,17 +113,6 @@ 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()));
-        }
     }