From a6a7af49c888d3a1840eb774b90e913e6cb5be10 Mon Sep 17 00:00:00 2001
From: huk <hu_care_you@163.com>
Date: Sun, 28 Sep 2025 16:03:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20app=E7=94=A8=E6=88=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=A0=B8=E9=94=80=E7=A0=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../soopin/order/business/impl/OrderBusinessImpl.java    | 9 ++++++++-
 .../soopin/order/service/VerificationCodeService.java    | 2 ++
 .../order/service/impl/VerificationCodeServiceImpl.java  | 6 ++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
index ae67be7dd..a1d59742d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
@@ -1,5 +1,6 @@
 package com.wzj.soopin.order.business.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.wzj.soopin.member.domain.po.Member;
 import com.wzj.soopin.member.service.IMemberService;
 import com.wzj.soopin.order.business.IOrderBusiness;
@@ -23,6 +24,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -44,13 +46,18 @@ public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert,
 
         //设置明细
         List<OrderItem> orderItemList = orderItemService.findByOrderId(vo.getId());
+
         List<OrderItemVO> itemVOList = orderItemList.stream().map(item -> {
             OrderItemVO itemVO=orderItemConvert.toVO(item);
             if (itemVO.getTenantId() != null) {
                 SysTenantVo tenant = tenantService.queryByTenantId(item.getTenantId());
                 itemVO.setTenantName(tenant.getStoreName());
             }
-            //赋值
+            Optional.ofNullable(verificationCodeService.getByOrderItemId(item.getId()))
+                .ifPresent(v -> {
+                    itemVO.setVerificationId(v.getId());
+                    BeanUtil.copyProperties(v, itemVO,"id");
+                });
             return itemVO;
         }).collect(Collectors.toList());
 
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java
index 2ca88883a..7c388ee76 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/VerificationCodeService.java
@@ -18,4 +18,6 @@ public interface VerificationCodeService extends IService<VerificationCodes> {
     List<VerificationCodes> getByOrderId(Long orderId);
 
     void Invalid(Long orderId, List<Long> orderItemIdList);
+
+    VerificationCodes getByOrderItemId(Long orderItemId);
 }
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 7a0cd1acd..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
@@ -135,4 +135,10 @@ public class VerificationCodeServiceImpl  extends ServiceImpl<VerificationCodesM
             .in(VerificationCodes::getOrderItemId, orderItemIdList)
             .set(VerificationCodes::getStatus, VerificationCodeStatus.CANCELLED.getCode()));
     }
+
+    @Override
+    public VerificationCodes getByOrderItemId(Long orderItemId) {
+        return codeMapper.selectOne(Wrappers.lambdaQuery(VerificationCodes.class)
+            .eq(VerificationCodes::getOrderItemId, orderItemId));
+    }
 }